161 Commits

Author SHA1 Message Date
Erik
a147ebcd85 Default logging won't use another dispatch queue 2015-09-03 15:14:25 -04:00
Erik
8d0af14f04 add ability to specify custom logger 2015-09-03 15:10:18 -04:00
Erik
0ff4cb9713 remove old check 2015-09-03 12:27:24 -04:00
Erik
8dc7121355 merge master 2015-08-31 09:34:14 -04:00
Erik
17426c1432 fix socketio/socket.io-client-swift#152 2015-08-31 09:22:56 -04:00
Erik
5a73a5e6da style 2015-08-28 13:42:04 -04:00
Erik
1f5402ce1c use computed variables 2015-08-27 09:45:27 -04:00
Erik
ccd6dcbf0a update for latest beta 2015-08-25 09:31:33 -04:00
Erik
4fdb49ea2f use static variable for log 2015-08-18 10:19:58 -04:00
Erik
2351637ab4 don't need to unwrap 2015-08-18 10:07:57 -04:00
Erik
58097fa39e leave it up to the engineclient how to handle messages 2015-08-18 10:05:51 -04:00
Erik
4c9d6ef3de refactor socketpacket 2015-08-17 14:47:14 -04:00
Erik
aa43107ad6 remove unused dispatch queue 2015-08-17 11:43:16 -04:00
Erik
9c3d991bed fix bug in websocket library 2015-08-17 00:09:33 -04:00
Erik
6ee1daeaf7 fix bug in websocket library 2015-08-17 00:09:04 -04:00
Erik
09a26c0b1c remove all data on engine close 2015-08-17 00:04:13 -04:00
Erik
f752507a11 style 2015-08-14 22:08:33 -04:00
Erik
2cafec6f12 move enum, better description 2015-08-14 16:20:43 -04:00
Erik
7ebcd7439f refactor, fix reconnect bug, fix internalmessages 2015-08-13 09:56:22 -04:00
Erik
5e92fc323d dammit 2015-08-11 10:05:35 -04:00
Erik
c2b927fd02 oops 2015-08-11 10:04:43 -04:00
Erik
4014286da2 style 2015-08-11 10:03:35 -04:00
Erik
884b73c777 clean up 2015-08-11 09:54:59 -04:00
Erik
b563334d14 clean up enums 2015-08-11 08:33:11 -04:00
Erik
848f7e5da7 clean up enums 2015-08-11 08:31:23 -04:00
Erik
0fd8a9540b don't remove engine 2015-08-10 11:00:22 -04:00
Erik
42aced5e9c don't remove engine 2015-08-10 11:00:01 -04:00
Lukas Schmidt
25464ffb9d objc suppoert 2015-08-10 15:47:59 +02:00
Lukas Schmidt
d0f091e983 remove unused variables 2015-08-10 07:44:01 +02:00
Lukas Schmidt
6fa7636261 working test
Signed-off-by: Lukas Schmidt <lukas.schmi@gmail.com>
2015-08-10 07:14:52 +02:00
Lukas Schmidt
5eeac96b2b fix issues
Signed-off-by: Lukas Schmidt <lukas.schmi@gmail.com>
2015-08-10 07:04:11 +02:00
Lukas Schmidt
145448c087 Merge branch 'swift-2' of https://github.com/socketio/socket.io-client-swift into API-improvements 2015-08-10 06:22:27 +02:00
Lukas Schmidt
184b97ef8c fix merge issues
Signed-off-by: Lukas Schmidt <lukas.schmi@gmail.com>
2015-08-10 06:21:29 +02:00
Lukas Schmidt
d0ec1de566 merge
Signed-off-by: Lukas Schmidt <lukas.schmi@gmail.com>
2015-08-10 06:18:37 +02:00
Lukas Schmidt
643ddb5bf9 Merge branch 'swift-2' of https://github.com/socketio/socket.io-client-swift into API-improvements
# Conflicts:
#	SocketIOClientSwift/SocketEngine.swift
#	SocketIOClientSwift/SocketIOClient.swift
#	SocketIOClientSwift/SocketTypes.swift

Signed-off-by: Lukas Schmidt <lukas.schmi@gmail.com>
2015-08-10 06:18:28 +02:00
Erik
469caf1b54 update for latest beta 2015-08-06 14:12:35 -04:00
Erik
8bde261acb fix socketio/socket.io-client-swift#137 2015-08-05 12:25:37 -04:00
Lukas Schmidt
63a257ac80 Merge remote-tracking branch 'origin/socketio/swift-2' into API-improvements
Signed-off-by: Lukas Schmidt <lukas.schmi@gmail.com>

# Conflicts:
#	SocketIOClientSwift/SocketTypes.swift
2015-08-05 12:14:06 +02:00
Erik
514193e6ec Merge master 2015-08-05 06:12:35 -04:00
Lukas Schmidt
969e6d6ea8 minor imporvements
Signed-off-by: Lukas Schmidt <lukas.schmi@gmail.com>
2015-08-05 12:12:21 +02:00
Erik
ffbe1e4ec4 add option for handle queue 2015-08-05 06:09:24 -04:00
Erik
80ea42c91f document objc method 2015-08-05 06:03:06 -04:00
Erik
06e2311acc fix socketio/socket.io-client-swift#133 can't expose variadics to objective-c 2015-08-03 12:41:14 -04:00
Erik
2579c04f67 better swift style 2015-08-03 10:07:59 -04:00
Erik
150e26aefd fix getting args for ack and binary-ack 2015-08-02 13:40:45 -04:00
Erik
f0a45e13e2 clean up 2015-08-02 13:09:18 -04:00
Lukas Schmidt
7800591367 cleanup status api 2015-08-02 18:47:37 +02:00
Lukas Schmidt
92367fc796 minor improvements using let / guard 2015-08-02 18:23:48 +02:00
Erik
feea80a2f9 use immutable values 2015-07-31 16:05:33 -04:00
Erik
cf98f09b93 Merge branch 'master' into swift-2
* master:
  change to default session config
2015-07-27 18:50:26 -04:00