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
|
4ebcfda924
|
Add highlighting for outline files
|
2015-06-17 12:58:47 +00:00 |
Lennart kats
|
4994387c32
|
Allow <domain>/profile as baseUrl
|
2015-06-17 12:08:49 +00:00 |
Fabian Jakobs
|
6da11ccf88
|
fix odev for profile
|
2015-06-17 10:41:57 +00:00 |
Lennart Kats
|
bff85d46db
|
Only use C9_HOSTNAME in containers
|
2015-06-17 10:17:11 +00:00 |
Fabian Jakobs
|
794fa5ddf2
|
Merge remote-tracking branch 'origin/fix-profile-dogfooding' into clone-workspaces
|
2015-06-17 08:38:19 +00:00 |
Lennart Kats
|
9bdf747902
|
Don't replace path of URLs
|
2015-06-16 13:48:41 +00:00 |
Fabian Jakobs
|
429814667d
|
cleanup
|
2015-06-16 12:52:21 +00:00 |
Fabian Jakobs
|
999f0a08b0
|
Merge remote-tracking branch 'origin/master' into clone-workspaces
Conflicts:
plugins/c9.api.project/resize.js
plugins/c9.api.project/resize_test.js
plugins/c9.api.project/routes.js
plugins/c9.db.redis/user_test.js
plugins/c9.docker/d9/archive.sh
plugins/c9.docker/d9/backup.sh
plugins/c9.docker/d9/check.sh
plugins/c9.docker/d9/d9.sh
plugins/c9.docker/daemon.js
|
2015-06-16 10:46:08 +00:00 |
Tim Robinson
|
09e3519038
|
lodash is the future
|
2015-06-16 10:07:54 +00:00 |
nightwing
|
5812d63f82
|
fix regression in build-server
|
2015-06-16 09:54:18 +00:00 |
Lennart kats
|
f868ae4357
|
Merge remote-tracking branch 'origin/master' into improve-odev
Conflicts:
plugins/c9.proxy/proxy.cfg.ejs
|
2015-06-16 08:16:05 +00:00 |
Nikolai Onken
|
02d1ba40ea
|
Merge pull request +7735 from c9/remove_zendesk_request
Removed email form to Zendesk
|
2015-06-15 18:05:45 +02:00 |
Lennart Kats
|
b717095b85
|
Merge remote-tracking branch 'origin/master' into improve-odev
|
2015-06-15 17:25:35 +02:00 |
Tim Robinson
|
74bff90eb3
|
Merge pull request +7752 from c9/tab-errors
Add more error handling to language_test
|
2015-06-15 16:20:31 +02:00 |
Lennart kats
|
4799a090e0
|
Add tabs.openFile() error handling
|
2015-06-15 13:32:37 +00:00 |
Tim Robinson
|
8707cbd0c2
|
Lodash doesn't exist any more
|
2015-06-15 10:34:44 +00:00 |
nightwing
|
de3714852d
|
add a way to scroll to subsection in preferences panel
|
2015-06-14 22:23:18 +04:00 |
nightwing
|
dff45871fd
|
update jsbeautify
|
2015-06-14 15:52:16 +04:00 |
Brady Dowling
|
231ea7b6d6
|
Removed email form to Zendesk
|
2015-06-12 17:00:50 +00:00 |
Lennart Kats
|
ef01bb068d
|
Merge pull request +7617 from c9/fix/localfs
Set NODE_PATH via fsOptions
|
2015-06-12 13:59:41 +02:00 |
nightwing
|
9941f29776
|
do not rely on nodePath having a trailing slash
|
2015-06-12 15:31:51 +04:00 |
nightwing
|
0e2b7bc330
|
remove pty.js from list of dependencies
|
2015-06-12 14:33:50 +04:00 |
Lennart Kats
|
220b921b80
|
Add helper notification for adding certificates
|
2015-06-12 09:41:13 +00:00 |
Lennart Kats
|
ffb41dd3df
|
Revert "Revert "Merge pull request +7688 from c9/sftp-by-default""
|
2015-06-11 21:27:09 +02:00 |
Lennart Kats
|
3511e904ff
|
Revert "Merge pull request +7688 from c9/sftp-by-default"
This reverts commit f66e393a7c , reversing
changes made to 06a8139099 .
|
2015-06-11 20:22:45 +02:00 |
Lennart Kats
|
2bbb7fd8cd
|
Merge pull request +7599 from c9/fix/collab-code-reverting
Fixed issue with clients in fallback saving reverting code
|
2015-06-11 17:29:37 +02:00 |
Harutyun Amirjanyan
|
380a289be1
|
Merge pull request +7706 from c9/fix-conflict
Fix variable name conflict
|
2015-06-11 19:10:55 +04:00 |
Lennart Kats
|
c2ac9819a9
|
Fix startTime clashing with outer startTime function
Fixes c9/c9.ide.language+4
|
2015-06-11 15:49:00 +02:00 |
Alex Brausewetter
|
f3ae88e84e
|
Merge pull request +7703 from c9/fix/ruby-2.2
Upgrade default Ruby 2.2 + Rails stable
|
2015-06-11 15:46:43 +02:00 |
Alex Brausewetter
|
2558191a46
|
Add runner for Ruby 2.2 + Rails stable
|
2015-06-11 12:04:08 +00:00 |
Lennart Kats
|
09fbc77030
|
Merge pull request +7683 from c9/fix/reset-socket-eagain
Become server when collab client gets EAGAIN error
|
2015-06-11 13:15:56 +02:00 |
Lennart Kats
|
bbc0a6d2af
|
Exclude onlinedev_helper from sdk
|
2015-06-11 08:07:21 +00:00 |
Lennart Kats
|
49d88915ed
|
Merge remote-tracking branch 'origin/master' into improve-odev
Conflicts:
npm-shrinkwrap.json
|
2015-06-10 20:34:49 +00:00 |
Lennart Kats
|
a08a3c4789
|
Check that workspace is public
|
2015-06-10 20:30:50 +00:00 |
Lennart Kats
|
f7ac49e1c1
|
Add onlinedev servers to /etc/hosts
|
2015-06-10 20:30:26 +00:00 |
Lennart Kats
|
3f30e5dd0e
|
Fix --exclude
|
2015-06-10 19:39:52 +00:00 |
Lennart kats
|
00f48eb9ab
|
Store internal IP in docker host
|
2015-06-10 16:08:10 +00:00 |
Ruben Daniels
|
f66e393a7c
|
Merge pull request +7688 from c9/sftp-by-default
Made mounting try sftp first then fallback to original method if it fails
|
2015-06-10 07:56:29 -07:00 |
Ruben Daniels
|
06a8139099
|
Merge pull request +7674 from c9/fix/readFile
add debugging code for readFile returning metadata c9/core+71
|
2015-06-10 07:52:52 -07:00 |
Tim Robinson
|
22f46d3c3d
|
Fixed race condition
|
2015-06-10 14:33:30 +00:00 |
Tim Robinson
|
f62b3eb5f2
|
Fix console log
|
2015-06-10 14:25:13 +00:00 |
Tim Robinson
|
809393434b
|
Resolve has knowledge of it's own path already :)
|
2015-06-10 14:24:08 +00:00 |
Tim Robinson
|
aab082b33d
|
Made mounting try sftp first then fallback to original method if it fails
|
2015-06-10 13:37:38 +00:00 |
nightwing
|
585cc8a609
|
better way to kill runner process
|
2015-06-10 11:40:40 +00:00 |
Tim Robinson
|
2794159910
|
Become server when collab client gets EAGAIN error as the socket has broken somehow
|
2015-06-10 10:40:08 +00:00 |
nightwing
|
e775e0c03e
|
add debugging code for readFile returning metadata c9/core+71
|
2015-06-10 11:04:16 +04:00 |
Alex Brausewetter
|
ce6eb41304
|
Revert "Fix/rvm"
|
2015-06-09 16:51:02 +02:00 |
Alex Brausewetter
|
49e5f671eb
|
Merge pull request +7017 from c9/fix/rvm
Fix/rvm
|
2015-06-09 14:46:22 +02:00 |
nightwing
|
388a8ed3a8
|
focus tab opened from c9 cli
|
2015-06-09 16:15:19 +04:00 |