Wykres commitów

185 Commity (298c5518f17fef4db237aaeb21c44d863ce2fcdd)

Autor SHA1 Wiadomość Data
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
Nikolai Onken d1e7ee757c Merge pull request +6462 from c9/fix/cs50-fixes
Fix/cs50 fixes
2015-03-04 13:40:55 +01:00
nightwing 1c37728d8b fix logic for hiding double dividers 2015-03-04 15:49:46 +04:00
nightwing 15d09c4d6a support setting default theme in workspace config 2015-03-04 14:50:23 +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 1eae26e9a7 Merge remote-tracking branch 'origin/master' into revert-attempt
Conflicts:
	configs/docker.js
2015-03-03 11:04:36 +00:00
Lennart Kats 341d5a8c7a Merge pull request +6406 from c9/worker-logging
Worker logging
2015-03-03 10:46:26 +01: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
Lennart Kats 6f197414c3 Add server-side latency (vfs -> docker host) 2015-02-28 10:18:45 +01:00
nightwing b58993dca6 fix issue with windows 8 language switching shortcut 2015-02-28 01:49:35 +04:00
nightwing 6198bbff00 add shortcuts 2015-02-28 00:19:09 +04:00
nightwing c78783c364 add commands for focusing tree and toggling wordwrap 2015-02-27 20:22:41 +04:00
Lennart Kats e6fc5d467d Revert "Merge pull request +6023 from c9/profile-integration"
This reverts commit 584e691a3f, reversing
changes made to 7af49ff62b.

Conflicts:
	configs/monitor.js
	scripts/makestatic.js
	scripts/makestatic.sh
