549 Commits

Author SHA1 Message Date
Matthijs van Henten
39ff40bf74 Revert " Mvh frontdoor params" 2015-04-16 11:51:58 +02:00
Fabian Jakobs
b559d88379 Merge pull request +6530 from c9/merge-account-profile
[WIP] Merge account profile
2015-04-16 11:34:10 +02:00
Matthijs van Henten
0acad29850 Merge remote-tracking branch 'origin/master' into merge-account-profile
Conflicts:
	plugins/c9.account.react/components/Footer.js
	plugins/c9.account.react/components/Footer.jsx
	plugins/c9.account.react/style-server.cli.js
	plugins/c9.account.react/style-server.js
	plugins/c9.account.react/styles/theme.less
2015-04-16 07:42:02 +00:00
Matthijs van Henten
05caf662be Merge pull request +6889 from c9/fix-account-css-after-less
Fix account css after less (lgtm offline)
2015-04-16 09:36:29 +02:00
Fabian Jakobs
1adba6a59f Merge pull request +6526 from c9/mvh-frontdoor-params
Mvh frontdoor params
2015-04-15 16:24:06 +02:00
Matthijs van Henten
753975d3bb Merge branch 'run-frontdoor-tests' into mvh-frontdoor-params
Conflicts:
	node_modules/frontdoor/lib/route_test.js
2015-04-15 14:17:25 +00:00
Matthijs van Henten
0107286902 use amd-loader to pass the tests 2015-04-15 14:14:09 +00:00
Matthijs van Henten
285d7b979a use server and move the amd loder to the top 2015-04-15 14:10:46 +00:00
Matthijs van Henten
5890cd35df Revert "Revert "Merge pull request +6755 from c9/mvh-upgrade-less-profile-account""
This reverts commit 6c01000fc9040d95d3939b37aed47ca64590fdcd.
2015-04-15 12:52:18 +00:00
Matthijs van Henten
3c5c9e55b0 default source is now body, simplified thigns 2015-04-15 12:03:49 +00:00
Matthijs van Henten
bb6cb22cdc adding missing names to the test cases 2015-04-15 12:03:09 +00:00
Matthijs van Henten
dc42ba890d remove assert that enforces source; fix param name 2015-04-15 12:01:42 +00:00
Matthijs van Henten
1b63ee8c54 remove stupid breaking test case 2015-04-15 12:01:10 +00:00
Matthijs van Henten
ca171f0474 adds amd loader 2015-04-15 12:00:51 +00:00
Lennart Kats
6c01000fc9 Revert "Merge pull request +6755 from c9/mvh-upgrade-less-profile-account"
This reverts commit 32d0f331d4ef92adcc6d2763f9333080731b92d7, reversing
changes made to 20f65a8f1975ae150a2d91b53a84430efbe7e50f.
2015-04-15 13:13:06 +02:00
Fabian Jakobs
40b6561a3f support *.project-user.c9.io URLs
this allows for dogfooding
2015-04-15 10:06:37 +00:00
Matthijs van Henten
2d91e2b899 Merge branch 'frontdoor-fix-api-test' into mvh-frontdoor-params 2015-04-14 14:15:30 +00:00
Matthijs van Henten
89f0a5a167 fixes api_test in frontdoor 2015-04-14 14:15:13 +00:00
Matthijs van Henten
4740a031cb refactor test to use mocha 2015-04-14 13:50:11 +00:00
Matthijs van Henten
259a0f36b6 remove tape tests 2015-04-14 13:45:48 +00:00
Matthijs van Henten
e0c071b497 refactor tests as mocha 2015-04-14 13:45:04 +00:00
Matthijs van Henten
eb671b6d13 convert tests to mocha 2015-04-14 13:42:00 +00:00
Matthijs van Henten
f6f5e02877 Merge remote-tracking branch 'origin/master' into mvh-frontdoor-params 2015-04-14 13:25:45 +00:00
Matthijs van Henten
67c0dd1f48 Merge remote-tracking branch 'origin/master' into merge-account-profile
Conflicts:
	configs/account.js
	npm-shrinkwrap.json
	package.json
	plugins/c9.account.react/style-server.js
	plugins/c9.react/style-server.js
2015-04-14 13:04:55 +00:00
Matthijs van Henten
2beb3c6441 Merge pull request +6879 from c9/lk
[Trivial] Cosmetic changes
2015-04-14 12:48:53 +02:00
Matthijs van Henten
32d0f331d4 Port less compiler to 2.5x api 2015-04-14 09:50:43 +00:00
Lennart Kats
0825d4b887 Rename metrics 2015-04-14 11:14:06 +02:00
Lennart Kats
3b698504c2 Merge remote-tracking branch 'origin/master' into lk
Conflicts:
	plugins/c9.metrics/metrics.js
2015-04-14 11:03:37 +02:00
Lennart Kats
623934d040 Add hint to d9 memlimit 2015-04-14 10:56:42 +02:00
Matthijs van Henten
29e9c573a6 Merge branch 'master' into mvh-upgrade-less-profile-account 2015-04-14 07:46:11 +00:00
Fabian Jakobs
20f65a8f19 fix ERR unknown command 'HMSETNX'
remove race condition and improve tests.
2015-04-13 09:36:35 +00:00
nightwing
cb36b86791 fix tmux installer 2015-04-13 01:59:43 +04:00
Ruben Daniels
223dc3e98a Merge pull request +6857 from c9/raygun
Fix raygun errors
2015-04-11 12:01:50 -07:00
nightwing
f2b0ed9d52 fix Cannot read property 'value' of null 2015-04-10 23:48:44 +04:00
nightwing
99be860d73 fix style.sheet.rules is undefined on firefox 2015-04-10 23:23:11 +04:00
nightwing
277765f4df fix raygun error json.forEach is not a function 2015-04-10 22:47:30 +04:00
Lennart Kats
c89007d243 Remove from client-default 2015-04-10 15:44:18 +02:00
Lennart Kats
18341e4edc Tune watching logic 2015-04-10 15:43:03 +02:00
Lennart Kats
ab5940bb9b Making basic tracing work 2015-04-10 15:42:37 +02:00
Lennart Kats
5803e49d07 Add config entries 2015-04-10 15:42:06 +02:00
nightwing
0ee2a056b8 prevent undo in ace changing focus 2015-04-10 15:20:16 +04:00
nightwing
ec6cdac9ea disable installer on windows since it doesn't work yet 2015-04-10 15:04:58 +04:00
nightwing
3ee8a3984c fix version checking logic in installer 2015-04-10 15:04:58 +04:00
nightwing
9f5e432a8a remove confusing error logs 2015-04-10 15:04:57 +04:00
nightwing
3f3f59b2c6 workaround for chrome extension removing css comments 2015-04-10 15:04:57 +04:00
nightwing
87f5a9e214 fix largerfont command 2015-04-10 15:04:57 +04:00
Ruben Daniels
c040ccc6ba Merge pull request +6848 from c9/sdk
fix sdk
2015-04-09 13:37:47 -07:00
Matthijs van Henten
001737dbea Merge pull request +6840 from c9/fix/mocha-test-rewrite
Rewriting tests to use mocha instead of asyncjs
2015-04-09 22:35:00 +02:00
nightwing
4c64c5245a fix sdk 2015-04-10 00:11:35 +04:00
Tim Robinson
1fc43edd9f More test fixes 2015-04-09 16:27:18 +00:00