84 Commits

Author SHA1 Message Date
Erik
a61f1c8484 merge master 2015-03-27 12:41:49 -04:00
Erik
18a561f78a update READEME.md 2015-03-27 12:17:57 -04:00
Erik
f669267f51 Merge branch 'master' into 1.2 2015-03-27 11:30:41 -04:00
Erik
f008f116a6 fix socketio/socket.io-client-swift#27 2015-03-26 10:13:30 -04:00
Erik
77532acbd3 merge master 2015-03-25 17:03:55 -04:00
Erik
9512c8b9ac change api 2015-03-25 12:02:45 -04:00
Erik
b0020997c4 don't use default arg 2015-03-25 11:59:03 -04:00
Erik
182ba0017b fix nuclearace/Socket.IO-Client-Swift#12 better closing 2015-03-25 11:50:25 -04:00
Erik
d70db2a8be merge master 2015-03-19 15:05:29 -04:00
Erik Little
5175791513 Update README.md 2015-03-19 11:07:16 -04:00
Erik
84752b463a merge master 2015-03-18 18:39:53 -04:00
Erik
5b180a0a6d fix socketio/socket.io-client-swift#20, change objc api 2015-03-18 18:04:43 -04:00
Erik
bb26dd05f8 merge master 2015-03-18 14:03:53 -04:00
Erik
0ca13c5496 update readme 2015-03-18 13:57:20 -04:00
Erik
937090458c merge master 2015-03-16 16:08:49 -04:00
Erik Little
e932d0a26b Fix copypasta 2015-03-16 11:53:14 -04:00
Erik
90187aa458 fix convenience constructor. Bump version 2015-03-16 11:47:42 -04:00
Erik
7765e57a11 Merge branch 'timeouts' into 1.2 2015-03-16 09:01:49 -04:00
Erik
2022f282c9 add no timeout 2015-03-14 19:46:03 -04:00
Erik
560235353d merge master 2015-03-12 14:49:00 -04:00
Erik
58362f6352 clean up readme 2015-03-12 10:27:37 -04:00
banjun
ea20dc809e [README] add CocoaPods in Installation section 2015-03-12 22:58:00 +09:00
Erik
f14d9ef5ff add new stuff to 1.2 2015-03-11 18:08:05 -04:00
Erik
2e451e5185 trim more 2015-03-11 18:05:25 -04:00
Erik
114ce4ca0f trim example 2015-03-11 17:42:51 -04:00
Erik
8c02f5ef7b update readme with new methods 2015-03-11 17:38:27 -04:00
Erik
711ce8d8c4 fixes. add better objective-c support 2015-03-11 17:33:21 -04:00
Erik
8365ded215 Use starscream for websockets. Execute emitAcks on the main queue. 2015-03-11 13:33:54 -04:00
Erik
3118b0851d add link to example project 2015-03-07 19:49:44 -05:00
Erik
94d715aaf9 add link to example project 2015-03-07 19:48:41 -05:00
Erik
1ac05d9790 add new things to 1.2 2015-03-06 23:41:15 -05:00
Erik
14bf64233b add example for onAny 2015-03-06 18:38:12 -05:00
Erik
41c168a29a Fixes. Add onAny method 2015-03-06 16:29:13 -05:00
Erik
a1e3232db0 update README.md 2015-03-04 23:19:21 -05:00
Erik
1a63088a5e readme 2015-03-04 23:02:32 -05:00
Erik
63aed1ce91 tweaks 2015-03-04 21:50:23 -05:00
Erik Little
0c63e6a134 Update README.md 2015-02-24 15:17:19 -05:00
Erik Little
ecd76d6106 Update README.md 2015-02-24 13:07:07 -05:00
Erik Little
50ac79e07e Update README.md 2015-02-24 13:03:34 -05:00
Erik
5b9537065f #15 add connectWithParams 2015-02-24 12:59:56 -05:00
Erik
1bc761ac8d #15 add connectWithParams 2015-02-24 12:51:27 -05:00
Erik
170b1bc836 API CHANGE. See README 2015-02-23 15:08:38 -05:00
Erik
a1296fa439 Merge branch 'master' of https://github.com/nuclearace/Socket.IO-Client-Swift 2015-02-23 14:55:43 -05:00
Erik
2da5c3c9b3 API CHANGE. remove .onMultipleItems, .on now acts like .onMultipleItems; ack'ing is now done with a function passed into an event handler function. See example 2015-02-23 14:55:25 -05:00
Erik Little
a1a5b054ca Update README.md 2015-02-23 09:32:59 -05:00
Erik
082c00dbb1 backport new stuff from 1.2 branch. Adds acks 2015-02-19 22:52:22 -05:00
Erik Little
6e8a32361c Update README.md 2015-02-19 11:21:54 -05:00
Erik Little
5d8479ed36 Update README.md 2015-02-15 13:22:19 -05:00
Erik
3754bd572a handle acks from the server 2015-02-15 13:17:36 -05:00
Erik Little
12b8f3ef1f Update README.md 2015-02-14 18:22:24 -05:00