Wykres commitów

1505 Commity (b7af16c313c2fef393b7183938ee548f246e596b)

Autor SHA1 Wiadomość Data
Tim Robinson e469759873 Merge pull request +14157 from c9/revert-14156-revert-13838-vfs-fix-collab-code-reverting
VFS Fix collab code reverting for unsaved files
2016-07-20 17:15:45 -04:00
Tim Robinson 501c113688 Merge branch 'ide-workspace-opening-time-optimization' into all-workspace-load-metrics 2016-07-14 16:23:10 +00:00
nightwing dd34ac78d9 fix +14373 Tooltip shows 'undefined' when hovering over favourites 2016-07-12 23:37:45 +00:00
nightwing fb0a7e5a78 fix +14513 c9 open is broken in new workspaces 2016-07-12 23:31:58 +00:00
Kareem Zidane 707304e120 fixes CSS for some elements
* fixes acitve background colors for "Run" and "Preview" buttons.
* fixes hover background color for breakpoints in "Breakpoints" panel.
* fixes color for box showing when hovering keywords while debugging.
2016-07-11 18:24:38 +04:00
steliosrousoglou 5622295654 editorTypes in editors.js 2016-07-11 18:08:26 +04:00
Tim Robinson 86803ef0dd Merge pull request +14341 from c9/ide-manual-stats-refresh
Disable stats if latency is >= 500ms
2016-07-06 09:26:48 -04:00
Harutyun Amirjanyan 81aca90a8b Merge pull request +14456 from c9/pull/core/324
Pull/core/324
2016-07-04 18:37:47 +04:00
Chris Brown 7470b1eaad Swapped the ok/cancel button order for the login dialog 2016-07-04 14:50:43 +01:00
Chris Brown e6a9784b4f Swapped the ok/cancel button order for the file chooser and confirm dialogs 2016-07-04 14:49:15 +01:00
nightwing 893698d314 fix and unblacklist several tests 2016-06-30 06:12:40 +04:00
nightwing 30129604cc fix windows path handling issues 2016-06-28 23:00:44 +04:00
nightwing 91f98d3aee fix maxBuffer exceeded error when deleting folder owned by root 2016-06-28 22:54:19 +04:00
Tim Robinson 50dfe00205 Adding mock function for tests 2016-06-27 12:59:40 +00:00
Tim Robinson 1eba1b1b20 Adding a onPingComplete callback without needing to include metrics_core module 2016-06-27 12:58:04 +00:00
c9bot 106832d7b6 c9-auto-bump 3.1.2814 2016-06-26 13:53:19 +02:00
Harutyun Amirjanyan e68151fbee Merge pull request +14400 from c9/ide-sdk-prs
merge sdk prs
2016-06-24 12:09:11 +04:00
Fabian Jakobs 5bf513c80a process review 2016-06-23 16:52:13 +02:00
Fabian Jakobs babf7a171b add preview unit test 2016-06-23 11:01:27 +00:00
Fabian Jakobs baefea09a0 Merge remote-tracking branch 'origin/master' into ide-preview-sessions 2016-06-22 09:48:39 +00:00
nightwing 4f06c24abc use correct docId in resolveConflict 2016-06-22 02:48:14 +04:00
Tim Robinson 27823aa4e1 Resolve conflicts on all clients when one client resolves it 2016-06-21 21:51:14 +00:00
Harutyun Amirjanyan 37bbea3c50 Merge pull request +14321 from c9/ide-fix-various
Small fixes for sdk
2016-06-20 19:21:23 +04:00
Matthijs van Henten c7331988dd Merge pull request +14317 from c9/ci-improve-client-tests
Ci improve client tests
2016-06-20 10:02:33 +02:00
nightwing 9354fefd0c do not checkout branch when resetting a file 2016-06-20 00:56:28 +04:00
Harutyun Amirjanyan b60fad7485 Merge pull request +14313 from c9/vfs-download-empty
do not leave download hanging when file is empty
2016-06-19 22:59:20 +04:00
nightwing 7b9bd4ef2a add back client side watcher handling for rename 2016-06-19 22:57:09 +04:00
nightwing 86ac0ec42b better cleanup after destroying reconnect socket 2016-06-19 16:06:56 +04:00
nightwing 00e9ced6ea disable tests failing on phantomjs 2016-06-19 15:54:24 +04:00
nightwing 1fabe6c3c9 take screenshot on failure 2016-06-19 14:36:15 +04:00
nightwing 9244db6b2c return correct exit code 2016-06-19 14:01:12 +04:00
nightwing f5083813a1 fix several flaky tests 2016-06-19 13:25:34 +04:00
nightwing c12c275fb4 remove noise from architect 2016-06-17 14:17:45 +00:00
nightwing d07f5e1feb do not recreate deleted node when rm returns ENOENT 2016-06-17 13:36:34 +04:00
nightwing 32db4ea7e5 make refresh more robust to errors 2016-06-17 13:36:33 +04:00
nightwing 14f6a65ea5 move watcher code to the server 2016-06-17 13:36:33 +04:00
nightwing 745511f8b5 update watchers when renaming files 2016-06-17 13:36:33 +04:00
nightwing 63e341ce00 do not leave download hanging when file is empty 2016-06-17 09:32:25 +00:00
Tim Robinson 8e02fc257c Improve automerge message 2016-06-15 17:11:00 +00:00
Tim Robinson 3751e2a7c8 Merge remote-tracking branch 'origin/ci-fix-tar-k-flag' into preview-fix-invalid-characters-in-header 2016-06-13 18:36:14 +00:00
Harutyun Amirjanyan ed92ec09d7 Merge pull request +14165 from c9/pull/core/305
[WIP] Improvements to download as zip
2016-06-09 15:07:21 +04:00
nightwing 60e4de8ec9 do not treat darwin as win32 2016-06-09 13:48:05 +04:00
Tim Robinson 700c8b7358 Catch errors where header contains invalid characters 2016-06-08 19:45:36 +00:00
nightwing 38f7c8399e fix error in cs50 workspace 2016-06-08 13:17:48 +00:00
Tim Robinson 079c22e5aa Save tab after resolving so collab knows the latest version was chosen by the user 2016-06-07 16:50:59 +00:00
nightwing d5efc4d5e1 fix download_test failing due to busy port 2016-06-07 19:41:36 +04:00
Lennart C. L. Kats eaddd468a1 Merge pull request +14137 from c9/ide-remove-browsersupport
remove browsersupport.js
2016-06-07 14:24:02 +02:00
Tim Robinson f86b9037e1 Always show dialog when collab reports that the doc has changed. Don't do a double check as sometimes that will cause the dialog to not show 2016-06-06 18:28:18 +00:00
Chris Brown 6440ef1eb8 Escape the filename arguments to zip and tar correctly on Windows 2016-06-06 15:37:32 +01:00
Chris Brown dbf1d72d1c Use escape instead of encodeURIComponent so that download filenames are encoded correctly (e.g., filenames containing a single quote) 2016-06-06 15:36:46 +01:00
Chris Brown 0dc707ec65 Use escape instead of encodeURI and encodeURIComponent, so that problematic filename characters are escaped correctly 2016-06-06 15:35:12 +01:00
Tim Robinson 2e5b5215a4 Revert "Revert "VFS Fix collab code reverting for unsaved files"" 2016-06-06 10:30:30 -04:00
Tim Robinson 88e5dfa70f Revert "VFS Fix collab code reverting for unsaved files" 2016-06-06 10:29:35 -04:00
nightwing a4d6876baa fix another error in terminal test 2016-06-06 04:42:53 +04:00
c9bot 7c55a315dd more robust handling of missing module errors 2016-06-06 02:27:25 +04:00
nightwing 581cd51fca fix regression in vfs.ping 2016-06-06 02:22:31 +04:00
nightwing ff92b4e3d8 fix monitor test 2016-06-06 02:20:30 +04:00
Tim Robinson d3276215b4 Merge pull request +13838 from c9/vfs-fix-collab-code-reverting
VFS Fix collab code reverting for unsaved files
2016-06-03 10:51:19 -04:00
nightwing 6c4e572dfd remove browsersupport.js 2016-06-03 14:40:29 +04:00
Lennart Kats c87c0ff83a Merge remote-tracking branch 'origin/master' into ide-remove-agpl-2 2016-06-03 09:30:18 +00:00
Tim Robinson f615aabc9e Merge remote-tracking branch 'origin/master' into vfs-fix-collab-code-reverting 2016-06-03 00:32:10 +00:00
Tim Robinson 1b7ceb9000 Merge remote-tracking branch 'origin/master' into vfs-upgrade-engineio 2016-06-02 16:49:21 +00:00
Lennart Kats 5d012dc27f Add extra guard for tests 2016-06-02 10:42:25 +00:00
Lennart Kats 5740293909 Fix paths 2016-06-02 10:08:41 +00:00
Chris Brown 5cad3449c3 URI-encode commas in filenames explicitly, because they are used as a separator 2016-06-02 09:25:44 +01:00
Lennart C. L. Kats 03a6f109e5 Revert "Revert "Only measure latency when websocket seems idle"" 2016-06-02 10:04:58 +02:00
Lennart C. L. Kats 98b1d4af13 Revert "Only measure latency when websocket seems idle" 2016-06-02 10:04:23 +02:00
Tim Robinson 211b22d400 Merge remote-tracking branch 'origin/master' into vfs-upgrade-engineio
Conflicts:
	npm-shrinkwrap.json
