Wykres commitów

7238 Commity (e9a86d802e81f86bfac317986ab77c0334a2e6f0)

Autor SHA1 Wiadomość Data
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 7b08f19dd3 If the latest revision was saved, use what's on disk. Otherwise prompt the user 2016-05-17 23:33:39 +00:00
Tim Robinson 6dacc6240d Revert "Instead of automerging from disk, always prompt user about disk being different and allow them to apply the changes if they like"
This reverts commit 77338d54e5.
2016-05-17 23:09:18 +00:00
Tim Robinson ad73b79bdf Revert "Remove getLatestRevision as we don't use it"
This reverts commit 599b813a94.
2016-05-17 23:02:30 +00:00
Tim Robinson 599b813a94 Remove getLatestRevision as we don't use it 2016-05-17 21:01:30 +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
Tim Robinson 0683fb0711 Rename tabs to tabManager as that's what it is 2016-05-17 20:46:36 +00:00
Tim Robinson c487213ce7 Use ctime isntead of mtime 2016-05-16 13:36:24 +00:00
Tim Robinson 1c20b8f9f7 Merge remote-tracking branch 'origin/master' into vfs-fix-collab-code-reverting 2016-05-13 19:21:04 +00:00
Tim Robinson d8631c216c VFS Fix collab code reverting for unsaved files 2016-05-13 19:12:25 +00:00
c9bot 4feb1f5c6c c9-auto-bump 3.1.2449 2016-05-13 17:13:50 +02:00
c9bot 396b467b3b c9-auto-bump 3.1.2448 2016-05-13 17:00:37 +02:00
c9bot b3a0286dd8 c9-auto-bump 3.1.2447 2016-05-13 14:21:09 +02:00
c9bot 1a7b99776d c9-auto-bump 3.1.2446 2016-05-13 14:02:00 +02:00
c9bot 64ef33efd1 c9-auto-bump 3.1.2445 2016-05-13 11:24:46 +02:00
c9bot fc97f894f1 c9-auto-bump 3.1.2444 2016-05-13 04:04:43 +02:00
c9bot 224e386a1f c9-auto-bump 3.1.2443 2016-05-12 16:47:02 +02:00
Tim Robinson 7e827dd39e Merge pull request +13790 from c9/vfs-improve-collab-error-checks
Add more logic to detect collab reverts
2016-05-12 10:46:51 -04:00
Tim Robinson f71bbb8b7f Use a filter instead 2016-05-12 14:45:59 +00:00
Tim Robinson fdb573241c Don't modify original operations. Remove log 2016-05-12 13:55:14 +00:00
c9bot d1b4c6953e c9-auto-bump 3.1.2442 2016-05-12 15:44:18 +02:00
c9bot 3e66213569 c9-auto-bump 3.1.2441 2016-05-12 15:35:14 +02:00
Tim Robinson ca3f50baed Merge pull request +13818 from c9/vfs-doc-save-logging
Adding more logging around document saving in collab
2016-05-12 09:35:01 -04:00
c9bot 4a4d5526f7 c9-auto-bump 3.1.2440 2016-05-12 01:18:41 +02:00
c9bot b2455f7c48 c9-auto-bump 3.1.2439 2016-05-12 00:36:01 +02:00
c9bot e93cea1412 c9-auto-bump 3.1.2438 2016-05-12 00:00:45 +02:00
Harutyun Amirjanyan 79e53ea790 Merge pull request +13816 from c9/pull/core/299
Support for downloading workspace files as a zip archive
2016-05-12 02:00:34 +04:00
Tim Robinson 0b69cc5b60 Adding more logging around document saving in collab 2016-05-11 20:26:00 +00:00
c9bot a1deca9d77 c9-auto-bump 3.1.2437 2016-05-11 15:06:07 +02:00
Lennart C. L. Kats 08a4addc1b Merge pull request +12925 from c9/codeintel-paths
Add include dir setting to codeintel
2016-05-11 15:06:00 +02:00
c9bot 8f492c2cea c9-auto-bump 3.1.2436 2016-05-11 13:45:48 +02:00
Lennart Kats 4c458d0c10 Revert "Don't immediately show completer when there's an exact match"
This reverts commit 9ca28e82f6.
2016-05-11 10:49:26 +02:00
Chris Brown bd305b227c Support for downloading workspace files as a zip archive 2016-05-11 08:55:14 +01:00
c9bot b495a9ad53 c9-auto-bump 3.1.2435 2016-05-10 20:07:04 +02:00
c9bot 84f1c4bd39 c9-auto-bump 3.1.2434 2016-05-10 19:41:07 +02:00
c9bot 7f7d8d7e66 c9-auto-bump 3.1.2433 2016-05-10 17:31:37 +02:00
c9bot 34a5cbbde6 c9-auto-bump 3.1.2432 2016-05-10 16:21:55 +02:00
c9bot f615d6673f c9-auto-bump 3.1.2431 2016-05-10 15:11:24 +02:00
c9bot 9dd3ec0c4b c9-auto-bump 3.1.2430 2016-05-10 14:42:35 +02:00
c9bot fe17567065 c9-auto-bump 3.1.2429 2016-05-10 13:07:52 +02:00
c9bot 22c7c6221a c9-auto-bump 3.1.2428 2016-05-10 10:40:53 +02:00
c9bot f58a05447a c9-auto-bump 3.1.2427 2016-05-10 10:12:51 +02:00
c9bot 6eacf6a8e4 c9-auto-bump 3.1.2426 2016-05-10 10:12:35 +02:00
Tim Robinson edeffdddbb Add more logic to detect collab reverts 2016-05-09 20:16:31 +00:00
c9bot f1b826172d c9-auto-bump 3.1.2425 2016-05-09 22:05:08 +02:00
c9bot cd4cf2f148 c9-auto-bump 3.1.2424 2016-05-09 16:54:33 +02:00
Tim Robinson 6f83744f9a Merge pull request +13780 from c9/multi-abuse-wsmonitor-use-gssh-cache
Make gssh force use cache for extra wsmonitor / abuse commands
2016-05-09 10:54:22 -04:00
c9bot c782d60ba1 c9-auto-bump 3.1.2423 2016-05-09 15:46:48 +02:00
c9bot 81faf136bb c9-auto-bump 3.1.2422 2016-05-09 15:44:35 +02:00
c9bot 1abe4b462d c9-auto-bump 3.1.2421 2016-05-09 15:42:49 +02:00