Commit Graph

  • 5814e8d275 Merge branch 'master' into swift2.3 Erik 2016-06-24 02:49:14 -04:00
  • 05c0874f32 Merge pull request #408 from socketio/development v6.1.4 Erik Little 2016-06-24 02:41:22 -04:00
  • 2e5442d386 unknown message isn't fatal Erik 2016-06-24 02:35:18 -04:00
  • f9ae0cfdb3 bump version Erik 2016-06-24 02:22:23 -04:00
  • 7ad90de184 Merge branch 'master' into development Erik 2016-06-24 02:21:54 -04:00
  • 4383ddfe65 notify client when engine disconnects Erik 2016-06-24 02:21:25 -04:00
  • 2a0ce72792 small swift 3 changes Erik 2016-06-22 10:04:27 -04:00
  • be76a1607c merge master Erik 2016-06-17 10:16:52 -04:00
  • 45373ad680 bump version v6.1.3 Erik 2016-06-17 10:05:20 -04:00
  • 5ced8a5a9e Merge pull request #399 from socketio/development Erik Little 2016-06-17 10:03:50 -04:00
  • c1a451f314 Merge pull request #398 from davbeck/swift2.3 Erik Little 2016-06-16 19:07:28 -04:00
  • bddc9dc6aa fix logging Erik 2016-06-15 11:00:21 -04:00
  • 7c3de9f30a even more xcode 8 stuff. style changes Erik 2016-06-15 10:13:44 -04:00
  • 2adcf2d35d more xcode 8 stuff Erik 2016-06-15 09:32:47 -04:00
  • 9a4ec5a82a xcode 8 Erik 2016-06-14 20:41:59 -04:00
  • 7500ea83a0 merge development Erik 2016-06-14 19:51:56 -04:00
  • 6fd3294fba Revert "swift 2.3" Erik 2016-06-14 19:41:18 -04:00
  • bfa163f3c2 swift 2.3 Erik 2016-06-14 19:37:27 -04:00
  • d8826a9db3 allow access from objective-c Erik 2016-06-14 16:19:40 -04:00
  • b9e3de2d50 add documentation Erik 2016-06-14 16:13:01 -04:00
  • e163598ee6 add option for sslsecurity Erik 2016-06-14 16:11:37 -04:00
  • 0e38039a0c Updated code to support Swift 2.3 David Beck 2016-06-14 07:17:04 -07:00
  • 2c059e1a6e log server Erik 2016-06-14 09:38:35 -04:00
  • 6f21059ff8 work on experimental manager Erik 2016-06-11 12:37:50 -04:00
  • 523ced2f9a merge development Erik 2016-06-09 09:37:26 -04:00
  • 58a5a17464 Move websocket to subfolder, don't combine websocket files Erik 2016-06-09 09:28:40 -04:00
  • cb0a6f5460 rename method Erik 2016-06-07 13:20:23 -04:00
  • b919d3e411 hopefully fix socket.io/socket.io-client-swift#374 Erik 2016-06-07 13:12:34 -04:00
  • 02f30a81dd fix test Erik 2016-06-06 16:25:37 -04:00
  • e57bcba47d encoding should already be done at this point Erik 2016-06-06 15:41:19 -04:00
  • aae61f3b2e Merge development Erik 2016-06-01 11:17:19 -04:00
  • d88bb43d9c some methods have discardableresults Erik 2016-06-01 11:13:05 -04:00
  • 71f9058723 refactors: refactor creating packet string, various other refactors Erik 2016-05-30 21:42:00 -04:00
  • 0564ded492 don't check type on each pass through loop Erik 2016-05-25 08:47:50 -04:00
  • ff48d3a186 Merge branch 'master' into development Erik 2016-05-25 08:20:03 -04:00
  • 4fa3225cba Merge pull request #372 from ATLCTO/master Erik Little 2016-05-25 08:19:28 -04:00
  • ee24943c72 remove ios tests folder Erik 2016-05-24 11:26:50 -04:00
  • 31e4c60db8 Merge pull request #373 from socketio/development v6.1.2 Erik Little 2016-05-24 11:18:31 -04:00
  • ab536e2279 bump version Erik 2016-05-24 11:08:22 -04:00
  • 3d47ff469f Fix crash if error contains formatting strings. Patrick Childers 2016-05-23 17:03:51 -04:00
  • 3b4a3828ba fix for ackemitter Erik 2016-05-22 14:17:01 -04:00
  • c6d000972e add test Erik 2016-05-22 14:10:43 -04:00
  • 51ee4d3d1d try and avoid a bunch of as AnyObject nonsense Erik 2016-05-22 14:05:01 -04:00
  • 044d9c0746 remove Erik 2016-05-21 12:41:08 -04:00
  • 593db4cd8d update readme Erik 2016-05-21 11:59:16 -04:00
  • f90ad8caeb update for latest swift Erik 2016-05-21 11:45:35 -04:00
  • 3401414430 bump websocket Erik 2016-05-17 22:35:33 -04:00
  • 50216647ca refactors Erik 2016-05-11 13:40:45 -04:00
  • 98063c8bf7 refactoring Erik 2016-05-06 12:48:33 -04:00
  • 9747cc4ddc allow reconnects after disconnecting Erik 2016-05-06 10:17:43 -04:00
  • 95cd24a124 remove swiftregex Erik 2016-05-05 13:36:34 -04:00
  • 6452f6a97a merge dev Erik 2016-05-05 13:33:52 -04:00
  • 7e23597351 no longer need swiftregex Erik 2016-05-05 13:19:26 -04:00
  • 437c0880e8 don't use placeholder strings for binary Erik 2016-05-05 13:12:05 -04:00
  • c237197b8c Merge pull request #362 from socketio/development v6.1.1 Erik Little 2016-05-05 09:21:29 -04:00
  • 4ea3f40ca7 bump version Erik 2016-05-05 08:59:00 -04:00
  • a24b54c18f Merge branch 'master' into development Erik 2016-05-05 08:57:55 -04:00
  • 2377c8b45f Merge pull request #363 from yannickl/development Erik Little 2016-05-04 12:56:59 -04:00
  • e02ca23d14 Add test case #361 Yannick Loriot 2016-05-04 18:35:56 +02:00
  • 18285f5401 small style changes Erik 2016-05-04 09:44:01 -04:00
  • 1c80cc7e4c newline Erik 2016-05-04 09:34:02 -04:00
  • 0959dd35d7 change author name Erik 2016-05-04 09:30:55 -04:00
  • 5d23270d70 Merge branch 'development' of https://github.com/socketio/socket.io-client-swift into development Erik 2016-05-04 09:27:10 -04:00
  • 2b4b5bf407 move comment Erik 2016-05-04 09:27:08 -04:00
  • 84cb635f11 Merge pull request #361 from yannickl/development Erik Little 2016-05-04 09:26:34 -04:00
  • 119b479be2 Minor refactoring to make the build of the query more readable Yannick Loriot 2016-05-04 13:03:40 +02:00
  • 9ff90f511e Fixing url encoding for connect params Yannick Loriot 2016-05-04 12:56:14 +02:00
  • 82e7882497 add rest of emitWithAck for objc test Erik 2016-04-27 18:32:38 -04:00
  • 8e1434e63b change status names, execute engine connect on emitQueue Erik 2016-04-27 14:38:11 -04:00
  • 44ee94d2ac refactors Erik 2016-04-26 15:28:08 -04:00
  • e2db1a086d update for latest swift 3 Erik 2016-04-16 12:00:21 -04:00
  • 9f8db42584 Merge branch 'development' into swift3 Erik 2016-04-16 11:11:05 -04:00
  • 6efeb7d5b2 expose ws Erik 2016-04-16 11:04:26 -04:00
  • e1865e3f94 rename file Erik 2016-04-16 10:43:20 -04:00
  • 1b4b571be6 bump version v6.1.0 Erik 2016-04-11 18:58:02 -04:00
  • c9f653ef2c Merge pull request #344 from socketio/development Erik Little 2016-04-11 18:55:27 -04:00
  • 3073130598 change to how server gives id Erik 2016-04-11 18:51:22 -04:00
  • 376e31bfca merge development and fix tests Erik 2016-04-10 14:15:35 -04:00
  • ed3d49001f bump websocket version Erik 2016-04-10 13:59:21 -04:00
  • 4ee196c5fb add default value to namespace in socketparsable Erik 2016-04-04 11:28:20 -04:00
  • baca9fc8da small refactors Erik 2016-03-31 21:31:24 -04:00
  • 3735dd0e6a Merge branch 'development' into swift3 Erik 2016-03-25 17:03:12 -04:00
  • 1a5ac74984 Merge branch 'master' into development Erik 2016-03-25 17:02:52 -04:00
  • 6c779e84d2 Merge pull request #335 from craigkj312/master Erik Little 2016-03-25 17:01:53 -04:00
  • 293d71bf97 set targetted device family to 3 Kyle Craig 2016-03-25 15:54:57 -05:00
  • 199b9962f0 swift3 naming Erik 2016-03-25 13:11:28 -04:00
  • 4d4362b250 work on swift3 syntax Erik 2016-03-25 12:59:50 -04:00
  • 2f1f77141e add test for objc api Erik 2016-03-25 10:00:14 -04:00
  • d4c01183ab style Erik 2016-03-25 09:48:04 -04:00
  • 5d81377e0a use 7.3 image Erik 2016-03-24 14:17:49 -04:00
  • 8f8d5acdba use 7.3 image Erik 2016-03-24 14:17:49 -04:00
  • a0167ae213 remove deprecated methods Erik 2016-03-23 13:39:22 -04:00
  • 4f5837afa7 don't need objc on this method anymore Erik 2016-03-22 10:15:09 -04:00
  • 718caba9d9 remove nstimer Erik 2016-03-22 09:56:56 -04:00
  • 2919d4a5ce Merge pull request #330 from socketio/development v6.0.0 Erik Little 2016-03-22 09:06:13 -04:00
  • a53b7167b6 update version and readme Erik 2016-03-22 09:05:57 -04:00
  • 6c6b4f32c9 Update for swift 2.2 Erik 2016-03-22 09:00:27 -04:00
  • 3a842469ec fix log placement Erik 2016-03-16 13:13:22 -04:00
  • 596a499041 work on fixing reconnect() Erik 2016-03-11 13:41:09 -05:00
  • 76a572e735 refactor reconnect Erik 2016-03-11 13:03:40 -05:00