Commit Graph

682 Commits

Author SHA1 Message Date
Arnout Kazemier
67f399263a Fixed merge fail 2011-08-29 21:32:44 +02:00
Arnout Kazemier
70d45aa8a9 Merge branch 'master' of github.com:LearnBoost/socket.io-client into FF6
Conflicts:
	lib/transports/websocket.js
2011-08-29 21:30:13 +02:00
Arnout Kazemier
ecb370e820 Removed '' 2011-08-29 21:28:00 +02:00
Guillermo Rauch
62feaa3ba8 Release 0.8.2 2011-08-29 10:33:41 -07:00
Guillermo Rauch
fcd2552a5a Style fixes
Rebuild
2011-08-29 10:32:17 -07:00
Guillermo Rauch
3a8943a817 Release 0.8.1 2011-08-29 09:39:01 -07:00
einaros
a44da0fb74 javascript encoding issue 2011-08-29 11:51:57 +02:00
einaros
b9729a7679 fixed issue where websocket detection runs before flashsocket initialization, causing the latter not to work 2011-08-29 11:37:23 +02:00
Guillermo Rauch
2b416c25f6 Bump version. 2011-08-28 15:38:39 -07:00
Guillermo Rauch
f533ae5322 Release 0.8.0 2011-08-28 15:28:55 -07:00
Guillermo Rauch
4fdb7f73f7 Changed detection of WebSocket object.
Fixed; removed pollution of window.
2011-08-28 15:23:11 -07:00
einaros
a30aaf5a3e added mozilla MozWebSocket redirect 2011-08-28 11:36:22 +02:00
Guillermo Rauch
1f8e07d0d0 Release 0.7.11 2011-08-27 15:28:09 -07:00
Guillermo Rauch
434a6c2965 Release 0.7.10 2011-08-27 11:38:19 -07:00
Guillermo Rauch
d376333828 Merge pull request #281 from 3rd-Eden/failingfail
Fix for failing fallback in websockets
2011-08-15 15:50:35 -07:00
Arnout Kazemier
cf6de27faf Fix for failing fallback in websockets 2011-08-16 00:39:54 +02:00
Guillermo Rauch
bef84f2082 Release 0.7.9 2011-08-12 10:17:29 -07:00
Guillermo Rauch
9f2a75970c Build 2011-08-12 10:16:09 -07:00
Guillermo Rauch
a3b3caa0b2 Removed test handler for removed test. 2011-08-12 10:13:51 -07:00
Guillermo Rauch
72e06aff1b Fixed socket namespace connect test.
Remove broken alternative namespace connect test.
2011-08-12 10:13:24 -07:00
Guillermo Rauch
0b6c3db573 Added check on Socket#onConnect to prevent double connect events on the main manager. 2011-08-12 10:12:42 -07:00
Guillermo Rauch
fdcc8c74b8 Updated build with version. 2011-08-12 06:47:48 -07:00
Guillermo Rauch
e917aa0bbc Build 2011-08-12 06:46:22 -07:00
Guillermo Rauch
1771590dcf Merge pull request #276 from 3rd-Eden/bug/458
Fixes #458 #385
2011-08-12 06:36:58 -07:00
Arnout Kazemier
8fdf4e2cf5 Fixes #458 #385 2011-08-11 12:00:33 +02:00
Guillermo Rauch
26ead25338 Release 0.7.5 2011-08-08 07:54:37 -07:00
Guillermo Rauch
f92b28cf41 Build 2011-08-08 07:44:05 -07:00
Guillermo Rauch
95c8b66864 Merge pull request #274 from 3rd-Eden/node
Node support
2011-08-07 15:00:11 -07:00
Arnout Kazemier
ef8be0e5b7 Merge branch 'bug/268/2' of github.com:3rd-Eden/Socket.IO into node 2011-08-07 23:50:16 +02:00
Arnout Kazemier
9ad05ab6d2 Passes test 2011-08-07 23:48:52 +02:00
Arnout Kazemier
00a8c52cc1 I did one undo to much before saving it. Fixed uniqueURI again 2011-08-07 23:38:44 +02:00
Arnout Kazemier
f544d5fb43 Completed refactor of #240 Fixes #208
Updated package.json
Fixed ineffecient document check
2011-08-07 23:30:59 +02:00
Arnout Kazemier
e0d3bdb4ac We decided to follow the inherit of node. So we only merge it for transport that
need it
2011-08-07 21:27:11 +02:00
Arnout Kazemier
f32832fed3 Added xhr-transport support on node 2011-08-07 20:30:09 +02:00
Arnout Kazemier
634fdaf2a7 Merge branch 'bug/268/2' of github.com:3rd-Eden/Socket.IO into node 2011-08-07 20:23:50 +02:00
Arnout Kazemier
f4e8abd4ec Inital checkin on Node support 2011-08-07 19:37:56 +02:00
Arnout Kazemier
7e57687ae9 Fixes #268 , without reconenct branch now <3 2011-08-05 21:21:30 +02:00
Guillermo Rauch
7fbf340c63 Fixed builder test 2011-08-03 12:01:19 -07:00
Guillermo Rauch
15ee167ca9 Changed util.inherit to replicate Object.create / __proto__ 2011-08-03 12:00:31 -07:00
Guillermo Rauch
1d4b9e3389 Merge pull request #265 from 3rd-Eden/query
Reverted a merge/upstream fail that removed a vital part of the implement
2011-08-02 16:03:31 -07:00
Guillermo Rauch
6392a40388 Merge pull request #266 from 3rd-Eden/bugs/ie8
Small test case clean up
2011-08-02 16:03:19 -07:00
Arnout Kazemier
0ab37174dd Reverted a merge/upstream fail that removed a vital part of the implementation 2011-08-03 00:41:32 +02:00
Guillermo Rauch
f441561a8d Merge pull request #228 from 3rd-Eden/query
Query
2011-08-02 15:36:03 -07:00
Arnout Kazemier
b235e709de Merge branch 'master' of github.com:LearnBoost/socket.io-client into query
Conflicts:
	support/test-runner/app.js
	test/socket.test.js
2011-08-03 00:27:07 +02:00
Arnout Kazemier
6cf4577a90 seems like this would work.. 2011-08-02 23:16:02 +02:00
Arnout Kazemier
846b3b3e40 Typo and removed the throw error 2011-08-02 22:49:57 +02:00
Guillermo Rauch
dd0b3b9d53 Fixed; make counter local so that acceptance tests can be run multiple times. 2011-08-02 11:02:21 -07:00
Guillermo Rauch
d277188422 Removed TRANSPORT from Makefile otherwise it's not overrideable. 2011-08-02 11:00:10 -07:00
Guillermo Rauch
dd60febd55 Build 2011-08-02 10:55:18 -07:00
Guillermo Rauch
66925b26f6 Merge branch 'master' of github.com:LearnBoost/socket.io-client
Conflicts:
	support/test-runner/app.js
2011-08-02 10:54:57 -07:00