653 Commits

Author SHA1 Message Date
Erik Little
b52684cb8f Merge pull request #141 from lightsprint09/API-improvements
Api improvements
2015-08-10 10:57:13 -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
889ad404bc remove compiler warnings 2015-08-10 07:42:09 +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
f46629f850 Merge branch 'swift-2' of https://github.com/socketio/socket.io-client-swift into swift-2 2015-08-10 06:34:33 +02:00
Lukas Schmidt
84bb6b7dad update tests
Signed-off-by: Lukas Schmidt <lukas.schmi@gmail.com>
2015-08-10 06:33:32 +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
c38412cae6 bump version 2015-08-05 12:27:46 -04:00
Erik
8bde261acb fix socketio/socket.io-client-swift#137 2015-08-05 12:25:37 -04:00
Erik
9b9becebae bump version v2.4.1 v2.4.2 2015-08-05 06:14:44 -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
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