Erik
|
6452f6a97a
|
merge dev
|
2016-05-05 13:33:52 -04:00 |
|
Erik
|
7e23597351
|
no longer need swiftregex
|
2016-05-05 13:19:26 -04:00 |
|
Erik
|
437c0880e8
|
don't use placeholder strings for binary
|
2016-05-05 13:12:05 -04:00 |
|
Erik
|
4ea3f40ca7
|
bump version
|
2016-05-05 08:59:00 -04:00 |
|
Erik
|
a24b54c18f
|
Merge branch 'master' into development
* master:
bump version
|
2016-05-05 08:57:55 -04:00 |
|
Erik Little
|
2377c8b45f
|
Merge pull request #363 from yannickl/development
Adding test case for issue #361
|
2016-05-04 12:56:59 -04:00 |
|
Yannick Loriot
|
e02ca23d14
|
Add test case #361
|
2016-05-04 18:35:56 +02:00 |
|
Erik
|
18285f5401
|
small style changes
|
2016-05-04 09:44:01 -04:00 |
|
Erik
|
1c80cc7e4c
|
newline
|
2016-05-04 09:34:02 -04:00 |
|
Erik
|
0959dd35d7
|
change author name
|
2016-05-04 09:30:55 -04:00 |
|
Erik
|
5d23270d70
|
Merge branch 'development' of https://github.com/socketio/socket.io-client-swift into development
* 'development' of https://github.com/socketio/socket.io-client-swift:
Minor refactoring to make the build of the query more readable
Fixing url encoding for connect params
|
2016-05-04 09:27:10 -04:00 |
|
Erik
|
2b4b5bf407
|
move comment
|
2016-05-04 09:27:08 -04:00 |
|
Erik Little
|
84cb635f11
|
Merge pull request #361 from yannickl/development
Fixing url encoding for connect params
|
2016-05-04 09:26:34 -04:00 |
|
Yannick Loriot
|
119b479be2
|
Minor refactoring to make the build of the query more readable
|
2016-05-04 13:03:40 +02:00 |
|
Yannick Loriot
|
9ff90f511e
|
Fixing url encoding for connect params
|
2016-05-04 12:56:14 +02:00 |
|
Erik
|
82e7882497
|
add rest of emitWithAck for objc test
|
2016-04-27 18:32:38 -04:00 |
|
Erik
|
8e1434e63b
|
change status names, execute engine connect on emitQueue
|
2016-04-27 14:38:11 -04:00 |
|
Erik
|
44ee94d2ac
|
refactors
|
2016-04-26 15:28:08 -04:00 |
|
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
|
1b4b571be6
|
bump version
v6.1.0
|
2016-04-11 18:58:02 -04:00 |
|
Erik Little
|
c9f653ef2c
|
Merge pull request #344 from socketio/development
Development
|
2016-04-11 18:55:27 -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 |
|