1109 Commits

Author SHA1 Message Date
nightwing
0e2b7bc330 remove pty.js from list of dependencies 2015-06-12 14:33:50 +04:00
Lennart Kats
3511e904ff Revert "Merge pull request +7688 from c9/sftp-by-default"
This reverts commit f66e393a7c5c8d933cf232370cb664ec046e8eab, reversing
changes made to 06a81390996d377dc66de72dbf7ef7ae581f8d43.
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
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
Tim Robinson
194f578b9d Minor bug fix 2015-06-09 09:27:01 +00:00
Fabian Jakobs
18b03b412d redirect /profile to /profile/:user 2015-06-09 08:52:21 +00:00
Tim Robinson
ab84c52a13 Passing path to resolve function to fix race condition with global path variable 2015-06-08 14:58:45 +00:00
Tim Robinson
90baf8a727 Change current call of showChangeDialog to show it for all changed paths as it no longer calls itself recursively 2015-06-08 14:36:31 +00:00
nightwing
2b6730ff49 tmux 2 doesn't print change-trigger message on startup 2015-06-08 14:15:44 +00:00
nightwing
95d8743646 do not use tar --overwrite, since it doesn't work on mac 2015-06-08 14:15:43 +00:00
nightwing
6e33ccb304 fix loading non amd scripts via require 2015-06-08 01:41:07 +04:00
Tim Robinson
c18b75f303 Don't need beforeSaveAll any more 2015-06-05 13:27:39 +00:00
Tim Robinson
427d344fac Before save is called check tab conflicts are resolved 2015-06-05 13:19:30 +00:00
Tim Robinson
e4ee4299cd Fixed issue with clients in fallback saving reverting code 2015-06-05 10:31:58 +00:00
Lennart Kats
06efdc5cf0 Merge pull request +7544 from c9/update-ace
update ace
2015-06-05 11:21:30 +02:00
Harutyun Amirjanyan
63d82b21f0 Merge pull request +7596 from c9/fix-debug
Fix stdout maxBuffer exceeded breaking debugger
2015-06-05 13:14:25 +04:00
Harutyun Amirjanyan
2afebd7817 Merge pull request +7526 from c9/fix-welcome
[Trivial] Fix "more settings" link in welcome screen and related references
2015-06-05 13:08:21 +04:00
Lennart Kats
6b3bda7586 Fix stdout maxBuffer exceeded 2015-06-05 11:06:12 +02:00
nightwing
21cc0a2047 fix handling of plugins config from package.json 2015-06-05 03:17:07 +04:00
nightwing
bf5aede66e add c9 --version 2015-06-05 03:00:31 +04:00
nightwing
74fc98e7b7 fix dropdown in dialog 2015-06-05 03:00:23 +04:00
Tim Robinson
4fd895ff4e Merge pull request +7584 from c9/fix/save-zero-length-documents
Fix fallback saving writing an empty file if user saves it before it's completely loaded
2015-06-04 16:46:19 +02:00
Tim Robinson
b91409092b Fixing fallback saving writing an empty file if user saves it before it's completely loaded 2015-06-04 14:33:45 +00:00
Lennart kats
2a1c4d1dd6 Merge remote-tracking branch 'origin/master' into deploy-abuse 2015-06-04 08:29:48 +00:00
Lennart Kats
b44f0848dd Merge pull request +7500 from c9/better-restores
Better restores
2015-06-04 10:07:20 +02:00
nightwing
1412e15569 create nw.js shortcuts on windows 2015-06-03 23:12:18 +04:00
nightwing
fe3be8eff9 install node 0.10.28 on arm-pi 2015-06-03 23:10:37 +04:00
nightwing
43f73c2013 tweak raygun errors 2015-06-03 23:10:37 +04:00
Lennart kats
b043c17ee4 Avoid accidentally editing generated file... 2015-06-03 10:03:31 +00:00
nightwing
6b1a3f3d00 update ace 2015-06-02 19:29:58 +04:00
Lennart Kats
fa4c3db74f Remove duplicate entry 2015-06-02 16:33:49 +02:00
Harutyun Amirjanyan
c9eb5b58c1 Merge pull request +7533 from c9/fix-c-runner
Fix simple C runner hiding failures
2015-06-02 14:03:34 +00:00
Lennart Kats
c932c3954e Fix simple C runner hiding failures 2015-06-02 15:33:05 +02:00
nightwing
32facc0a40 remove unused account config from makestatic 2015-06-02 10:34:05 +00:00