64 Commits

Author SHA1 Message Date
Harutyun Amirjanyan
7b68a58a87 Merge pull request +11065 from c9/language-library-ui
Better Javascript library support
2016-01-22 17:16:34 +04:00
Fabian Jakobs
1300bff8ab minor fixes 2016-01-19 10:50:19 +00:00
Lennart Kats
4fc8c26766 Merge remote-tracking branch 'origin/master' into language-library-ui
Conflicts:
	npm-shrinkwrap.json
	plugins/c9.ide.language.javascript.tern/worker/tern_worker.js
	plugins/c9.ide.language/language.js
	plugins/c9.ide.language/worker.js
2016-01-13 10:30:06 +00:00
Lennart Kats
33cd4df8a3 Fix preferred completion handling w/caching
Conflicts, added tests removed for now:
	plugins/c9.ide.language/language_test.js
2016-01-04 09:45:46 +00:00
Lennart Kats
5f9de12c30 Fix --helpWithSudo 2016-01-04 09:44:06 +00:00
Lennart Kats
4b766d7d70 Merge remote-tracking branch 'origin/master' into language-library-ui
Conflicts:
	npm-shrinkwrap.json
2015-12-23 15:55:07 +00:00
Lennart Kats
240019cf33 Use URL that works over the internets 2015-12-19 15:25:05 +01:00
Lennart Kats
32cbbb8af5 Disable raygun for localdev 2015-12-19 15:23:46 +01:00
Lennart Kats
c9ab79ac9c Hackfix CDN URL 2015-12-19 14:33:38 +01:00
Lennart Kats
a78b76d84f Use the right API url 2015-12-18 13:02:16 +01:00
Lennart Kats
a3a156d68e Add --include option
So you can type node server.js localdev --include profile
2015-12-18 11:19:03 +01:00
Lennart Kats
bc4f5d10dd Merge remote-tracking branch 'origin/master' into localdev 2015-12-18 11:00:56 +01:00
Lennart Kats
138dcacc59 Set default domain for localdev 2015-12-16 23:03:09 +01:00
Lennart Kats
897b593ebd Fix standalone 2015-12-15 16:38:05 +01:00
Lennart Kats
3c71e18243 Fix typo 2015-12-15 15:32:55 +01:00
Lennart Kats
3467080834 Avoid port conflict with apps-proxy 8081 8082 ports 2015-12-15 15:22:18 +01:00
Lennart Kats
4fe880040d Exclude sapi from localdev 2015-12-15 15:21:56 +01:00
Lennart Kats
f9c04a4ab5 Run sudo to get password to start haproxy 2015-12-15 12:04:56 +01:00
Lennart Kats
11028e4904 Add localdev shortcut 2015-12-15 12:04:43 +01:00
Fabian Jakobs
e737c0659d workers don't work in dog fooding workspaces 2015-12-14 10:08:40 +00:00
Lennart Kats
683170501b Optimize load order for onlinedev 2015-12-09 09:31:53 +00:00
Tim Robinson
2765cefa1e Make Cloud9 output code when it's done loading. Use pkill instead of killall as it returns 0 return code when there are no processes 2015-11-24 00:10:39 +00:00
Lennart Kats
3042e61641 Speed up ide loading, deferring profile loading for now 2015-11-17 12:58:48 +00:00
Arron Bailiss
66d6cad9b8 Merge pull request +10068 from c9/docker-test-server-1.8.3
New server mode called test
2015-11-04 12:59:29 +01:00
matthijs
e856f0ac1a WIP deploy workflow-staging 2015-11-03 16:32:16 +00:00
Arron Bailiss
fb532d5e76 Add test mode settings for services-test server 2015-10-28 16:34:18 +00:00
Fabian Jakobs
7e1613d4ab add user-content service 2015-10-23 13:00:32 +00:00
Tim Robinson
2522113afb Making onlinedev have separate eu and usw regions. Renaming all odev to onlinedev across the codebase to be consistent with hostnames 2015-10-20 10:49:21 +00:00
Fabian Jakobs
043984c8e1 Revert "Put user content on a different domain" 2015-10-19 17:22:19 +02:00
Fabian Jakobs
cf02d0a1b8 add user-content to server.js 2015-10-13 11:55:31 +00:00
Lennart kats
c3bf86e76e Add C9_DOMAINS environment variable 2015-07-01 09:59:49 +00:00
Lennart kats
d19366c653 Move urls into node_modules/c9 2015-07-01 07:50:34 +00:00
Lennart kats
6978abd86e Add c9.core/urls helper 2015-07-01 07:50:34 +00:00
Lennart kats
e6e028f999 Fix options parsing 2015-07-01 07:50:33 +00:00
Lennart kats
36803ecbb0 Revert "Revert "Merge pull request +7975 from c9/multi-domain""
This reverts commit 66642209e7e9d4d08e4905071c024754445098be.
2015-06-29 19:47:13 +00:00
Lennart kats
66642209e7 Revert "Merge pull request +7975 from c9/multi-domain"
This reverts commit 8a40d404df1b078482647c08c5336f269fbe4b67, reversing
changes made to 2025a19647f075316106ab248d1fe483cbf45420.
2015-06-29 19:42:21 +00:00
Tim Robinson
8a40d404df Merge pull request +7975 from c9/multi-domain
Multiple-domain/cs50 support part 1: change all configs
2015-06-29 14:19:29 +02:00
Lennart kats
a74faf23a8 Restore setup_paths.js 2015-06-28 13:12:11 +00:00
Lennart kats
fc7a7d1be9 Consume new settings, using primaryDomain/primaryBaseUrl 2015-06-25 14:12:14 +00:00
Lennart kats
b44151c184 Improve baseUrl handling 2015-06-25 13:15:16 +00:00
Lennart kats
f90d7159bf Restore singular domain property 2015-06-25 12:53:41 +00:00
Lennart kats
dd3002ea7b Pluralize 2015-06-25 12:49:15 +00:00
Lennart kats
a68b124043 Prepare settings for multi-domain support 2015-06-25 12:33:28 +00:00
Lennart Kats
b35664e387 Fix accessing property domain of undefined 2015-06-24 14:35:12 +00:00
Fabian Jakobs
8fd871a71b Merge remote-tracking branch 'origin/master' into clone-workspaces
Conflicts:
	server.js
2015-06-17 14:22:35 +00:00
Fabian Jakobs
5bc91acbca cleanup 2015-06-17 14:20:46 +00:00
Lennart kats
6d9034455b Inline settings/devel.js helper function to avoid dependency 2015-06-17 14:08:52 +00:00
Fabian Jakobs
1e96aef75e resolve merge conflict 2015-06-17 14:07:14 +00:00
Fabian Jakobs
ca4dc5a7a8 Merge remote-tracking branch 'origin/master' into clone-workspaces
Conflicts:
	server.js
2015-06-17 13:29:07 +00:00
Lennart kats
4994387c32 Allow <domain>/profile as baseUrl 2015-06-17 12:08:49 +00:00