Commit Graph

109 Commits

Author SHA1 Message Date
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
Erik 65be52418d remove old stuff 2015-06-19 08:02:51 -04:00
Erik 76637d160e use struct for socketpacket 2015-06-19 08:00:09 -04:00
Erik f17575b35c use computed variable for sid 2015-06-16 05:14:32 -04:00
Erik f2e5a1437b use computed variable for sid 2015-06-16 05:13:08 -04:00
Erik a0c676bc54 unify objc/swift constructors 2015-06-12 09:42:44 -04:00
Erik 5854262280 Fix reference error 2015-06-12 09:39:39 -04:00
Erik 1c8fcee772 remove comment 2015-06-12 09:23:11 -04:00
Erik 11d8430537 use struct 2015-06-11 11:50:30 -04:00
Erik a15b57e900 extract methods, clean up 2015-06-10 19:27:07 -04:00
Erik fafeebe185 remove warnings 2015-06-08 21:03:49 -04:00
Erik 7bf35e182c tweaks 2015-06-08 20:23:22 -04:00
Erik 78727dc0ee untested with socket.io, this just compiles 2015-06-08 20:02:59 -04:00
Erik 1a54decd51 fix socketio/socket.io-client-swift#93 2015-06-06 22:30:56 -04:00
Erik d982cdc1b2 only do interpolation when logging 2015-06-06 13:15:22 -04:00
Erik 33d5fd3f10 fix base64 data 2015-06-05 06:57:59 -04:00
Erik 3be5621263 remove comment 2015-05-31 11:09:25 -04:00
Erik 81ab71f519 extract methods 2015-05-31 11:07:48 -04:00
Erik bfeec57c04 don't need type 2015-05-29 10:30:59 -04:00
Erik 0b09a1357c use didset instead of computed variable 2015-05-29 10:29:26 -04:00
Erik e8dfe589ac redo pingtimeouts 2015-05-29 10:10:24 -04:00
Erik fcebc870c3 fix socket.io/socket.io-client-swift#87 2015-05-27 07:28:06 -04:00