2016-06-01 13:41:21 +00:00
Lennart Kats cf1c2cf6d8 Only measure latency when websocket seems idle 2016-06-01 12:33:26 +00:00
Fabian Jakobs 1f04a3aec3 cleanups 2016-06-01 11:42:38 +00:00
Fabian Jakobs 889dd2ccee only parse JWT once 2016-06-01 10:12:32 +00:00
Dana 7c8d57b000 Removes error loggign messsage in case of 403 2016-06-01 07:54:00 +00:00
cloud9 c6390ed799 Merge remote-tracking branch 'origin/master' into vfs-upgrade-engineio
Conflicts:
	npm-shrinkwrap.json
2016-05-31 16:34:06 +00:00
cloud9 159c1c5419 Fixed bug using port specified in the socket 2016-05-31 16:31:34 +00:00
Fabian Jakobs 09736fa7bb no need to compromise security. We have the code in the cookie 2016-05-31 14:52:03 +00:00
Fabian Jakobs 290550f86e address review comments 2016-05-31 09:19:28 +00:00
cloud9 e1b3426361 Merge remote-tracking branch 'origin/master' into vfs-upgrade-engineio 2016-05-30 19:41:02 +00:00
Tim Robinson 88fe82a5b9 Disable rejectUnauthorized in dev mode so vfs works in it 2016-05-30 19:25:12 +00:00
Fabian Jakobs 77f826bdc6 increase cache size and add to SDK config 2016-05-30 14:43:03 +00:00
Fabian Jakobs c2e82981b7 split computing the role and enforcing it so we can cache more 2016-05-30 14:34:50 +00:00
Fabian Jakobs c4eea5501b Merge remote-tracking branch 'origin/master' into ide-preview-sessions 2016-05-30 13:53:26 +00:00
nightwing dc18fc45c3 fix typo in clipboard 2016-05-28 02:49:28 +04:00
Fabian Jakobs 435c2915c5 anonymous user is -1 2016-05-27 14:13:31 +00:00
Fabian Jakobs 1139ff255d don't depend on session 2016-05-27 13:51:19 +00:00
Harutyun Amirjanyan 1ac941460c Merge pull request +13985 from c9/ide-fix-various
Ide fix several small issues
2016-05-27 11:16:03 +04:00
Harutyun Amirjanyan c7803bc5d1 Merge pull request +13808 from c9/vfs-r-collab
restrict access to ~.
2016-05-27 11:14:48 +04:00
Tim Robinson 814f11407a Code cleanup 2016-05-25 17:03:42 +00:00
Tim Robinson c353935450 Merge remote-tracking branch 'origin/master' into vfs-fix-collab-code-reverting 2016-05-25 17:01:03 +00:00
nightwing d2c77b4f42 fix html5 clipboard on ie 2016-05-25 20:49:24 +04:00
nightwing 9973c0ea35 fix typo 2016-05-25 20:48:04 +04:00
Lennart Kats a3063c246f Merge remote-tracking branch 'origin/master' into revert-13609-revert-13539-all-ab-testing
Conflicts:
	configs/docker.js
	npm-shrinkwrap.json
