1104 Commits

Author SHA1 Message Date
Erik
9a4ec5a82a xcode 8 2016-06-14 20:41:59 -04:00
Erik
7500ea83a0 merge development 2016-06-14 19:51:56 -04:00
Erik
6fd3294fba Revert "swift 2.3"
This reverts commit bfa163f3c2e85776d8bcf0c24eca65b7398f403d.
2016-06-14 19:41:18 -04:00
Erik
bfa163f3c2 swift 2.3 2016-06-14 19:37:27 -04:00
Erik
d8826a9db3 allow access from objective-c 2016-06-14 16:19:40 -04:00
Erik
b9e3de2d50 add documentation 2016-06-14 16:13:01 -04:00
Erik
e163598ee6 add option for sslsecurity 2016-06-14 16:11:37 -04:00
Erik
2c059e1a6e log server 2016-06-14 09:38:35 -04:00
Erik
6f21059ff8 work on experimental manager 2016-06-11 12:38:35 -04:00
Erik
523ced2f9a merge development 2016-06-09 09:37:26 -04:00
Erik
58a5a17464 Move websocket to subfolder, don't combine websocket files 2016-06-09 09:28:40 -04:00
Erik
cb0a6f5460 rename method 2016-06-07 13:20:23 -04:00
Erik
b919d3e411 hopefully fix socket.io/socket.io-client-swift#374 2016-06-07 13:12:34 -04:00
Erik
02f30a81dd fix test 2016-06-06 16:25:37 -04:00
Erik
e57bcba47d encoding should already be done at this point 2016-06-06 15:41:19 -04:00
Erik
aae61f3b2e Merge development 2016-06-01 11:17:19 -04:00
Erik
d88bb43d9c some methods have discardableresults 2016-06-01 11:13:05 -04:00
Erik
71f9058723 refactors: refactor creating packet string, various other refactors 2016-05-30 21:42:00 -04:00
Erik
0564ded492 don't check type on each pass through loop 2016-05-25 08:47:50 -04:00
Erik
ff48d3a186 Merge branch 'master' into development
* master:
  Fix crash if error contains formatting strings.
2016-05-25 08:20:03 -04:00
Erik Little
4fa3225cba Merge pull request #372 from ATLCTO/master
Fix crash if error contains formatting strings.
2016-05-25 08:19:28 -04:00
Erik
ee24943c72 remove ios tests folder 2016-05-24 11:26:50 -04:00
Erik Little
31e4c60db8 Merge pull request #373 from socketio/development
Development
v6.1.2
2016-05-24 11:18:31 -04:00
Erik
ab536e2279 bump version 2016-05-24 11:08:22 -04:00
Patrick Childers
3d47ff469f Fix crash if error contains formatting strings. 2016-05-23 17:03:51 -04:00
Erik
3b4a3828ba fix for ackemitter 2016-05-22 14:17:01 -04:00
Erik
c6d000972e add test 2016-05-22 14:10:43 -04:00
Erik
51ee4d3d1d try and avoid a bunch of as AnyObject nonsense 2016-05-22 14:05:01 -04:00
Erik
044d9c0746 remove 2016-05-21 12:41:08 -04:00
Erik
593db4cd8d update readme 2016-05-21 11:59:16 -04:00
Erik
f90ad8caeb update for latest swift 2016-05-21 11:45:35 -04:00
Erik
3401414430 bump websocket 2016-05-17 22:35:33 -04:00
Erik
50216647ca refactors 2016-05-11 13:40:45 -04:00
Erik
98063c8bf7 refactoring 2016-05-06 12:48:33 -04:00
Erik
9747cc4ddc allow reconnects after disconnecting 2016-05-06 10:17:43 -04:00
Erik
95cd24a124 remove swiftregex 2016-05-05 13:36:34 -04:00
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 Little
c237197b8c Merge pull request #362 from socketio/development
Development
v6.1.1
2016-05-05 09:21:29 -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