Wykres commitów

287 Commity (1e845610ede58e5a3a1ce63e5ce0f316be559132)

Autor SHA1 Wiadomość Data
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
nightwing 023d0506d8 escape only invalid character sequences in reliable socket
escaping is needed to prevent disconnects on chrome
see d7fec5188600a9cff7d0e505ad680332fb6e10be
2015-06-11 10:46:20 +04:00
nightwing 265d628398 escape invalid unicode sequences in JSONToJs 2015-06-11 10:45:33 +04: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
Ruben Daniels d499d6c198 Merge branch 'master' of github.com:c9/newclient into fix/bridge
Conflicts:
	package.json
2015-05-01 16:32:54 +00:00
Ruben Daniels 71f2d769d9 Fixed tests 2015-05-01 16:31:49 +00:00
Ruben Daniels bde9054f84 Fixes adding c9 cli to the installer 2015-05-01 15:17:29 +00:00
Ruben Daniels 836fd9222f fix vfs bug when sending streams/processes more than once. add fetching home for tests 2015-05-01 14:19:15 +00:00
Tim Robinson e7703a4690 Merge remote-tracking branch 'origin/master' into clone-workspaces
Conflicts:
	scripts/build-server.js
2015-05-01 13:16:11 +00:00
nightwing 0075a1df3e fix node 0.12 warning about customFds 2015-05-01 12:14:25 +04:00
Ruben Daniels dd8ed52b4f Add setting for the default editor 2015-05-01 01:53:12 +00:00
Ruben Daniels 21b75cb86b Add editor to the terminal 2015-05-01 01:44:12 +00:00
nightwing 2fd7a8b619 include collab in main vfs build 2015-04-30 13:12:00 +04:00
nightwing 9bc6190ad0 fix color of bracket highlight in katzenmilch theme 2015-04-30 04:14:01 +04:00
nightwing 499c8976b9 better invisible tabs 2015-04-30 04:10:09 +04:00
nightwing b4c643c9ab fix toggle comments in handlebars mode 2015-04-30 03:55:39 +04:00
Ruben Daniels 9fea731052 Merge pull request +7078 from c9/fix/install-cli
Installer fixes
2015-04-29 15:23:21 -07:00
nightwing cc9f039843 include modules required from config in dependency list 2015-04-30 00:27:57 +04:00
Lennart Kats d6d19ff38e Fix test 2015-04-29 12:05:28 +02:00
Lennart Kats 58afdf088c Allow optional parameters to be falsy 2015-04-29 11:39:28 +02:00
nightwing 35175d40ca add more php extensions 2015-04-27 19:59:07 +04:00
Tim Robinson 31cc967b57 Merge remote-tracking branch 'origin/master' into clone-workspaces 2015-04-27 12:55:35 +00:00
nightwing 182577009f do not automatically create tag from publish 2015-04-25 03:24:10 +04:00
nightwing 3962a9c04f fix quote pairing for "\n" 2015-04-25 03:02:08 +04:00
Tim Robinson e592c05f74 Adding error logging to raygun for failed cloning. Fixed bugs with registering project api functions 2015-04-24 13:52:40 +00:00
Tim Robinson ef53c82186 Merge remote-tracking branch 'origin/master' into newclient-dockerlike-deploy 2015-04-22 14:33:31 +00:00
Tim Robinson 527ed2277d Merge remote-tracking branch 'origin/master' into newclient-dockerlike-deploy 2015-04-22 14:33:21 +00:00
nightwing 71029a4300 fix typo 2015-04-22 13:35:25 +04:00
nightwing 8ec0d8e5fe fix scrollbar regression 2015-04-21 23:59:39 +04:00
Ruben Daniels f9520fa811 Fixes +6095. Only see kaefer output with debug=3 2015-04-20 17:50:52 +00:00
Lennart Kats 4e2778e49c Merge pull request +6936 from c9/update-ace
Update ace
2015-04-20 15:07:34 +02:00
Tim Robinson d0efc05e9c Merge remote-tracking branch 'origin/master' into newclient-dockerlike-deploy 2015-04-20 12:32:47 +00:00
nightwing 83bda0cf59 update ace 2015-04-19 16:16:45 +04:00
nightwing 68b133fa61 include modules required via require.resolve in npm_build 2015-04-18 22:35:46 +04:00
Tim Robinson c8ed575dfd Merge remote-tracking branch 'origin/master' into newclient-dockerlike-deploy
Conflicts:
	scripts/makestatic.sh
