Erik Little
1af7bd842e
Revert "travis plz"
...
This reverts commit 7bd019fb283e3fd015bff85f451304f2eb3f365d.
2016-07-21 11:15:20 -04:00
Erik Little
7bd019fb28
travis plz
2016-07-21 11:15:07 -04:00
Erik Little
bb9ea1849a
Merge branch 'development' into swift3
...
* development:
don't try and start server
2016-07-21 10:52:15 -04:00
Erik Little
cc449a49ea
don't try and start server
2016-07-21 10:49:32 -04:00
Erik Little
4c8bfb91eb
use a whitelist
2016-07-21 10:44:51 -04:00
Erik Little
3500211eed
Merge branch 'development' into swift3
...
* development:
change travis config
remove log for dorequest
2016-07-21 10:44:11 -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
4ad3a884a6
merge development
2016-07-20 11:39:37 -04:00
Erik
f15a6dc491
bump version
v6.1.5
2016-07-20 11:25:45 -04:00
Erik
7fb2193032
fix swiftpm
2016-07-20 11:22:05 -04:00
Erik
8df6eeb85a
Merge branch 'aputinski-swift3' into swift3
...
* aputinski-swift3:
update tests, add test for base64
Fix Xcode 8 Beta 3 issues/warnings
Use Legacy Swift Language Version
Enable APPLICATION_EXTENSION_API_ONLY
2016-07-20 11:08:00 -04:00
Erik
4ad5025c77
update tests, add test for base64
2016-07-20 11:07:37 -04:00
Adam Putinski
777fa30c76
Fix Xcode 8 Beta 3 issues/warnings
2016-07-19 23:01:59 -04:00
Adam Putinski
f214de1407
Use Legacy Swift Language Version
2016-07-19 22:37:56 -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
dcf206b0f1
Merge pull request #422 from aputinski/api-extensions-only
...
Enable APPLICATION_EXTENSION_API_ONLY
2016-07-19 09:11:30 -04:00
Erik
e961e11487
change another method name
2016-07-16 22:27:50 -04:00
Erik
f140d7979e
change method name
2016-07-16 21:27:18 -04:00
Erik
afa27e4173
get readme ready for swift3
2016-07-16 21:06:22 -04:00
Erik Little
a9ac86ba3d
fix method call
2016-07-15 10:11:05 -04:00
Erik
f3d771641d
some swift3 changes
2016-07-14 19:54:09 -04:00
Erik
f6dc11650d
merge development
2016-07-14 19:36:48 -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
e8219e6b6a
merge development
2016-07-14 19:12:03 -04:00
Erik
9cc60ab63d
hopefully fix race condition in acks
2016-07-14 18:57:27 -04:00
Adam Putinski
3828211446
Enable APPLICATION_EXTENSION_API_ONLY
2016-07-13 06:34:02 -04:00
Erik
36aa57e89c
beta2
2016-07-06 11:47:25 -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
c129118496
merge development
2016-06-24 02:53:31 -04:00
Erik Little
05c0874f32
Merge pull request #408 from socketio/development
...
Development
v6.1.4
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
2a0ce72792
small swift 3 changes
2016-06-22 10:04:27 -04:00
Erik
45373ad680
bump version
v6.1.3
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
bddc9dc6aa
fix logging
2016-06-15 11:00:21 -04:00
Erik
7c3de9f30a
even more xcode 8 stuff. style changes
2016-06-15 10:13:44 -04:00
Erik
2adcf2d35d
more xcode 8 stuff
2016-06-15 09:32:47 -04:00
Erik
9a4ec5a82a
xcode 8
2016-06-14 20:41:59 -04:00