mirror
/
c9-core
kopia lustrzana https://github.com/c9/core
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność
9 393 Commity
10 Gałęzie
0 Tagi
38 MiB
Wykres commitów

1735 Commity (7a83f3167bf66ac2bf28fd14e35649f41f1c3de1)

Autor SHA1 Wiadomość Data
nightwing 65476ca6b7 reduce collab logging 2017-02-21 23:03:35 +00:00
Harutyun Amirjanyan 3113210322 Merge pull request +15282 from c9/ide-fix-various 
Ide fix various
 2017-02-20 13:08:39 +04:00
nightwing fd2334b14b allow configuring setting file names from url 2017-02-20 08:17:25 +00:00
nightwing 784fd7b97a add more tab commands to emacs mode 2017-02-19 19:02:57 +04:00
nightwing 51a9f0d192 add Alt-` as an alternative to Ctrl-Tab on windows 2017-02-19 16:00:58 +04:00
nightwing 0841961fc7 handle misformed tabstate 2017-02-19 15:52:14 +04:00
nightwing 0a495532a6 fix regression with revealtab 2017-02-18 17:26:21 +04:00
nightwing 494bbb0fb6 fix completer popping up unexpectedly 2017-02-17 12:35:52 +04:00
Harutyun Amirjanyan 43e54fef32 Merge pull request +15280 from c9/fix-makestatic 
fix workflow build
 2017-02-17 12:32:31 +04:00
nightwing d607cf5f5d fix workflow build 2017-02-17 07:07:06 +00:00
nightwing ddd363ce38 fix test runner in the sdk 2017-02-16 16:53:58 +00:00
nightwing 31ab6ca2ac fix dialog keyhandler regression 2017-02-13 22:19:52 +04:00
nightwing 5f33015009 fix +14663 Environment variables popup scrollbar is hidden 2017-02-13 20:32:13 +04:00
nightwing e8da10c048 fix console focus issue 2017-02-12 23:48:25 +04:00
nightwing 8ad9070563 fix another regression from ide-configs pr 2017-02-09 23:19:47 +00:00
nightwing 41be5bb8be handle duplicate config names in makestatic 2017-02-09 21:54:02 +00:00
Harutyun Amirjanyan 9d9bfce0b9 Merge pull request +15198 from c9/ide-configs 
Move ide configs into subfolder
 2017-02-10 00:04:00 +04:00
nightwing c30f5f3bb2 fix download_test 2017-02-07 18:41:27 +00:00
nightwing b3f2219fab better name for extensions folder 2017-02-06 19:48:18 +00:00
Harutyun Amirjanyan 9aa39d0946 Merge pull request +15199 from c9/ide-saveable-tab-layouts 
Saveable tab layouts
 2017-02-06 21:46:50 +04:00
Harutyun Amirjanyan 718e42e9fa Merge pull request +15240 from c9/pull/core/389 
Fix a use of `arguments.callee` in strict-mode code.
 2017-02-06 21:45:48 +04:00
Harutyun Amirjanyan 48c088e19c Merge pull request +15248 from c9/ide-fix-various 
fix syntax highlighting issue
 2017-02-06 21:44:19 +04:00
nightwing 30a497b8f6 include all plugins in c9/core 2017-02-06 12:40:24 +00:00
nightwing 0e6c7b6642 rename integrations directory to extensions 2017-02-06 11:48:59 +00:00
nightwing eb3a574f96 move ide configs into subfolder 2017-02-03 23:43:47 +04:00
nightwing 9072cb90c8 add static ide page 2017-02-03 23:43:46 +04:00
nightwing 4be6aa745c make uses of staticPrefix more consistent 2017-02-03 23:43:46 +04:00
nightwing 17285952c0 remove dialog dependence on commands service 2017-02-03 22:00:39 +04:00
nightwing a0bf81ed8f tweak automatic selection of mode 2017-02-02 12:34:11 +04:00
nightwing 9879e5ce51 fix wrong tab getting focus when console is hiding 2017-02-02 12:22:48 +04:00
nightwing 70ee2af89e fix about dialog missing in standalone 2017-02-02 12:19:21 +04:00
Lennart kats 6afb171808 Apply .eslintrc rules 2017-01-30 11:32:54 +00:00
Lennart Kats 25a3480224 Remove unused script 2017-01-30 10:43:12 +00:00
Tim Robinson 3153599a15 Don't sort vfs servers by version 2017-01-26 00:34:44 +00:00
Max Schaefer 86498d561b Fix a use of `arguments.callee` in strict-mode code. 2017-01-23 13:06:46 +00:00
Lennart C. L. Kats 4c67b60e21 Merge pull request +15206 from c9/ide-minor 
Minor fix/tweaks for the IDE
 2017-01-23 10:30:15 +01:00
Lennart Kats c24ddd334c Tweak dialog buttons 2017-01-17 13:19:59 +00:00
Lennart Kats 5667bca5df Fix menu item title that's often wrong 2017-01-17 13:19:40 +00:00
Dan Armendariz d5d76fc0e7 Ensure restore page also displays logo 2017-01-17 11:14:16 +00:00
Dan Armendariz c275db6e65 Resize C9 logo and scrunch margins when loading screen is smaller than 600px 2017-01-16 15:03:18 +00:00
Harutyun Amirjanyan 26ffb8e6aa Merge pull request +15197 from c9/ide-apf 
remove unused code from apf
 2017-01-16 15:33:13 +04:00
nightwing 4429730ae0 fix reavealTab for hidden files 2017-01-14 00:32:09 +04:00
nightwing fd5e2362e0 remove more unused code from apf 2017-01-12 14:59:35 +04:00
nightwing 6373891204 cleanup 2017-01-12 14:29:48 +04:00
nightwing e8893951a7 do not modify globals from livecss 2017-01-10 05:43:37 +00:00
nightwing f3d89fa2ad instant tab tooltips 2017-01-05 14:50:14 +00:00
Harutyun Amirjanyan bc900b2c2f Merge pull request +15156 from c9/ide-restore 
disable ide shortcuts when restore screen is open
 2017-01-05 18:46:02 +04:00
Harutyun Amirjanyan 624ba1ca8b Merge pull request +15131 from c9/ide-preview-issues 
popout application preview to a tab in a separate process
 2017-01-05 18:45:33 +04:00
Dan Armendariz 20dacef261 Use newline event to prevent buffer from clearing 2017-01-05 13:51:49 +00:00
Dan Armendariz 4db222720b Don't allow term reset to destroy line cache while waiting for newline 2017-01-05 12:54:50 +00:00
nightwing ce8d48b029 disable ide shortcuts when restore screen is open 2017-01-03 11:36:45 +00:00
Tim Robinson 7f4af4df7d Remove line about sauce labs from messages 2016-12-29 22:34:09 +00:00
Tim Robinson cd6e631911 Revert "Remove line about sauce labs from messages" 
This reverts commit 2b41a61196.
 2016-12-29 22:26:41 +00:00
Tim Robinson 2b41a61196 Remove line about sauce labs from messages 
Also adding 'literally' back as that's the joke.
 2016-12-29 23:24:20 +01:00
nightwing e5145a715f firefox doesn't open the link if it's not in document 2016-12-22 19:27:35 +00:00
nightwing c421395cd4 popout preview to a tab in a separate process 2016-12-22 19:27:35 +00:00
nightwing a6c17ca958 do not capture keystrokes when opening in a new tab 2016-12-22 19:27:35 +00:00
Lennart C. L. Kats 5a333e9868 Merge pull request +15040 from c9/ide-support-links 
Don't show support references in standalone mode
 2016-12-21 14:03:53 +01:00
nightwing 2b080175d7 fix console focus issue 2016-12-16 23:34:52 +00:00
nightwing 7cc5abac03 allow cmd-shift-l on terminal 2016-12-16 22:47:09 +00:00
nightwing 33833a7ec8 fix dragging from terminal 2016-12-15 22:53:23 +00:00
Brady Dowling 9b700f9d51 Active tab is large 2016-12-12 13:38:29 -08:00
nightwing cc03ab6569 fix tabManager.setState 2016-12-05 22:50:43 +00:00
Tim Robinson 01e1b4061f Cleanup 2016-12-03 00:58:21 +00:00
Tim Robinson fa432099a8 Implemented vfs server killing connections. Added more tests 2016-12-03 00:06:03 +00:00
Brady Dowling 98bb6a5395 Show console on maximize 2016-11-30 22:46:05 +00:00
Brady Dowling c5185ca58d Move console events to xml 2016-11-30 22:38:57 +00:00
Brady Dowling d7a8ea3543 Expose command for maximizing console 2016-11-30 21:16:11 +00:00
Harutyun Amirjanyan 9216331607 Merge pull request +15084 from c9/ide-fix-various 
ide papercuts
 2016-11-29 17:51:14 +04:00
nightwing c2139d6cde add shortcuts for pane navigation commands 2016-11-29 17:11:49 +04:00
nightwing 5a916a21f5 Merge remote-tracking branch 'remotes/origin/pull/core/374' 2016-11-26 22:32:14 +04:00
nightwing 335afbfcdf Merge remote-tracking branch 'remotes/origin/pull/core/378' 2016-11-25 04:35:45 +04:00
nightwing d3aa5f8d5c fix +14891 Disable terminal popup on double click 2016-11-24 23:07:03 +00:00
nightwing c4500a1abc fix c9 open --wait 2016-11-24 22:43:34 +00:00
nightwing 18dea5502f add shim for trimRight 2016-11-24 22:28:50 +00:00
Fabian Jakobs e905648144 rename getRole to initSession 2016-11-24 15:50:01 +00:00
Fabian Jakobs 00bdd6ff47 store mount id in the database 2016-11-24 15:31:51 +00:00
Fabian Jakobs 0c0fe7154c temporarily disbale nginx for preview. Was broken by docker update 2016-11-24 13:50:30 +00:00
Alper Özışık b7af16c313 Fix for undefined error log in console 
When css|less build fails it is logging as undefined in console.
In that case err object does not have any stack property.
Printing the error itself in that case will be sufficient.
 2016-11-21 08:57:45 +02:00
Lennart C. L. Kats bfd9818702 Merge pull request +14962 from c9/ide-code-formatting 
Support custom code formatters
 2016-11-16 11:35:46 +01:00
Lennart Kats 8045127da8 Add onchange event handler 2016-11-12 17:08:18 +00:00
Lennart Kats 106f91e9a9 Don't show cancel button if it won't fit 
Fixes +14890
 2016-11-11 12:01:14 +00:00
Lennart Kats 61f22360a3 Don't show support references in standalone mode 2016-11-11 10:20:23 +00:00
Fabian Jakobs 53fe708d8c unblacklist metadata test. wasn't broken in v3 2016-11-04 07:56:52 +00:00
Fabian Jakobs e70af4e4a6 blacklist metadata test 2016-11-01 15:50:51 +00:00
Fabian Jakobs f53ecd06c5 move statics back to AWS 2016-10-31 13:32:29 +00:00
Kareem Zidane 7daea73876 detects more syntax modes from shebang 2016-10-25 18:09:20 +00:00
nightwing 5dbe2f2aaf add command-left/right support to terminal 2016-10-21 12:13:36 +00:00
nightwing 9ff54845e1 fix terminal contextmenu positioning 2016-10-17 10:11:32 +00:00
Tim Robinson bcc678a1c0 Merge pull request +14911 from c9/all-workspace-load-metrics 
Refactor and monitor more workspace loading metrics
 2016-10-11 07:42:20 -07:00
Tim Robinson 4593f2ecb9 Fixing broken tests 2016-10-07 18:37:48 +00:00
Bas d45a27807e Merge pull request +14899 from c9/test-fix-pricing-coreflows 
Fix PR test jobs
 2016-10-07 14:58:52 +02:00
Tim Robinson 6370f2ede2 Remove debug logs 2016-10-06 23:49:32 +00:00
Tim Robinson 9696045ab0 Add more vfs connection metrics. Make metrics more DRY 2016-10-06 23:43:30 +00:00
Tim Robinson 17de8dd1d3 Merge remote-tracking branch 'origin/master' into all-workspace-load-metrics 
Conflicts:
	.c9/project.settings
 2016-10-06 22:09:00 +00:00
Nikolai Onken c594097adf Merge pull request +14879 from c9/ide-cs50 
update cs50
 2016-10-06 13:53:08 +02:00
basdewachter 7aa88dbeeb change tmux name to prevent it from failing 2016-10-06 11:49:28 +02:00
Tim Robinson 5f45ea38f4 Merge pull request +14878 from c9/api-collab-dont-reveal-member-emails 
Don't reveal collab member emails
 2016-10-05 17:08:59 -07:00
basdewachter b7e2142d2a add missing test to sdk config 2016-10-04 15:36:36 +02:00
Tim Robinson 5374effc0f Adding more vfs metrics, fixing bugs 2016-10-04 00:19:52 +00:00
Tim Robinson 1ddffa375d Merge remote-tracking branch 'origin/master' into all-workspace-load-metrics 2016-10-03 17:49:54 +00:00
nightwing 5687328206 Merge remote-tracking branch 'remotes/origin/pull/core/355' 2016-10-02 22:24:39 +04:00
nightwing 740ef7edf7 handle git conflict status in terminal hover_link 2016-10-02 22:16:36 +04:00
Tim Robinson b7bae15ec2 Adding md5 of collab users emails for gravatar pictures 2016-09-30 19:09:05 +00:00
Tim Robinson 6cd0202b41 Need a timeout of 100ms for the message to show 2016-09-29 20:55:02 +00:00
Tim Robinson 820ff42781 Add tests. Kill the vfs connection when a users access level is changed too. 2016-09-29 20:41:28 +00:00
Tim Robinson 586ea62b29 When a user is removed from a project, kill their VFS session 2016-09-29 00:04:24 +00:00
Tim Robinson 76630bcf52 Move the save tab after the conflict is resolved to not trigger many change dialogs 2016-09-13 15:50:49 +00:00
Tim Robinson fb18f56fa4 Don't need to change the context 2016-09-13 13:40:30 +00:00
Tim Robinson ed56a8ea11 Make removedPaths object consistent with changedPaths 2016-09-13 12:54:35 +00:00
Tim Robinson d4d9fb8699 Merge remote-tracking branch 'origin/master' into gui-fixes 2016-09-13 12:43:23 +00:00
Tim Robinson ad3c00acb3 Don't check the queue at the start of showXXDialog, check it in the correct location 2016-09-13 12:20:29 +00:00
Tim Robinson 6093c80529 Pass arguments to resolve 2016-09-13 11:47:50 +00:00
Tim Robinson ab6a92a753 it's tab.document 2016-09-13 11:06:25 +00:00
Tim Robinson e04e89178a Renaming functions to be clearer 2016-09-13 10:28:32 +00:00
Lennart C. L. Kats f604ec4bcd Merge pull request +14694 from c9/disable-unpacked-helper 
Disable multi-port logic to make V3 work with the new VPN
 2016-09-12 12:24:17 +02:00
Tim Robinson 347441397d Moving variables out of closures and passing into functions instead. Only show one dialog at a time 2016-09-10 00:52:00 +00:00
Tim Robinson 5c91f36191 more changes? 2016-09-09 23:51:31 +00:00
Tim Robinson 75a5cc1277 Refactoring Gui 2016-09-09 23:50:59 +00:00
Alper Özışık e2267dfb28 Correct retina icons on a forked debugger plugin 
When a custom debugger plugin is used, order of the css compilation changes and causing wrong display on a forked debugger with retina display.
Removing this important flag solves the issue.
I have not seen any side effects of removing this important flag
 2016-09-06 00:24:24 +03:00
Harutyun Amirjanyan f45ebbb948 Merge pull request +14736 from c9/pull/core/353 
Update default-flat-light.less
 2016-08-31 01:08:51 +04:00
ozcanovunc 9547f64ecd Update default-flat-light.less 2016-08-30 16:57:31 +03:00
nightwing 612f6714e7 add show authorship info option to the gutter context menu 2016-08-28 13:25:27 +04:00
Lennart Kats c4f25e7f81 Disable multi-port logic to make V3 work with the new VPN 2016-08-18 14:55:04 +00:00
nightwing 1a999f4769 remove extra padding when line numbers are hidden 2016-08-10 14:33:29 +04:00
nightwing ac5b4d490f add gutter options to the context menu 2016-08-09 20:03:13 +04:00
nightwing 117ece00ef add showLineNumbers option 2016-08-09 18:29:45 +04:00
nightwing 345aaac349 update cs50 2016-07-25 09:30:51 +00:00
Tim Robinson c6cae9c254 Merge remote-tracking branch 'origin/master' into all-workspace-load-metrics 2016-07-22 19:10:34 +00:00
nightwing cf41234af0 include restore plugin in sdk core 2016-07-22 01:58:04 +04:00
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