2015-04-17 11:02:10 +00:00
nightwing 5edcde17bf fix loading language extensions from sdk plugins 2015-04-16 23:07:53 +04:00
nightwing fa25550038 fix plugin loading in packed mode 2015-04-16 21:28:56 +04:00
nightwing 712400abc0 fix require.toUrl 2015-04-16 19:29:42 +04:00
nightwing a3edfaf181 load standalone plugins from __packed__ 2015-04-16 19:29:39 +04:00
nightwing 003aea3d49 add error handling to mini_require 2015-04-16 19:29:39 +04:00
nightwing 734f2bd3b2 tweak c9 publish 2015-04-16 19:29:39 +04:00
nightwing d33f396a17 cleanup 2015-04-16 19:29:36 +04:00
nightwing cb01f0e76f add config support to mini require 2015-04-16 19:29:36 +04:00
Ruben Daniels c8f9fc28bd exclude the right module files 2015-04-16 19:29:33 +04:00
Tim Robinson 0f86040782 Adding script to calculate what nodeModules are needed for a service. Used it to set nodeModulesInclude for api and ide 2015-04-16 15:22:34 +00:00
Tim Robinson 8a0d2cfc16 Merge remote-tracking branch 'origin/master' into newclient-dockerlike-deploy
Conflicts:
	scripts/makestatic.sh
2015-04-16 14:51:40 +00:00
Matthijs van Henten 39ff40bf74 Revert " Mvh frontdoor params" 2015-04-16 11:51:58 +02:00
Matthijs van Henten 05caf662be Merge pull request +6889 from c9/fix-account-css-after-less
Fix account css after less (lgtm offline)
2015-04-16 09:36:29 +02:00
Matthijs van Henten 753975d3bb Merge branch 'run-frontdoor-tests' into mvh-frontdoor-params
Conflicts:
	node_modules/frontdoor/lib/route_test.js
2015-04-15 14:17:25 +00:00
Matthijs van Henten 0107286902 use amd-loader to pass the tests 2015-04-15 14:14:09 +00:00
Matthijs van Henten 285d7b979a use server and move the amd loder to the top 2015-04-15 14:10:46 +00:00
Matthijs van Henten 5890cd35df Revert "Revert "Merge pull request +6755 from c9/mvh-upgrade-less-profile-account""
This reverts commit 6c01000fc9.
2015-04-15 12:52:18 +00:00
Matthijs van Henten 3c5c9e55b0 default source is now body, simplified thigns 2015-04-15 12:03:49 +00:00
Matthijs van Henten bb6cb22cdc adding missing names to the test cases 2015-04-15 12:03:09 +00:00
Matthijs van Henten dc42ba890d remove assert that enforces source; fix param name 2015-04-15 12:01:42 +00:00
Matthijs van Henten 1b63ee8c54 remove stupid breaking test case 2015-04-15 12:01:10 +00:00
Matthijs van Henten ca171f0474 adds amd loader 2015-04-15 12:00:51 +00:00
Lennart Kats 6c01000fc9 Revert "Merge pull request +6755 from c9/mvh-upgrade-less-profile-account"
This reverts commit 32d0f331d4, reversing
changes made to 20f65a8f19.
2015-04-15 13:13:06 +02:00
Matthijs van Henten 2d91e2b899 Merge branch 'frontdoor-fix-api-test' into mvh-frontdoor-params 2015-04-14 14:15:30 +00:00
Matthijs van Henten 89f0a5a167 fixes api_test in frontdoor 2015-04-14 14:15:13 +00:00
Matthijs van Henten 4740a031cb refactor test to use mocha 2015-04-14 13:50:11 +00:00
Matthijs van Henten 259a0f36b6 remove tape tests 2015-04-14 13:45:48 +00:00
Matthijs van Henten e0c071b497 refactor tests as mocha 2015-04-14 13:45:04 +00:00
Matthijs van Henten eb671b6d13 convert tests to mocha 2015-04-14 13:42:00 +00:00
Matthijs van Henten f6f5e02877 Merge remote-tracking branch 'origin/master' into mvh-frontdoor-params 2015-04-14 13:25:45 +00:00
Matthijs van Henten 32d0f331d4 Port less compiler to 2.5x api 2015-04-14 09:50:43 +00:00
Lennart Kats ab5940bb9b Making basic tracing work 2015-04-10 15:42:37 +02:00
Ruben Daniels 71bfc0da7f A working installer 2015-04-08 22:37:25 +04:00
Ruben Daniels cc9334a30e Added check toggling 2015-04-08 22:37:24 +04:00
Ruben Daniels 5039e34d3c Work on adding checkbox to ace tree 2015-04-08 22:37:23 +04:00
Fabian Jakobs cb368e4ab9 fix scm detection for specific git urls 2015-04-02 08:40:49 +00:00
Fabian Jakobs 4909adf379 Merge pull request +6761 from c9/project-create-api
Project create api
2015-04-01 14:05:11 +02:00
Ruben Daniels 5652cee760 Merge pull request +6778 from c9/fix/various
Fix several small issues
2015-03-31 10:35:57 -07:00
Fabian Jakobs 298c5518f1 fix c9/ssh 2015-03-31 13:42:17 +00:00
Fabian Jakobs c6ef0a95bf prevent frontdoor from crashing 2015-03-31 13:42:17 +00:00
Fabian Jakobs 61c7ae04b8 rename git_url_parse into scm_url_parse and make it more generic 2015-03-31 13:34:03 +00:00
nightwing 539cf4b6e2 make sure operationEnd events are not emitted to wrong session 2015-03-31 17:00:25 +04:00
nightwing e10fa11588 fix typo 2015-03-31 13:07:43 +04:00
nightwing 41518496d4 fix package name regex 2015-03-30 01:14:06 +04:00
Fabian Jakobs 504f68ac0a Merge pull request +6600 from c9/schema-index
Schema index
2015-03-23 12:27:08 +01:00
nightwing a51f96a157 reapply 834417f734 which was accidentally reverted 2015-03-20 00:42:00 +04:00
nightwing 06089a8e7c fix raygun errors 2015-03-18 22:35:50 +04:00
nightwing 244ec1500f show file size in the tree tooltip 2015-03-17 21:41:34 +04:00
Fabian Jakobs 80867587eb cleanups 2015-03-17 10:22:41 +00:00
Fabian Jakobs f1b14e0117 fix datadog test 2015-03-17 09:55:49 +00:00
nightwing 898c34de0e set crossOrigin attribute on cdn scripts (+6425) 2015-03-13 15:23:55 +04:00
nightwing ae7a32dd0f fix +5853 Emmet doesn't work with handlebars template files 2015-03-10 20:56:20 +04:00
nightwing 1da498156a fix require for paths ending with .js in the worker 2015-03-10 20:14:59 +04:00
Matthijs van Henten 9f09732f15 gets rid of warnings, update to current version 2015-03-10 10:35:39 +00:00
Alex Brausewetter f50cb5ff6c Merge pull request +6455 from c9/debugger
Fix debugger not pausing on breakpoints

