Wykres commitów

1187 Commity (04d5f2ea475721163f83f9e3d809172b18b3c921)

Autor SHA1 Wiadomość Data
Tim Robinson 04d5f2ea47 Merge pull request +7715 from c9/revert-7714-revert-sftp-by-default
Fix c9/sftp-by-default
2015-06-22 16:32:55 +02:00
Harutyun Amirjanyan d8c9b067ca Merge pull request +7863 from c9/strict-odev
Use only own vfs server for onlinedev
2015-06-21 22:45:07 +04:00
Lennart kats e88375aeab Add api to onlinedev_helper 2015-06-21 11:37:46 +00:00
Lennart kats 2fed0ea6f2 Use only own vfs server for onlinedev 2015-06-21 10:14:49 +00:00
Lennart kats 59872e61f8 Merge remote-tracking branch 'origin/master' into user-activity
Conflicts:
	plugins/c9.vfs.server/vfs.server.js
2015-06-20 19:46:04 +00:00
Lennart kats 44b6a485c4 Fix obvious error 2015-06-20 19:26:01 +00:00
Lennart kats 414a028e1e Add missing arguments 2015-06-20 19:03:00 +00:00
Lennart kats 028fec957f Track from more places 2015-06-20 18:54:31 +00:00
Lennart kats 7545b361f0 Add aliasing and flushing 2015-06-20 18:54:15 +00:00
nightwing 32bb19365e more debugging code for unexpected metadata issue 2015-06-20 15:38:00 +04:00
nightwing 6cf9fc13a5 fix showing size of empty file 2015-06-20 13:49:29 +04:00
Harutyun Amirjanyan 3ec3b01e8f Merge pull request +7856 from c9/fix-standalone
Fix standalone dependency on analytics
2015-06-20 13:40:35 +04:00
Lennart kats f591d815c8 Add user.id to tracking properties 2015-06-20 07:07:41 +00:00
Lennart kats c50aca496a Add TODO 2015-06-20 07:07:39 +00:00
Lennart Kats 4dd7560d69 Don't attempt tracking dummy users 2015-06-20 06:23:51 +02:00
Lennart kats 2e62cce882 Fix standalone dependency on analytics 2015-06-20 04:18:08 +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
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