1047 Commits

Author SHA1 Message Date
Erik
e2db1a086d update for latest swift 3 2016-04-16 12:00:21 -04:00
Erik
9f8db42584 Merge branch 'development' into swift3
* development:
  expose ws
  rename file
  change to how server gives id
2016-04-16 11:11:05 -04:00
Erik
6efeb7d5b2 expose ws 2016-04-16 11:04:26 -04:00
Erik
e1865e3f94 rename file 2016-04-16 10:43:20 -04:00
Erik
3073130598 change to how server gives id 2016-04-11 18:51:22 -04:00
Erik
376e31bfca merge development and fix tests 2016-04-10 14:15:35 -04:00
Erik
ed3d49001f bump websocket version 2016-04-10 13:59:21 -04:00
Erik
4ee196c5fb add default value to namespace in socketparsable 2016-04-04 11:28:20 -04:00
Erik
baca9fc8da small refactors 2016-03-31 21:31:24 -04:00
Erik
3735dd0e6a Merge branch 'development' into swift3
* development:
  set targetted device family to 3
  use 7.3 image
2016-03-25 17:03:12 -04:00
Erik
1a5ac74984 Merge branch 'master' into development
* master:
  set targetted device family to 3
  use 7.3 image
2016-03-25 17:02:52 -04:00
Erik Little
6c779e84d2 Merge pull request #335 from craigkj312/master
actual fix for carthage
2016-03-25 17:01:53 -04:00
Kyle Craig
293d71bf97 set targetted device family to 3 2016-03-25 15:54:57 -05:00
Erik
199b9962f0 swift3 naming 2016-03-25 13:11:28 -04:00
Erik
4d4362b250 work on swift3 syntax 2016-03-25 12:59:50 -04:00
Erik
2f1f77141e add test for objc api 2016-03-25 10:00:14 -04:00
Erik
d4c01183ab style 2016-03-25 09:48:04 -04:00
Erik
5d81377e0a use 7.3 image 2016-03-24 14:46:32 -04:00
Erik
8f8d5acdba use 7.3 image 2016-03-24 14:17:49 -04:00
Erik
a0167ae213 remove deprecated methods 2016-03-23 13:39:22 -04:00
Erik
4f5837afa7 don't need objc on this method anymore 2016-03-22 10:15:09 -04:00
Erik
718caba9d9 remove nstimer 2016-03-22 09:56:56 -04:00
Erik Little
2919d4a5ce Merge pull request #330 from socketio/development
Development
v6.0.0
2016-03-22 09:06:13 -04:00
Erik
a53b7167b6 update version and readme 2016-03-22 09:05:57 -04:00
Erik
6c6b4f32c9 Update for swift 2.2 2016-03-22 09:00:27 -04:00
Erik
3a842469ec fix log placement 2016-03-16 13:13:22 -04:00
Erik
596a499041 work on fixing reconnect() 2016-03-11 13:41:09 -05:00
Erik
76a572e735 refactor reconnect 2016-03-11 13:03:40 -05:00
Erik
6da9463c8d whitespace 2016-03-03 10:11:08 -05:00
Erik
2f7a5405b0 add check for fast upgrade 2016-03-03 09:59:33 -05:00
Erik
62131ef904 make sure we don't handle poll messages if we aren't polling 2016-03-03 09:57:39 -05:00
Erik
5976ef1752 bump websocket version 2016-02-27 19:43:21 -05:00
Erik
16e0bf6319 bump version v5.5.0 2016-02-25 19:13:08 -05:00
Erik Little
11c0ac249b Merge pull request #317 from jtjacka/master
fix timeoutAfter handler always close connection
2016-02-25 19:11:33 -05:00
jtjacka
1e96d7982d fix timeoutAfter handler always close connection 2016-02-25 16:06:08 -08:00
Erik
2f4c942dcf use connect/disconnect for engine 2016-02-23 10:33:14 -05:00
Erik
70283acc1f add messages to deprecated methods 2016-02-17 14:27:48 -05:00
Erik
e16914f7d6 remove unused param 2016-02-17 14:15:15 -05:00
Erik
c795f9fb25 refactor socketpacket 2016-02-17 14:09:05 -05:00
Erik
12f9207d8a rename waitingData to waitingPackets 2016-02-16 17:03:00 -05:00
Erik
0bf27b8c49 bump version v5.4.1 2016-02-16 14:28:18 -05:00
Erik
6ac96f8d91 modify test 2016-02-16 14:27:18 -05:00
Erik
f7397155b6 add test cases 2016-02-16 14:26:21 -05:00
Erik
70d59ea9d4 fix quotes in strings 2016-02-16 14:21:10 -05:00
Erik
7fe2dc2c70 bump version v5.4.0 2016-02-15 10:48:24 -05:00
Erik
fe9ee602e7 add option for toggling double encoding utf8 2016-02-15 10:43:21 -05:00
Erik
6fa5ce9168 don't call connect timeout if status is closed 2016-02-14 20:16:01 -05:00
Erik
43b2d4646f bump websocket version 2016-02-12 08:45:44 -05:00
Erik
0f70079382 fix possible race condition 2016-02-11 09:36:36 -05:00
Erik
750ba138e1 bump version v5.3.3 2016-02-05 14:05:50 -05:00