- Smoke tested on local standalone
- Reviewed as per DoD Level 1
2015-03-09 14:11:21 +01:00
Matthijs van Henten e59f86a9c7 Merge remote-tracking branch 'origin/master' into restore-profile
Conflicts:
	plugins/c9.api/project.js
2015-03-05 09:27:33 +00:00
Lennart Kats 3f2dd4cf25 Revert "Revert "Merge pull request +6023 from c9/profile-integration""
This reverts commit e6fc5d467d.
2015-03-05 09:54:49 +01:00
Fabian Jakobs 39756176ff Merge branch 'master' of github.com:c9/newclient 2015-03-04 09:45:04 +00:00
nightwing 469d58b34e display real ip instead of 0.0.0.0 2015-03-03 21:08:52 +04:00
Ruben Daniels a53da8f95d Merge pull request +6416 from c9/missing-commands
add commands for focusing tree and toggling wordwrap
2015-03-03 07:13:32 -08:00
Fabian Jakobs 76a591b01e add stats call to kaefer to inspect the internal state 2015-03-03 14:59:20 +00:00
Lennart Kats 4a0a75adf8 Merge remote-tracking branch 'origin/master' into revert-attempt
Conflicts:
	package.json
	plugins/c9.ide.performancestats/stats.js
	plugins/c9.worker/backup.js
2015-03-03 10:25:46 +01:00
Lennart Kats 1797aaf7d8 Merge remote-tracking branch 'origin/more-latency-data' into revert-attempt
Conflicts:
	plugins/c9.ide.performancestats/stats.js
2015-03-02 07:28:37 +01:00
Lennart Kats 8a8769a7f6 Merge pull request +6418 from c9/more-latency-data
Record more latency data
2015-03-01 17:09:39 +01:00
Lennart Kats c7ec9d7b4f Make new serverPing logic backward & forward compatible 2015-02-28 15:06:06 +01:00
Tim Robinson e9c7492808 Merge pull request +6415 from c9/improve-docker
[Trivial] Fix raygun error
2015-02-28 13:43:17 +01:00
Lennart Kats 6f197414c3 Add server-side latency (vfs -> docker host) 2015-02-28 10:18:45 +01:00
nightwing 6e8a74e18f fixes for emacs mode 2015-02-28 01:20:42 +04:00
nightwing 38fac42a0d revert watcher changes causing memory leak 2015-02-27 17:25:22 +01:00