cheykrym/socket.io-client-swift
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
542 Commits 6 Branches 161 Tags
Commit Graph

130 Commits

Author SHA1 Message Date
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
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
Erik
e792006245 change to default session config 2015-07-27 18:50:12 -04:00
Erik
3c9c473e70 clean up socketpacket 2015-07-27 17:12:57 -04:00
Erik
846f10eb13 Merge branch 'master' into swift-2 
* master:
  update readme
  change api for emitack callback
 2015-07-23 13:51:50 -04:00
Erik
47a839b934 change api for emitack callback 2015-07-22 19:09:47 -04:00
Erik
94a3844181 warnings 2015-07-22 08:49:51 -04:00
Erik
01aa6354e3 merge master 2015-07-22 07:45:40 -04:00
Erik
ac663a8875 bump websocket version 2015-07-22 06:28:06 -04:00
Erik
a277e88c3b update for xcode 7 beta 4 2015-07-21 16:19:15 -04:00
Erik
d073fa8a83 Merge branch 'master' into swift-2 
* master:
  maybe fix socketio/socket.io-client-swift#100 and socketio/socket.io-client-swift#22
  Added SocketIOClient.removeAllHandlers
  Updated BuildableName in schemes
  bump version
 2015-07-12 21:11:18 -04:00
Erik
8928ce2693 maybe fix socketio/socket.io-client-swift#100 and socketio/socket.io-client-swift#22 2015-07-12 20:40:41 -04:00
Erik
5057226a6c maybe fix socketio/socket.io-client-swift#100 and socketio/socket.io-client-swift#22 2015-07-12 20:40:23 -04:00
NachoSoto
5f75e6080b Added SocketIOClient.removeAllHandlers 2015-07-13 00:09:05 +00:00
Erik
68078e50d5 the weirdness with objc blocks is fixed in Swift 2 2015-07-10 06:45:58 -04:00
Erik
8daa7da426 clean up namespace logic 2015-07-09 12:29:26 -04:00
Erik
24583f19c1 fix socketio/socket.io-client-swift#113 2015-07-09 10:44:57 -04:00
Erik
652c81a80e add back default value 2015-07-09 10:38:24 -04:00
Erik
422b93f577 Merge branch 'master' into swift-2 
* master:
  Invalidate timer on reconnect failure
  fix socketio/socket.io-client-swift#110 calling close while trying to reconnect
 2015-07-03 14:07:03 -04:00
Erik
998089df91 Invalidate timer on reconnect failure 2015-07-03 13:58:06 -04:00
Erik
283644b75c fix socketio/socket.io-client-swift#110 calling close while trying to reconnect 2015-07-03 13:53:40 -04:00
Erik
38a7cc8648 whitespace 2015-07-03 09:04:40 -04:00
Erik
a22869efad Just use regular array for packets 2015-07-03 09:03:44 -04:00
Erik
6ecd1e2a79 merge master 2015-07-01 07:10:19 -04:00
Erik
a49f8f19cf add extraHeaders option fixes. nuclearace/Socket.IO-Client-Swift#64 2015-07-01 07:05:06 -04:00
Erik
b388df798b shorter expression in off 2015-06-29 21:25:00 -04:00
Erik
362f4e90b8 merge master 2015-06-24 07:05:38 -04:00
Erik
ca3f3e810d fix socketio/socket.io-client-swift#97 2015-06-24 06:51:47 -04:00
Erik
eb00be0aaa Merge branch 'master' into swift-2 
* master:
  set connecting
 2015-06-23 18:57:49 -04:00
Erik
d8e3408565 set connecting 2015-06-23 18:57:37 -04:00
Erik
9454a47ef4 fix binary 2015-06-23 15:11:30 -04:00
Erik
bd88ff763b change default type 2015-06-19 09:28:13 -04:00
Erik
df2f149f85 handle acks better 2015-06-19 08:12:27 -04:00