2015-02-27 14:26:25 +01:00
Fabian Jakobs a432be11ec fix patching raygun 2015-02-27 11:45:41 +00:00
Fabian Jakobs 61ccd42969 sometimes we have raygun errors without a message. make it easier to find them 2015-02-27 11:41:38 +00:00
Ruben Daniels 6718cc6e70 Merge pull request +6212 from c9/support-new-mocha
Fix running client tests with newer mocha
2015-02-26 12:27:18 -08:00
Harutyun Amirjanyan 36aaff722a Merge pull request +6400 from c9/sdk
Fix for docs and needed APIs
2015-02-27 00:23:09 +04:00
Ruben Daniels bbf2cdb3c1 Small fix for debugger. Add ability to set undo manager for document 2015-02-26 18:59:58 +00:00
nightwing d4ebf4c22f add ui for guessTabSize setting 2015-02-25 15:54:18 +04:00
nightwing 3fa2e55c91 respect guessTabSize setting 2015-02-25 15:48:04 +04:00
Matthijs van Henten 584e691a3f Merge pull request +6023 from c9/profile-integration
[WIP] Profile Pages milestone 1
2015-02-25 10:05:05 +01:00
nightwing 4ce73bdc9a tweak client test runner 2015-02-24 17:10:52 +04:00
nightwing ba5322375e update mocha to 2.1.0 2015-02-24 17:09:44 +04:00
nightwing ea59968844 fix running tests with newer mocha 2015-02-24 17:09:40 +04:00
Harutyun Amirjanyan ee0fa0413a Merge pull request +6318 from c9/fix-vfs-storage
Save vfs to sessionStorage only on unload to not share it with other tabs
2015-02-23 16:32:58 +04:00
Tim Robinson 3d6dc854fc Merge pull request +6289 from c9/fix/keybindings
fix +6287 Unable to switch to sublime keybindings
2015-02-23 12:34:48 +01:00
Harutyun Amirjanyan cb8db3b002 Merge pull request +6286 from c9/sdk
Sdk
2015-02-22 03:21:24 +04:00
Ruben Daniels 9a2cfb28b7 small changes 2015-02-21 23:09:43 +00:00
nightwing b01e915822 save vfs to sessionStorage only on unload to not share it with duplicated tabs
fixes +4283
2015-02-21 23:40:46 +04:00
Lennart Kats 55ee409c76 Merge pull request +6237 from c9/fix/file-save-logging
File save time logging
2015-02-20 14:47:04 +01:00
nightwing d3dfbdbbae fix +6287 Unable to switch to sublime keybindings 2015-02-20 13:25:17 +04:00
Ruben Daniels f3cb3f8f6a added a suggestion from andrew and boyscouting 2015-02-19 22:38:39 +00:00
Harutyun Amirjanyan 62e241634c Merge pull request +6219 from c9/sdk
Fixes c9/core+12. Wrapper for AceTree
2015-02-19 21:25:38 +04:00
Ruben Daniels f00eee5e8b Some docs related changes to pane 2015-02-19 17:06:48 +00:00
Ruben Daniels 7967bd8649 Merge pull request +6279 from c9/fix/publish-test
Make publish test not call git to speed it up for CI server
2015-02-19 08:57:11 -08:00
Tim Robinson 31b3beacb2 Make publish test not call git to speed it up for CI server 2015-02-19 16:03:55 +00:00
Lennart Kats 61ba91aca1 Merge pull request +6255 from c9/download
allow downloading multiple files, and fix support for non-ascii filenames
2015-02-19 15:57:55 +01:00
Tim Robinson b46f26fa11 var name fix 2015-02-19 14:06:10 +00:00
Tim Robinson a97c3d6c33 Add listen for socket transport upgrades 2015-02-19 12:17:09 +00:00
Tim Robinson bae2ea5c6f Fixing missing collab dependency in test 2015-02-19 10:59:50 +00:00
Ruben Daniels 4e095a0ddc Merge branch 'sdk' of github.com:c9/newclient into sdk 2015-02-18 19:16:09 +00:00
Ruben Daniels 8572a0f5a2 Add filtering 2015-02-18 19:16:02 +00:00
nightwing 05f2e17e68 fix reset keybindings to default 2015-02-18 22:58:39 +04:00
nightwing 9627bfb863 more consistent classnames for tree dragging 2015-02-18 22:20:48 +04:00
nightwing 4976bf5bfd allow downloading multiple files and fix support for non-ascii filenames 2015-02-18 21:48:46 +04:00
Tim Robinson 6757a52ae0 Add fallback save logging and percent of saves that use the fallback method for each user. 2015-02-18 17:15:47 +00:00
Lennart Kats 28c29419a0 Merge pull request +6161 from c9/fix/engineio-pingtimeout
Increasing ping timeout from 3000 to 5000 ms to see if it improves disconnects
2015-02-18 14:30:27 +01:00
Ruben Daniels ca759a9f79 small api tweaks 2015-02-18 06:07:10 +00:00
Ruben Daniels a0b95d110f Fix default styling of ace-tree 2015-02-17 21:27:47 +00:00
Ruben Daniels d01e840e84 small improvement in navigate css 2015-02-17 18:56:11 +00:00
Ruben Daniels 6490a22d8d Fixes oops in dialog code 2015-02-17 18:13:36 +00:00
Ruben Daniels 3eb81a1c29 Testing 2015-02-17 18:07:44 +00:00
Ruben Daniels 8b24276cba Merge branch 'master' of github.com:c9/newclient into sdk 2015-02-17 17:06:37 +00:00
Matthijs van Henten 854d1b7aa0 Merge pull request +6204 from c9/fix/share-urls-contextmenu
Increase z-index of menu on click
2015-02-17 17:04:32 +01:00
Fabian Jakobs fc55d21014 fix broken ssh preview 2015-02-17 11:39:07 +00:00
Bas ef18ea2feb Merge branch 'master' into fix/share-urls-contextmenu 2015-02-17 09:42:58 +00:00
Ruben Daniels b2c57eb3ac Add zindex to menu api 2015-02-17 06:28:03 +00:00
Ruben Daniels f1c7c239d2 tweak 2015-02-17 06:23:35 +00:00
Ruben Daniels 15dee3103e Basics are working 2015-02-17 04:11:06 +00:00
Ruben Daniels 727940c98e Split out in separate plugins 2015-02-17 03:05:32 +00:00
Ruben Daniels 7b25edaa56 Fixes c9/core+12. Wrapper for AceTree 2015-02-17 02:48:36 +00:00
Harutyun Amirjanyan 82b64cecc5 Merge pull request +6218 from c9/sdk
Improved dialog API
2015-02-16 23:42:53 +03:00
Ruben Daniels 6a4bcaa1f4 More API improvements 2015-02-16 20:22:06 +00:00
Lennart Kats 465c32d288 Merge pull request +6156 from c9/fix/vfs-remove-console-logging
VFS remove console logging
2015-02-16 18:13:26 +01:00
Ruben Daniels af7a410f21 Improved dialog API 2015-02-16 16:55:41 +00:00
Tim Robinson 0d32f5db68 Merge pull request +6205 from c9/fix/ping-accurate-logging
More accurate ping logging
2015-02-16 16:40:32 +01:00
Tim Robinson c3177e102c Fix broken stats test 2015-02-16 15:06:56 +00:00
Ruben Daniels 0f0aa6d9fb enable bridge by default 2015-02-15 19:48:26 +00:00
Harutyun Amirjanyan fe3617d087 Merge pull request +6196 from c9/fix/dual-license
Set a dual license on all the AGPL plugins
2015-02-15 21:34:41 +03:00
nightwing 4be4659a80 fix remaining license comments 2015-02-15 22:33:15 +04:00
Ruben Daniels e97042ac8d Fixes c9/core+7. plugin manager should expose manually disabled plugins 2015-02-15 17:58:41 +00:00
Nikolai Onken 44a858a49a Throw if ready is set more than once 2015-02-15 17:03:03 +00:00
Ruben Daniels 258449b0a6 Update copyright notice 2015-02-15 02:12:39 +00:00
Ruben Daniels f55caee595 doc changes 2015-02-15 02:10:57 +00:00
nightwing 8241750a76 remove incorrect license information from comments 2015-02-15 02:00:58 +04:00
nightwing b40dd401ba fix downloading windows version of node-webkit 2015-02-14 03:41:22 +04:00
Harutyun Amirjanyan 433d06527a Merge pull request +6175 from c9/sdk
Changing the name of dialog.filesave to dialog.file
2015-02-13 21:43:51 +04:00
Fabian Jakobs fe56d2fca9 Merge pull request +6134 from c9/preview-perf
Preview perf
2015-02-13 12:42:38 +01:00
Harutyun Amirjanyan b9e6cb5cc0 Merge pull request +6179 from c9/fix-php-simple
Fix missing module
2015-02-13 14:30:03 +04:00
Fabian Jakobs 8e21410269 Merge remote-tracking branch 'origin/master' into preview-perf 2015-02-13 10:16:02 +00:00
Fabian Jakobs e0c880f1d1 Merge pull request +6171 from c9/fix/6158-use-options
Use options to load from settings
2015-02-13 11:15:13 +01:00
Lennart Kats f5f33777bf Fix missing module 2015-02-13 11:11:58 +01:00
Fabian Jakobs 92e3ba7187 Merge remote-tracking branch 'origin/master' into preview-perf 2015-02-13 10:06:49 +00:00
Ruben Daniels 7cb84087de Changing dialog.filesave to dialog.file 2015-02-13 03:33:44 +00:00
Ruben Daniels 2d22fce0c6 Fix downloading plugin and unpacking it. Working around +6151 2015-02-12 22:16:35 +00:00
Ruben Daniels 26e36bc757 Fix downloading plugin and unpacking it. Working around # 2015-02-12 22:16:18 +00:00
Ruben Daniels 0438a92fbc Fix downloading plugin and unpacking it. Working around # 2015-02-12 22:15:55 +00:00
Ruben Daniels 580e4d348c Add salt to the right options 2015-02-12 16:07:51 +00:00
Nikolai Onken e6e4db020e Don't throw when ready is called twice 2015-02-12 14:04:04 +00:00
Tim Robinson eabc8dc41e Increasing ping timeout from 3000 to 5000 ms to see if it improves disconnects 2015-02-12 13:10:26 +00:00
Fabian Jakobs b5c87de5f5 take stopped containers into account 2015-02-12 11:18:39 +00:00
Tim Robinson 28ea4eb479 Merge remote-tracking branch 'origin/master' into fix/vfs-remove-console-logging 2015-02-12 10:40:10 +00:00
Tim Robinson b2cba5def3 Remove console log messages and send data straight to logger instead 2015-02-12 10:39:35 +00:00
Nikolai Onken 24ac3fa3b3 Merge pull request +6126 from c9/fix/log-workspace-loading
Fix/log workspace loading
2015-02-12 11:04:38 +01:00
Ruben Daniels a1496268a3 updated key validation 2015-02-12 03:32:01 +00:00
Ruben Daniels 4f12650ecf Better fixes for the SDK 2015-02-12 02:22:52 +00:00