Zheng Weihan
4578f7ed35
Merge branch 'orgmaster' into queryStringFix
...
* orgmaster: (44 commits)
bump zuul
Remove jspm browser config
Run lint before test instead of before build
ESlint manual fix
Eslint autofix
Add env to eslintrc
Exclude generated files from linting
updated babel-eslint dep to 4.1.7 (4.1.6 broken)
refactor gulpfile
Add eslint to gulpfile and create gulp task default
fixed regex
Rename gulp task webpack to build
Remove commented make recipe
removed babel react preset
Makefile use gulp from node_modules instead of global
Remove browserify stuff, add zuul-builder-webpack devDep
Migrate zuul config from yml to js
Refactor webpack config out to support/webpack.config.js
removed ide-specific entries from gitignore
updated makefile to use gulp commands
...
Conflicts:
lib/manager.js
lib/socket.js
2016-04-12 19:17:09 +08:00
Naoyuki Kanezawa
2f7c930f49
Merge pull request #957 from guybedford/patch-1
...
Remove jspm browser config
2016-04-12 04:44:10 +09:00
Guillermo Rauch
5eb1d67cd9
Merge pull request #958 from nkzawa/fix/bump-zuul
...
bump zuul
2016-04-11 08:45:18 -07:00
nkzawa
827d0ce3f8
bump zuul
2016-04-11 18:20:24 +09:00
Guy Bedford
7b8db005da
Remove jspm browser config
2016-04-04 11:40:02 +02:00
Guillermo Rauch
78f61c3abc
Merge pull request #951 from nus-fboa2016-si/eslint
...
Add ESLint
2016-03-01 19:05:59 -08:00
Diga Widyaprana
c5ee450638
Run lint before test instead of before build
2016-02-28 21:19:29 +08:00
Diga Widyaprana
c51a930a2c
ESlint manual fix
2016-02-28 02:36:06 +08:00
Diga Widyaprana
d1cbc68ea7
Eslint autofix
2016-02-28 02:36:06 +08:00
Diga Widyaprana
51ad3c1ee0
Add env to eslintrc
...
- node env at root eslintrc
- mocha env at test/ eslintrc
2016-02-28 02:36:06 +08:00
Diga Widyaprana
c0d8e30b8a
Exclude generated files from linting
...
- coverage/
- socket.io.js bundle
2016-02-28 02:26:15 +08:00
Yijin
537e4cd665
updated babel-eslint dep to 4.1.7 (4.1.6 broken)
2016-02-28 02:25:14 +08:00
Yijin
9e443a90e2
refactor gulpfile
2016-02-28 02:24:51 +08:00
Michael Limantara
280d803d46
Add eslint to gulpfile and create gulp task default
2016-02-27 14:47:41 +08:00
Guillermo Rauch
b370bea495
Merge pull request #940 from nus-fboa2016-si/webpack
...
Webpack
2016-02-23 19:13:27 -08:00
whattokingu
f01a349af8
add back changes made in previous commit
...
previous commit [here](3407f3f522
2016-02-16 00:37:05 +08:00
Zhu Liang
8725d6e5cb
fixed regex
2016-02-15 13:34:25 +08:00
whattokingu
bfa458941c
fix error with test.
2016-02-13 13:50:43 +08:00
whattokingu
e0580ef475
Merge pull request #10 from whattokingu/queryStringFix
...
Query string fix
2016-02-13 13:47:53 +08:00
Zheng Weihan
e3c0f6a41e
encodes queries using encodeURIComponent
2016-02-13 13:27:04 +08:00
Zheng Weihan
05250b0f5b
code modification to conform to style guide.
2016-02-13 11:25:28 +08:00
Diga Widyaprana
c7deec13cb
Rename gulp task webpack to build
2016-02-12 20:59:00 +08:00
Diga Widyaprana
49619d9965
Remove commented make recipe
2016-02-12 20:13:27 +08:00
Zhu Liang
60fa83c345
removed babel react preset
2016-02-12 13:40:52 +08:00
Diga Widyaprana
18d6873c64
Makefile use gulp from node_modules instead of global
2016-02-11 00:10:00 +08:00
Diga Widyaprana
422f29ebf6
Remove browserify stuff, add zuul-builder-webpack devDep
2016-02-10 23:44:08 +08:00
Diga Widyaprana
c4b7820cf1
Migrate zuul config from yml to js
2016-02-10 23:43:05 +08:00
Diga Widyaprana
ec06f7a6c3
Refactor webpack config out to support/webpack.config.js
2016-02-10 23:41:27 +08:00
Yijin
b7eeee7e7d
removed ide-specific entries from gitignore
2016-02-10 12:05:24 +08:00
Yijin
2b18f9fbf1
updated makefile to use gulp commands
2016-02-09 17:49:49 +08:00
Yijin
8e55f02c3f
trigger travis rebuild
2016-02-04 20:56:07 +08:00
Yijin
97f8391f2d
fix typo
2016-02-04 19:31:49 +08:00
Yijin
6c2e1c121e
added error code capturing for zuul child process
2016-02-04 19:21:03 +08:00
Yijin
8c86b10e0c
removed babelify dep
2016-02-03 18:42:47 +08:00
Yijin
eb50b6c3d1
standardise gulpfile formatting and conventions
2016-02-03 17:58:11 +08:00
Yijin
d5467efcad
removed dynamic dependencies
2016-02-03 17:05:35 +08:00
Zhu Liang
3407f3f522
update test
2016-02-01 13:50:11 +08:00
Zhu Liang
b14018eed6
fixed test case
2016-02-01 13:00:13 +08:00
Zhu Liang
1c1ee454f5
move babel from standalone to webpack loader
2016-01-31 16:57:31 +08:00
Michael Limantara
911c24505c
Merge branch 'webpack' of https://github.com/nus-fboa2016-si/socket.io-client into webpack
2016-01-31 16:33:10 +08:00
Michael Limantara
468200ed8c
Expose io variable to global when bundling with webpack
2016-01-31 16:33:00 +08:00
whattokingu
6564a0c519
Merge pull request #9 from whattokingu/queryStringFix
...
remove console statement.
2016-01-31 16:11:10 +08:00
Zheng Weihan
1657971d8c
remove console statement.
2016-01-31 16:07:21 +08:00
whattokingu
34f79d303c
Merge pull request #8 from whattokingu/queryStringFix
...
Complete functionality. Add Test.
2016-01-31 15:34:58 +08:00
Zheng Weihan
9fa6b1c6d2
update tests
2016-01-31 15:33:16 +08:00
Zheng Weihan
3290bb43f1
move encoding of query string to lookup function.
...
handles passing of query via query strings
add tests for functionality
2016-01-31 15:29:49 +08:00
Zheng Weihan
b878cdbed2
Revert "rebuild client."
...
This reverts commit 74aff2647e
2016-01-31 14:45:44 +08:00
Zheng Weihan
08e44f3ae4
fix bug and passes tests
2016-01-31 14:45:20 +08:00
whattokingu
526329995c
Merge pull request #7 from whattokingu/queryStringFix
...
pass query as socket property.
2016-01-31 14:25:24 +08:00
Zheng Weihan
8d44b7a938
pass query as Socket property rather than as function params to simplify flow and handle complex event flow.
2016-01-31 14:24:38 +08:00
