mirror
/
c9-core
kopia lustrzana https://github.com/c9/core
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność
1 164 Commity
10 Gałęzie
0 Tagi
38 MiB
Wykres commitów

451 Commity (4633a11c2a97e08225b5b2c82bca9f56ce4fc542)

Autor SHA1 Wiadomość Data
Lennart Kats 5aacd61841 Merge pull request +7737 from c9/update/jsbeautify 
update jsbeautify
 2015-06-18 13:19:59 +02:00
Ruben Daniels e7093564e0 Merge pull request +7804 from c9/fix-sdk 
Fix minor sdk-related issues
 2015-06-17 09:07:36 -07:00
Lennart kats 184c128643 Fix .outline specifications 2015-06-17 14:18:58 +00:00
Lennart kats 09add76e78 Show only if needed 2015-06-17 14:03:28 +00:00
Lennart kats de69f3a3a6 Remove debugging code 2015-06-17 14:03:23 +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
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
Lennart Kats 220b921b80 Add helper notification for adding certificates 2015-06-12 09:41:13 +00: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
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
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
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 95d8743646 do not use tar --overwrite, since it doesn't work on mac 2015-06-08 14:15:43 +00:00
nightwing bb6213e203 set node_path via fsOptions 2015-06-07 21:32:53 +00: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
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
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
nightwing fe3be8eff9 install node 0.10.28 on arm-pi 2015-06-03 23:10:37 +04:00
Lennart Kats c932c3954e Fix simple C runner hiding failures 2015-06-02 15:33:05 +02:00
Lennart Kats fdc8cfef2e Fix "more settings" link in welcome screen and related references 2015-06-02 10:30:55 +02:00
Tim Robinson db931d638f Merge pull request +7495 from c9/collab-server 
move collab-server back to collab plugin to allow splitting it into smaller parts
 2015-05-29 16:14:29 +02:00
Lennart Kats 6bec33983b Merge pull request +7504 from c9/sdk 
Misc fixes for sdk
 2015-05-29 15:39:00 +02:00
nightwing 000d2bf74e allow final functions in php outline 2015-05-29 14:20:13 +04:00
Harutyun Amirjanyan 1043ab5b7c Merge pull request +7502 from c9/fix-debug 
[Trivial] Fix debug proxy killing
 2015-05-29 13:19:19 +03:00
Lennart Kats 8bd4455da1 Make sure old debug proxy is actually killed 2015-05-29 11:48:58 +02:00
Tim Robinson 88070b4ec1 Merge pull request +7451 from c9/fix/ftp-mount-errorhandling 
Adding error tracking to mounting
 2015-05-29 11:40:14 +02:00
nightwing 3931e937cd move collab-server back to collab plugin to allow splitting it into smaller parts 2015-05-28 19:12:00 +00:00
nightwing 1c59c1455e fix +7397 When collaborator leaves workspace their icon is still in the toolbar 2015-05-24 23:48:01 +04:00
nightwing e434d8ba1c fix +7396 collab tree autocloses nodes on refresh 2015-05-24 21:28:01 +04:00
Tim Robinson 9613e4f510 Added correct executables for ftp and sftp mounting for ssh workspaces. Display useful error if user doesn't have these executables installed 2015-05-22 14:37:38 +00:00
Lennart Kats 0b1ddb5e7e Fix jumping to file without .js 2015-05-22 15:09:00 +02:00