Commit Graph

7697 Commits

Author SHA1 Message Date
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
Guillermo Rauch
0f434dfb41 Build 2011-08-02 10:54:13 -07:00
Guillermo Rauch
15414cba65 Added test encoding a payload test 2011-08-02 10:53:56 -07:00
Guillermo Rauch
89506b324f Commented out forced transports from test runner
Added additional test
2011-08-02 10:53:33 -07:00
Dylan Greene
a51fe07420 Updated the package location. 2011-08-01 14:44:11 -03:00
Arnout Kazemier
a631f86b3b Merged with upstream master 2011-07-31 10:22:54 +02:00
Guillermo Rauch
a4ec5aafa6 Merge pull request #363 from dvv/489bc860d2f050a7925e602a6d16c428f2784b40
small cleanup
2011-07-30 20:32:39 -07:00
Guillermo Rauch
984639ba67 Merge pull request #381 from 3rd-Eden/alias
Added alias for to to in and in to to
2011-07-30 20:27:30 -07:00
Guillermo Rauch
9923c1dee9 Merge branch 'master' of github.com:LearnBoost/socket.io 2011-07-30 20:23:35 -07:00
Guillermo Rauch
1b0a4849df Added test (fixes #380). 2011-07-30 20:21:13 -07:00
Guillermo Rauch
4fc43f322f Changed; make sure sio#listen passes options to both HTTP server and socket.io manager.
Added docs for sio#listen.
2011-07-30 20:20:31 -07:00
Guillermo Rauch
5c0f78ab02 Added options parameter support for Manager constructor. 2011-07-30 20:19:38 -07:00
Guillermo Rauch
d8c7060cc8 Merge pull request #396 from 3rd-Eden/xxs
Potential fix for #372
2011-07-30 18:49:47 -07:00
Guillermo Rauch
b0335b0a61 Merge pull request #339 from 3rd-Eden/333
Don't require redis by default
2011-07-30 18:47:41 -07:00
Guillermo Rauch
a1797ccd4b Merge pull request #337 from 3rd-Eden/handshakeData
Expose path and querystring in handshakeData
2011-07-30 18:47:12 -07:00
Guillermo Rauch
a1c997bc58 Merge pull request #401 from Pita/master
Send response once we got all POST data, not immediately
2011-07-30 18:36:08 -07:00
Guillermo Rauch
0b9b28d251 Merge pull request #409 from 3rd-Eden/bug/407
Fix for #407
2011-07-30 17:59:06 -07:00
Guillermo Rauch
a79b2fa761 Added memory leaks tests. 2011-07-30 17:53:35 -07:00
Guillermo Rauch
195eba74de Added assertvanish dev dependency. 2011-07-30 17:53:22 -07:00
Guillermo Rauch
3edebe5d61 Added test-leaks Makefile task. 2011-07-30 17:53:14 -07:00
Guillermo Rauch
b56389fbc8 Removed auto npm-linking from make test. 2011-07-30 14:46:54 -07:00
Guillermo Rauch
203293db0b Merge pull request #413 from 3rd-Eden/update/package
updated package.json with new build of policyfile and redis
2011-07-30 14:33:09 -07:00
Guillermo Rauch
2b7ea448c4 Merge pull request #416 from 3rd-Eden/test/374
Added testcase to prevent #374 from happening again
2011-07-30 14:32:51 -07:00
Guillermo Rauch
c627f1b7d0 Merge pull request #421 from 3rd-Eden/bug/heartbeat
Make sure that you can disable heart beats
2011-07-30 14:32:34 -07:00
Guillermo Rauch
39348defe7 Merge pull request #250 from DanielBaulig/issue-247
Fix for Issue 247
2011-07-29 21:09:13 -07:00
Guillermo Rauch
1ccd77a97c Merge pull request #253 from 3rd-Eden/bug/252
fix for #252 only the last response was send to the server
2011-07-29 21:07:13 -07:00
Guillermo Rauch
d261c892ff Merge pull request #254 from 3rd-Eden/update/package
Update/package
2011-07-29 21:06:47 -07:00
Daniel Shaw
831f1baa4a Merge remote-tracking branch 'learnboost/master' 2011-07-28 16:38:48 -07:00
Guillermo Rauch
9c30c315e6 Merge pull request #258 from 3rd-Eden/test/transports
Added the ability to specify the transport that needs to be tested
2011-07-28 11:10:00 -07:00
Arnout Kazemier
cb1816f4a2 Added the ability to specify the transport that needs to be tested 2011-07-28 19:58:27 +02:00
Arnout Kazemier
eccb04dcd2 small code clean up 2011-07-28 15:15:46 +02:00
Guillermo Rauch
298c7443a6 Fixed #426 2011-07-27 12:32:47 -07:00
Guillermo Rauch
4c20afd4b7 Merge pull request #346 from ericz/patch-1
Change `;` typo to `,` in first example
2011-07-26 01:48:22 -07:00
Arnout Kazemier
573e1d61c8 Added test case for encoding issue 2011-07-26 10:35:13 +02:00
Arnout Kazemier
c92d02c430 code cleanup 2011-07-26 10:16:17 +02:00
Arnout Kazemier
f090fafb0f Fix for https://github.com/LearnBoost/socket.io/issues/422 2011-07-26 10:14:14 +02:00
Arnout Kazemier
a50b83996f updated uglify to latest version 2011-07-26 09:42:47 +02:00
Arnout Kazemier
6e8325e78f fix for #252 only the last response was send to the server 2011-07-25 22:53:53 +02:00
Arnout Kazemier
f689434f61 Make sure that you can disable heart beats 2011-07-25 22:12:48 +02:00
Arnout Kazemier
b694ee68c9 Added testcase to prevent #374 from happening again 2011-07-24 13:21:30 +02:00
Guillermo Rauch
8b22ca2ffd Merge pull request #415 from 3rd-Eden/bug/rooms
Bug/rooms
2011-07-24 02:30:36 -07:00
Arnout Kazemier
5c50c4844f fixed missing done() that cuased the suite to timeout 2011-07-24 11:27:43 +02:00