Wykres commitów

1484 Commity (c5048020f1545f4c83a3cfe8470436983ad3c35b)

Autor SHA1 Wiadomość Data
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
Tim Robinson b5fc9bd571 words 2015-06-17 09:44:17 +00:00
Tim Robinson c2c5cc194c Improving wording 2015-06-17 09:43:07 +00:00
Tim Robinson b9bf80c5e6 Fix broken test 2015-06-17 09:27:15 +00:00
Tim Robinson d0eb35a7e8 Removing debugging and old code 2015-06-17 09:21:27 +00:00
Tim Robinson 8938bf50ee Added sending of collab errors to Raygun. Made users have to refresh their IDE if the database is reset 2015-06-17 09:02:21 +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
Tim Robinson adab6e0b8f Fixing bugs with DB resetting, only master resets and initializes the DB in write mode 2015-06-16 13:43:03 +00:00
Lennart Kats 440494028c Make things a bit more complicated 2015-06-16 14:53:14 +02:00
Fabian Jakobs 429814667d cleanup 2015-06-16 12:52:21 +00:00
Lennart Kats 8ca0f95d98 Make 127.0.0.1 the default IP if $IP is unset 2015-06-16 14:51:38 +02:00
Lennart Kats a4d56bf34b Use $IP as the IP by default 2015-06-16 14:51:38 +02:00
Lennart kats c0703b6258 Extend warnings about basic auth 2015-06-16 14:51:37 +02:00
Lennart kats 7ae1da3e8d Use port 8080 to make sdk work in a docker container 2015-06-16 14:51:37 +02:00
Tim Robinson 387536a5d8 Don't initialize DB if we're not master to stop race conditions 2015-06-16 12:36:20 +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