Commit Graph

1117 Commits

Author SHA1 Message Date
Erik Little 4d12f9f510
Merge branch 'development' into swift2.3
* development:
  don't try and start server
2016-07-21 10:51:54 -04:00
Erik Little cc449a49ea
don't try and start server 2016-07-21 10:49:32 -04:00
Erik Little a2969680e8
Merge branch 'development' into swift2.3
* development:
  change travis config
  remove log for dorequest
2016-07-21 10:47:39 -04:00
Erik Little b65b63a9f0
Merge branch 'master' into development
* master:
  change travis config
2016-07-21 10:42:30 -04:00
Erik Little 87c86f8aeb
change travis config 2016-07-21 10:42:14 -04:00
Erik Little c9b60445ca
remove log for dorequest 2016-07-21 10:28:20 -04:00
Erik 744d6bd062
Merge branch 'development' into swift2.3
* development:
  bump version
  fix swiftpm
  rename variable
  Enable APPLICATION_EXTENSION_API_ONLY
  fix method call
  fixes
  don't stall queues
  hopefully fix race condition in acks
  refactors
  Update README.md
  refactors, rename file
  refactoring
  refactor some serialization into methods
2016-07-20 11:32:38 -04:00
Erik f15a6dc491
bump version 2016-07-20 11:25:45 -04:00
Erik 7fb2193032
fix swiftpm 2016-07-20 11:22:05 -04:00
Erik Little e56741b669
rename variable 2016-07-19 15:03:03 -04:00
Adam Putinski 559fbc0286
Enable APPLICATION_EXTENSION_API_ONLY 2016-07-19 09:15:28 -04:00
Erik Little a9ac86ba3d
fix method call 2016-07-15 10:11:05 -04:00
Erik dce28b2dac fixes 2016-07-14 19:26:56 -04:00
Erik 8345eae28c don't stall queues 2016-07-14 19:25:48 -04:00
Erik 9cc60ab63d hopefully fix race condition in acks 2016-07-14 18:57:27 -04:00
Erik 22030e1153 refactors 2016-07-06 11:19:18 -04:00
Erik 73b042b41e Merge branch 'master' into development
* master:
  Update README.md
2016-07-01 17:06:59 -04:00
Erik Little f52607f722 Update README.md 2016-07-01 17:06:37 -04:00
Erik f00ed17783 refactors, rename file 2016-07-01 15:42:13 -04:00
Erik 5840d2b61b refactoring 2016-07-01 15:38:53 -04:00
Erik 17d3e659c1 refactor some serialization into methods 2016-07-01 15:36:06 -04:00
Erik 5814e8d275 Merge branch 'master' into swift2.3
* master:
  unknown message isn't fatal
  bump version
  notify client when engine disconnects
2016-06-24 02:49:14 -04:00
Erik Little 05c0874f32 Merge pull request #408 from socketio/development
Development
2016-06-24 02:41:22 -04:00
Erik 2e5442d386 unknown message isn't fatal 2016-06-24 02:35:18 -04:00
Erik f9ae0cfdb3 bump version 2016-06-24 02:22:23 -04:00
Erik 7ad90de184 Merge branch 'master' into development
* master:
  bump version
2016-06-24 02:21:54 -04:00
Erik 4383ddfe65 notify client when engine disconnects 2016-06-24 02:21:25 -04:00
Erik be76a1607c merge master 2016-06-17 10:16:52 -04:00
Erik 45373ad680 bump version 2016-06-17 10:05:20 -04:00
Erik Little 5ced8a5a9e Merge pull request #399 from socketio/development
Development
2016-06-17 10:03:50 -04:00
Erik Little c1a451f314 Merge pull request #398 from davbeck/swift2.3
Updated code to support Swift 2.3
2016-06-16 19:07:28 -04:00
Erik 6fd3294fba Revert "swift 2.3"
This reverts commit bfa163f3c2.
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
David Beck 0e38039a0c Updated code to support Swift 2.3 2016-06-14 07:31:15 -07: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 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 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
2016-05-24 11:18:31 -04:00