Commit Graph

1305 Commits

Author SHA1 Message Date
Ivan Smolin 035f3c4b97
Merge pull request #2 from TouchInstinct/merge_swift_5
merge petropavel/socket.io master to TouchInstinct/socket.io master
2019-05-23 18:56:32 +03:00
Ivan Smolin 64bee1d240 merge petropavel/socket.io master to TouchInstinct/socket.io master 2019-05-22 17:49:06 +03:00
Igor Kislyuk 3275816769
Merge pull request #1 from TouchInstinct/fix/swift4
Fix/swift4
2017-11-24 13:05:24 +03:00
Igor Kislyuk 095d716853 Revert changing configuration 2017-11-24 12:36:01 +03:00
Igor Kislyuk 85063a40bd Fix api 2017-11-24 09:23:32 +03:00
Igor Kislyuk ee1dc3a737 Swift 4 warnings 2017-11-24 09:20:21 +03:00
Igor Kislyuk 8153d0e138 Swift 4 fixes 2017-11-24 09:15:29 +03:00
Nikolai Ashanin 7b20d3861a Update SocketIOClient.swift
socketio chat url
2017-03-30 18:24:12 +03:00
Erik 3faf183cb2
bump version 2017-03-29 12:22:15 -04:00
Erik fafd8b5f22
Merge branch 'development'
* development:
  bump websocket
  note that swift2.3 is a tag now
  Bump websocket version, fix some warnings
2017-03-29 12:20:37 -04:00
Erik 373c1a3447
bump websocket 2017-03-29 12:20:28 -04:00
Erik 3d5cf24de4
note that swift2.3 is a tag now 2017-03-28 05:14:39 -04:00
Erik 1f8c8b8f61
note that swift2.3 is a tag now 2017-03-28 05:14:25 -04:00
Erik 9e94ed1cea
Bump websocket version, fix some warnings 2017-03-28 05:10:46 -04:00
Erik 01790af3c5
bump version for xcode 8.3 2017-03-28 05:03:14 -04:00
Erik 551ad7f6af
bump version 2017-03-08 19:56:48 -05:00
Erik b3fd4203d2
Merge branch 'development'
* development:
  SocketAckManager thread-safe acks removal
  thread-safe ack generation
  bump websocket
  Fix building on xcode8.3
  double encoding should be getting fixed, make the default false
  bump websocket
2017-03-08 19:55:46 -05:00
Erik Little c462381587 Merge pull request #629 from Sistemium/development
SocketAckManager thread-safe acks removal
2017-03-07 10:17:52 -05:00
Alexander Levin 99faafe723 SocketAckManager thread-safe acks removal 2017-03-06 19:57:19 +02:00
Erik Little efefecdbe3 Merge pull request #622 from Sistemium/development
thread-safe ack generation
2017-02-23 18:50:36 -05:00
Alexander Levin fcb2b6bbf6 thread-safe ack generation 2017-02-23 09:32:50 +02:00
Erik cce88ae3eb
bump websocket 2017-02-12 12:13:21 -05:00
Erik Little 1616a58bd7
Fix building on xcode8.3 2017-01-30 12:13:02 -05:00
Erik 0fcb7903bb
double encoding should be getting fixed, make the default false 2017-01-23 16:48:37 -05:00
Erik 3db37023c7
Merge branch 'master' into development
* master:
  Update SocketEngine.swift
  Update SocketEngine.swift
2017-01-23 16:44:02 -05:00
Erik Little e38bda7239 Merge pull request #602 from mephi1984/patch-1
Update SocketEngine.swift
2017-01-23 08:47:49 -05:00
Erik 9a05f794f7
bump websocket 2016-12-30 19:49:23 -05:00
Vladislav Khorev f943f41895 Update SocketEngine.swift
Fix issue #101
Place code in handleOpen, according to suggestion:
https://github.com/socketio/socket.io-client-swift/pull/602#issuecomment-269233001
2016-12-30 19:49:48 +03:00
Vladislav Khorev 494f3fa199 Update SocketEngine.swift
Fix issue #101
https://github.com/socketio/socket.io-client-swift/issues/101
2016-12-26 12:40:14 +03:00
Erik 0bb7fdd2eb
bump version 2016-12-18 20:19:09 -05:00
Erik 650538ad2e
Merge branch 'development'
* development:
  bump ws, fix #598
  remove namespace from socket id
2016-12-18 20:17:51 -05:00
Erik b1debdf912
bump ws, fix #598 2016-12-18 20:06:12 -05:00
Erik 077de02345
remove namespace from socket id 2016-11-24 08:15:17 -05:00
Erik 163a770abc
bump version 2016-11-11 15:55:48 -05:00
Erik fc2a8e348c
Merge branch 'development'
* development:
  Fix #562
2016-11-11 15:53:58 -05:00
Erik 56278795ea
Merge branch 'development' of https://github.com/socketio/socket.io-client-swift into development
* 'development' of https://github.com/socketio/socket.io-client-swift:
  SocketAckEmitter.isExpected => .expected
  change isRequired() to isExpected()
  remove semicolon
  Update README.md
  add SocketAckEmitter.isRequired()
  Update README.md
  bump version
  bump websocket version
  fix Use Legacy Swift issue
  bump websocket version
  Update README.md
2016-11-11 15:52:48 -05:00
Erik a82f27ab8c
Fix #562 2016-11-11 15:52:36 -05:00
Erik Little 2b8476ceca
bump version 2016-10-28 11:53:02 -04:00
Erik Little 5ed4723535
Merge branch 'development'
* development:
  SocketAckEmitter.isExpected => .expected
  change isRequired() to isExpected()
  remove semicolon
  add SocketAckEmitter.isRequired()
  fix Use Legacy Swift issue
2016-10-28 11:51:58 -04:00
Erik Little b6aaa42337
Merge branch 'master' into development
* master:
  Update README.md
2016-10-28 11:51:46 -04:00
Erik Little e723604816 Merge pull request #544 from alexsun/patch-1
fix Use Legacy Swift issue
2016-10-28 11:46:46 -04:00
Erik Little 51ee9654da Merge pull request #557 from naderio/master
add SocketAckEmitter.expected to indicate if an ack is expected by server
2016-10-28 11:17:30 -04:00
Nader Toukabri ea3fca3767 SocketAckEmitter.isExpected => .expected 2016-10-28 15:59:50 +01:00
Nader Toukabri efad448fab change isRequired() to isExpected() 2016-10-28 15:14:07 +01:00
Nader Toukabri 018c993a9d remove semicolon 2016-10-28 15:09:21 +01:00
Erik Little 863480acf2 Update README.md 2016-10-28 09:43:46 -04:00
Nader Toukabri ff12285e94 add SocketAckEmitter.isRequired() 2016-10-28 14:23:22 +01:00
Nader Toukabri 51b95f9cee Merge pull request #1 from socketio/master
sync
2016-10-28 12:56:33 +01:00
Erik Little 86181525df Update README.md 2016-10-27 07:14:53 -04:00
Erik Little 85b6dc1766
bump version 2016-10-27 07:02:01 -04:00