Erik
|
40ac53844d
|
mess around with a more type safe way to set options
|
2015-10-17 14:49:41 -04:00 |
|
Erik
|
bb518ac1a4
|
See what using an Either type would look like
|
2015-09-24 14:40:16 -04:00 |
|
Erik
|
9860452814
|
don't use operator
|
2015-09-18 13:09:22 -04:00 |
|
Erik
|
f464eba995
|
tweaks
|
2015-09-18 11:52:35 -04:00 |
|
Erik
|
a56227d08a
|
merge master
|
2015-09-18 11:33:07 -04:00 |
|
Erik
|
ba5638a109
|
Revert "tweak to objective-c api"
This reverts commit d0a57ca353268d4473b82d03c3f5b18a875467f4.
|
2015-09-17 09:09:02 -04:00 |
|
Erik
|
67afbcbd56
|
mess around with api
|
2015-09-16 12:46:19 -04:00 |
|
Erik
|
d0a57ca353
|
tweak to objective-c api
|
2015-09-16 11:16:12 -04:00 |
|
Erik
|
2cafec6f12
|
move enum, better description
|
2015-08-14 16:20:43 -04:00 |
|
Erik
|
7ebcd7439f
|
refactor, fix reconnect bug, fix internalmessages
|
2015-08-13 09:56:22 -04:00 |
|
Lukas Schmidt
|
25464ffb9d
|
objc suppoert
|
2015-08-10 15:47:59 +02:00 |
|
Lukas Schmidt
|
184b97ef8c
|
fix merge issues
Signed-off-by: Lukas Schmidt <lukas.schmi@gmail.com>
|
2015-08-10 06:21:29 +02:00 |
|
Lukas Schmidt
|
643ddb5bf9
|
Merge branch 'swift-2' of https://github.com/socketio/socket.io-client-swift into API-improvements
# Conflicts:
# SocketIOClientSwift/SocketEngine.swift
# SocketIOClientSwift/SocketIOClient.swift
# SocketIOClientSwift/SocketTypes.swift
Signed-off-by: Lukas Schmidt <lukas.schmi@gmail.com>
|
2015-08-10 06:18:28 +02:00 |
|
Lukas Schmidt
|
63a257ac80
|
Merge remote-tracking branch 'origin/socketio/swift-2' into API-improvements
Signed-off-by: Lukas Schmidt <lukas.schmi@gmail.com>
# Conflicts:
# SocketIOClientSwift/SocketTypes.swift
|
2015-08-05 12:14:06 +02:00 |
|
Erik
|
06e2311acc
|
fix socketio/socket.io-client-swift#133 can't expose variadics to objective-c
|
2015-08-03 12:41:14 -04:00 |
|
Erik
|
2579c04f67
|
better swift style
|
2015-08-03 10:07:59 -04:00 |
|
Lukas Schmidt
|
7800591367
|
cleanup status api
|
2015-08-02 18:47:37 +02:00 |
|
Erik
|
846f10eb13
|
Merge branch 'master' into swift-2
* master:
update readme
change api for emitack callback
|
2015-07-23 13:51:50 -04:00 |
|
Erik
|
47a839b934
|
change api for emitack callback
|
2015-07-22 19:09:47 -04:00 |
|
Erik
|
a277e88c3b
|
update for xcode 7 beta 4
|
2015-07-21 16:19:15 -04:00 |
|
Erik
|
68078e50d5
|
the weirdness with objc blocks is fixed in Swift 2
|
2015-07-10 06:45:58 -04:00 |
|
Erik
|
1c8fcee772
|
remove comment
|
2015-06-12 09:23:11 -04:00 |
|
Erik
|
78727dc0ee
|
untested with socket.io, this just compiles
|
2015-06-08 20:02:59 -04:00 |
|
Erik
|
acefc89b0d
|
tweaks
|
2015-04-14 16:25:08 -04:00 |
|
Erik
|
156562902e
|
rename folder
|
2015-04-09 19:09:53 -04:00 |
|