Wykres commitów

1474 Commity (55df9b22d0c84fc7474981c9ce8787e5d978662c)

Autor SHA1 Wiadomość Data
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
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
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
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