LAB-linuxserver/core
1
0
Fork 0
mirror of https://github.com/linuxserver/core.git synced 2026-02-20 05:07:19 +08:00
Code Issues Packages Projects Releases Wiki Activity
1,169 Commits 4 Branches 0 Tags
Commit Graph

1169 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lennart kats
2fed0ea6f2 Use only own vfs server for onlinedev 2015-06-21 10:14:49 +00:00
Lennart Kats
c06c3e6f3c Merge pull request +7835 from c9/active-usage 
Active usage
 2015-06-19 14:01:30 +02:00
Fabian Jakobs
4633a11c2a Merge pull request +4986 from c9/clone-workspaces 
Clone workspaces
 2015-06-19 14:01:25 +02:00
Nikolai Onken
465c840aa5 Rename event 2015-06-19 11:46:32 +00:00
Nikolai Onken
de937c0b59 Also log when the date changes 2015-06-19 11:43:12 +00:00
Nikolai Onken
2984e06813 Update analytics 2015-06-19 11:17:56 +00:00
Fabian Jakobs
3ce1b9a45f Merge remote-tracking branch 'origin/master' into clone-workspaces 
Conflicts:
	plugins/c9.db.redis/user.js
	plugins/c9.db.redis/user_test.js
 2015-06-18 15:00:49 +00:00
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
Tim Robinson
e8cb1fcd70 Merge pull request +7800 from c9/fix-onlindev-helper 
Fix onlinedev helper
 2015-06-17 16:48:52 +02: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
184c128643 Fix .outline specifications 2015-06-17 14:18:58 +00:00
Lennart kats
bdb22d2b7b Restore deleted counter variable 2015-06-17 14:16:34 +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
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
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
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
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
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
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