483 Commits

Author SHA1 Message Date
Erik
c21799abac merge master 2015-07-12 09:56:48 -04:00
Erik Little
43827914b7 Merge pull request #117 from NachoSoto/master
Added project with iOS and Mac targets => Carthage support
2015-07-12 09:49:40 -04:00
NachoSoto
22b9a1e2f2 Added Carthage instructions to README 2015-07-12 01:06:26 +00:00
NachoSoto
fd66a9fa62 Created project with iOS and Mac targets 2015-07-12 00:58:09 +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
846897157c bump version v2.3.7 2015-07-01 07:07:32 -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
531a9784da make it clear as to what language 2015-06-29 18:13:45 -04:00
Erik
c34a660cae update readme 2015-06-29 18:12:46 -04:00
Erik
9484bc9614 update readme 2015-06-29 18:11:33 -04:00
Erik
7206fa6d5c change readme 2015-06-26 09:57:37 -04:00
Erik
362f4e90b8 merge master 2015-06-24 07:05:38 -04:00
Erik
d8f65c2804 bump version v2.3.6 2015-06-24 06:52:24 -04:00
Erik
ca3f3e810d fix socketio/socket.io-client-swift#97 2015-06-24 06:51:47 -04:00
Erik
77eb1603ac Merge branch 'master' into swift-2
* master:
  bump version
2015-06-23 22:01:19 -04:00
Erik
63021eb995 bump version v2.3.5 2015-06-23 21:52:05 -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
f41b64137e Merge branch 'master' into swift-2
* master:
  use computed variable for sid
2015-06-19 09:24:15 -04:00
Erik
df2f149f85 handle acks better 2015-06-19 08:12:27 -04:00
Erik
f2ef3344c0 update ignorefile 2015-06-19 08:03:55 -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
66622fffb3 I hope Swift fixes the case where I use variadics, because this ugly 2015-06-08 20:24:57 -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
58571e5387 bump version v2.3.4 2015-06-07 13:15:03 -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
079063e396 bump version v2.3.3 2015-06-05 06:59:20 -04:00