1037 Commits

Author SHA1 Message Date
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
Lukas Schmidt
0308e274cd Merge branch 'socketio/swift-2' into swift-2 2015-08-05 10:03:14 +02:00
Erik
dd71d4954d update readme 2015-08-03 13:41:58 -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 Little
137fd1229b Merge pull request #127 from lightsprint09/tests
Tests for socket.io client
2015-08-02 17:19:24 -04:00
Lukas Schmidt
6650afd3e4 Merge branch 'socketio/swift-2' into tests 2015-08-02 20:05:43 +02: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
Lukas Schmidt
fbe3bd9b30 Merge remote-tracking branch 'socketio/master' into swift-2 2015-08-02 17:50:34 +02:00
Lukas Schmidt
e25afd60fd Merge branch 'socketio/swift-2' into tests 2015-08-02 17:50:15 +02:00
Lukas Schmidt
f0b4f077d4 fix crash 2015-08-02 17:44:06 +02:00
Lukas Schmidt
1b08411ed4 refactored iOS testcases
Add test cases for complex data structure (JSON, multiple data emit)
without binary Buffer attached
2015-08-02 17:29:16 +02:00
Lukas Schmidt
bf3e28df81 improve tests on server 2015-08-02 17:28:09 +02:00
Lukas Schmidt
4086ce7d75 relocate test cases for better understanding 2015-08-02 15:07:05 +02:00
Erik
feea80a2f9 use immutable values 2015-07-31 16:05:33 -04:00
Lukas Schmidt
a0e3052893 test server 2015-07-28 17:02:44 +02:00
Lukas Schmidt
79848b1ce0 cleanup 2015-07-28 16:15:12 +02:00
Lukas Schmidt
30cf2bb67a namespace tests 2015-07-28 14:46:30 +02:00
Lukas Schmidt
b1b9a7edaf more tests 2015-07-28 14:25:15 +02: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
Lukas Schmidt
252181b0c5 clean up 2015-07-27 11:33:41 +02:00
Lukas Schmidt
a4988e6404 namespace tests 2015-07-26 17:14:21 +02:00
Lukas Schmidt
a1af98e173 refactor 2015-07-26 16:58:08 +02:00
Lukas Schmidt
aa6db7c837 remove old files 2015-07-26 12:42:18 +02:00
Lukas Schmidt
a07916fb2f basic emit tests 2015-07-25 18:45:41 +02:00
Lukas Schmidt
4b9db85a49 update api 2015-07-24 20:11:47 +02:00
Lukas Schmidt
149e6137af Merge branch 'socketio/swift-2' into tests 2015-07-24 19:56:21 +02:00
Lukas Schmidt
224c660e4c basic test structure / tests 2015-07-24 19:55:35 +02:00
Erik
7b795fd989 Merge branch 'master' into swift-2
* master:
  bump version
2015-07-24 08:02:26 -04:00
Erik
67f57daaab bump version v2.4.0 2015-07-24 08:00:31 -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
11730b5fcd update readme 2015-07-22 19:10:55 -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 v2.3.10 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
fba226a6de bump version v2.3.9 2015-07-14 11:42:59 -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