Erik
|
332ff6f40b
|
handle error message
|
2015-04-09 01:39:27 -04:00 |
|
Erik
|
7adf624dca
|
Merge branch 'master' into engineerrors
|
2015-04-09 01:14:40 -04:00 |
|
Erik
|
ca4e404125
|
use static
|
2015-04-09 01:06:41 -04:00 |
|
Erik
|
67c41c0107
|
use new if let
|
2015-04-09 01:01:14 -04:00 |
|
Erik
|
a01e85ba05
|
Merge branch 'master' into engineerrors
|
2015-04-09 00:39:43 -04:00 |
|
Erik
|
0588556c17
|
1.2 fixes single statement closures
|
2015-04-08 23:57:07 -04:00 |
|
Erik
|
076bbfc782
|
commit fix for binary
|
2015-04-08 21:51:11 -04:00 |
|
Erik
|
01e5e22e0b
|
merge master
|
2015-04-08 21:16:56 -04:00 |
|
Erik
|
14487a1beb
|
use int for enum
|
2015-04-08 21:14:52 -04:00 |
|
Erik
|
eb5d03c88b
|
redo types
|
2015-04-08 20:51:44 -04:00 |
|
Erik
|
31a41072c3
|
fix warning
|
2015-04-08 17:14:56 -04:00 |
|
Erik
|
a0dff2fea4
|
Merge branch '1.2'
|
2015-04-08 17:07:59 -04:00 |
|
Erik
|
acdb29dca4
|
add message about @objc_block
|
2015-04-08 11:10:35 -04:00 |
|
Erik
|
d8ea3a3c11
|
merge master
|
2015-04-07 21:56:36 -04:00 |
|
Erik
|
be5764ce59
|
Merge branch 'master' into engineerrors
|
2015-04-07 21:54:59 -04:00 |
|
Erik
|
ac28c7541e
|
fix socketio/socket.io-client-swift#46
|
2015-04-07 21:53:14 -04:00 |
|
Erik
|
c1eae5a500
|
fix missing file
|
2015-04-07 16:18:07 -04:00 |
|
Erik
|
473d422668
|
replace fatalError with an error method
|
2015-04-07 15:50:01 -04:00 |
|
Erik
|
fcc202ab04
|
fix indentation
|
2015-04-07 13:33:48 -04:00 |
|
Erik
|
eb56a8de9c
|
merge master
|
2015-04-06 13:05:21 -04:00 |
|
Erik
|
eb9d2bc744
|
better closing
|
2015-04-06 12:59:39 -04:00 |
|
Erik
|
a4e81fee6a
|
fix outstanding poll messages after switch to websockets
|
2015-04-06 12:49:39 -04:00 |
|
Erik
|
9489676009
|
use weak references to client
|
2015-04-06 11:56:47 -04:00 |
|
Erik
|
63cbf49448
|
fixes
|
2015-04-04 10:47:53 -04:00 |
|
Erik
|
a17f2b6e7a
|
merge master
|
2015-04-03 16:37:02 -04:00 |
|
Erik
|
838dade0fa
|
Fix messages getting stuck in post
|
2015-04-03 16:18:15 -04:00 |
|
Erik
|
affd792334
|
redo acks
|
2015-04-03 16:04:50 -04:00 |
|
Erik
|
c1b0d3abeb
|
merge master
|
2015-04-01 16:08:23 -04:00 |
|
Erik
|
f7b064d80f
|
refactor SocketEngine#sendPing
|
2015-04-01 14:49:01 -04:00 |
|
Erik
|
918d40d68c
|
Merge branch 'master' into 1.2
|
2015-03-31 14:27:35 -04:00 |
|
Erik
|
01a699c7c6
|
add return to pong message
|
2015-03-31 00:04:09 -04:00 |
|
Erik
|
5fffa685e9
|
merge master
|
2015-03-28 16:58:12 -04:00 |
|
Erik
|
93f1cfe9dc
|
fix socketio/socket.io-client-swift#36
|
2015-03-28 16:54:48 -04:00 |
|
Erik
|
da1cf9eb89
|
socketio/socket.io-client-swift#37
|
2015-03-28 16:16:03 -04:00 |
|
Erik
|
a61f1c8484
|
merge master
|
2015-03-27 12:41:49 -04:00 |
|
Erik
|
57731bebf8
|
Fix for first polling messages with unicode
|
2015-03-27 12:35:12 -04:00 |
|
Erik
|
81d58fbd69
|
fix nsp for default
|
2015-03-27 12:22:59 -04:00 |
|
Erik
|
c4731dc298
|
don't crash if nsp starts with /
|
2015-03-27 12:21:05 -04:00 |
|
Erik
|
a4361a04b6
|
style
|
2015-03-27 12:14:45 -04:00 |
|
Erik
|
ffcd841267
|
Fix binary acks
|
2015-03-27 12:13:06 -04:00 |
|
Erik
|
d308111a8f
|
fix for 1.2
|
2015-03-27 11:35:02 -04:00 |
|
Erik
|
f669267f51
|
Merge branch 'master' into 1.2
|
2015-03-27 11:30:41 -04:00 |
|
Erik
|
98e0c355f9
|
add forcewebsockets option
|
2015-03-27 09:35:39 -04:00 |
|
Erik
|
2cae405d29
|
try and avoid bad engine states
|
2015-03-26 13:15:43 -04:00 |
|
Erik
|
f008f116a6
|
fix socketio/socket.io-client-swift#27
|
2015-03-26 10:13:30 -04:00 |
|
Erik
|
77532acbd3
|
merge master
|
2015-03-25 17:03:55 -04:00 |
|
Erik
|
9512c8b9ac
|
change api
|
2015-03-25 12:02:45 -04:00 |
|
Erik
|
90f50a1c7e
|
add missing file
|
2015-03-25 11:51:55 -04:00 |
|
Erik
|
182ba0017b
|
fix nuclearace/Socket.IO-Client-Swift#12 better closing
|
2015-03-25 11:50:25 -04:00 |
|
Erik
|
5b897ddfea
|
indentation
|
2015-03-24 14:13:21 -04:00 |
|