Wykres commitów

187 Commity (794fa5ddf2fa6799222f4d6dc2fc79a34921789a)

Autor SHA1 Wiadomość Data
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
Lennart Kats b717095b85 Merge remote-tracking branch 'origin/master' into improve-odev 2015-06-15 17:25:35 +02: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
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 00f48eb9ab Store internal IP in docker host 2015-06-10 16:08:10 +00:00
nightwing 585cc8a609 better way to kill runner process 2015-06-10 11:40:40 +00:00
Fabian Jakobs 18b03b412d redirect /profile to /profile/:user 2015-06-09 08:52:21 +00:00
nightwing 6e33ccb304 fix loading non amd scripts via require 2015-06-08 01:41:07 +04:00
nightwing bb6213e203 set node_path via fsOptions 2015-06-07 21:32:53 +00:00
Lennart Kats 06efdc5cf0 Merge pull request +7544 from c9/update-ace
update ace
2015-06-05 11:21:30 +02:00
Lennart Kats 6b3bda7586 Fix stdout maxBuffer exceeded 2015-06-05 11:06:12 +02:00
nightwing 6b1a3f3d00 update ace 2015-06-02 19:29:58 +04:00
Fabian Jakobs e4087135a8 Merge remote-tracking branch 'origin/master' into better-restores 2015-06-01 12:46:57 +00:00
Fabian Jakobs 60360f8598 document req timeout 2015-05-29 08:50:49 +00:00
Fabian Jakobs aac904b65e add timeout handler to rest client 2015-05-28 12:35:12 +00:00
Nikolai Onken 6c1132bfaf Revert "Revert "Merge account"" 2015-05-27 13:19:29 +02:00
Nikolai Onken b9f8bb6aeb Revert "Merge account" 2015-05-27 13:10:23 +02:00
Nikolai Onken 7c4d170241 Fix 401 handling 2015-05-26 13:08:32 +00:00
Matthijs van Henten 8ba1a02f29 tidied 2015-05-22 10:34:11 +00:00
Matthijs van Henten 4ffa8c0e8e adds a global handler to frontdoor: allow injection of global middlewares 2015-05-21 23:42:00 +00:00
Matthijs van Henten 5bd78f5ecc adds a mount feature to frontdoor: mount sections into the existing chain 2015-05-21 23:41:09 +00:00
nightwing a9c489b131 fix highlighting of line-height:1.5 in less mode 2015-05-18 16:24:10 +04:00
nightwing 9a865df0ec do not load pty.js when testing connection since that can crash node process 2015-05-16 03:09:24 +04:00
nightwing 6f7184c56b fix publish hanging because of not reading from tar stdout 2015-05-16 03:09:24 +04:00
Lennart Kats e131f6ca66 Merge pull request +7291 from c9/fix/restore-workspaces
Misc restore fixes to fix large restores failing
2015-05-15 09:03:12 +02:00
nightwing 8a6d9ac4b9 send more errors from worker to raygun 2015-05-13 18:40:23 +04:00
nightwing 8091c4b789 use runInThisContext instead of runInNewContext 2015-05-12 17:57:09 +04:00
Tim Robinson ee44507ced Misc restore fixes to fix large restores failing 2015-05-12 10:11:14 +00:00
nightwing 2c273b97a9 fsOptions.homeDir is missing on ssh workspaces 2015-05-11 07:52:10 +04:00
Harutyun Amirjanyan d7ab6da51f Merge pull request +7252 from c9/sdk
More tweaking of sdk
2015-05-10 22:46:22 +04:00
Harutyun Amirjanyan bacef4fd52 Merge pull request +7244 from c9/fix/tree-pagedown
fix +7206 pressing pagedown screws up the layout of ace trees
2015-05-10 19:28:15 +04:00
nightwing 84a371f9d9 fix regression in sdk 2015-05-10 18:52:26 +04:00
nightwing bf92cc54e7 remove stray console.log 2015-05-10 04:26:22 +04:00
nightwing 9e1bb472c6 use node from c9 dir 2015-05-10 04:26:21 +04:00
nightwing 0b8cc06019 fix +7206 pressing pagedown screws up the layout of ace trees 2015-05-08 17:31:08 +04:00
Lennart kats 28b561fa22 Merge remote-tracking branch 'origin/master' into clone-workspaces
Conflicts:
	server.js
2015-05-06 14:42:51 +00:00
nightwing a2db60bed8 fix escaping of uppercase script tags in JSONToJS 2015-05-04 17:27:15 +04:00
nightwing 8a88de1656 revert changes to getUndoSelection for now 2015-05-04 06:55:22 +04:00
nightwing e7c56ee45c fix failing tests 2015-05-04 02:29:17 +04:00
nightwing ce06798521 fix inconsistency between getState and setState 2015-05-04 02:28:03 +04:00
nightwing 3644d203c2 use same undo manager for multiple sessions 2015-05-04 02:27:59 +04:00
nightwing 873143a725 fix metadata tests 2015-05-04 02:27:52 +04:00
nightwing caad98e5d2 use the new undoManager in ace.js 2015-05-04 02:27:51 +04:00
nightwing c9f492a916 make sure edit ids are always unique 2015-05-04 02:27:49 +04:00
nightwing f04f22076c allow redoing after changing the document 2015-05-04 02:27:47 +04:00
nightwing cc252235b0 do not undo edits of other users 2015-05-04 02:27:38 +04:00
nightwing a7033da975 convert paste into command 2015-05-03 20:34:41 +04:00
Tim Robinson 3ef354bc71 Merge remote-tracking branch 'origin/master' into clone-workspaces 2015-05-03 15:01:36 +00:00
Ruben Daniels 8ce9aa9d61 Fix pty processes 2015-05-01 16:43:15 +00:00