2016-05-23 10:15:25 +00:00
Justin Dray 269fa2c32b Update references to support@c9.io to https://c9.io/support 2016-05-20 15:20:43 +10:00
Tim Robinson e9a86d802e Fixed bug with change icon not showing when the version in the IDE is different from on disk 2016-05-18 01:16:18 +00:00
Tim Robinson 77338d54e5 Instead of automerging from disk, always prompt user about disk being different and allow them to apply the changes if they like 2016-05-17 20:46:42 +00:00
Chris Brown 31ad443da5 Another filename encoding fix 2016-05-17 15:25:13 +01:00
Chris Brown fd96fc8f01 When downloading several files or folders, name the archive 'item1[+n].zip', and ensure that filenames are encoded correctly 2016-05-17 14:40:29 +01:00
Kareem Zidane 667fd57cab changes on-hover bg color for Run and Preview
the on-hover background color for Run/Debug and Preview buttons is
brighter than it should (#E6E6E6) in Cloud9 Night theme. it doesn't
match that of the menus.

this changes the value of the background CSS property, of the relevant
classes, to the matching color (#303130).
2016-05-24 12:58:18 +02:00
Chris Brown bd305b227c Support for downloading workspace files as a zip archive 2016-05-11 08:55:14 +01:00
steliosrousoglou b63cac140a fixed focus on new files 2016-06-23 15:58:27 +00:00
nightwing 8d05489dab restrict access to ~. fixes +4538 2016-05-10 19:28:47 +00:00