Wykres commitów

7585 Commity (c6fe50b11558f7d19791dbea57d8cce2d1a632d9)

Autor SHA1 Wiadomość Data
Tim Robinson c6fe50b115 Bump protocol version 2016-06-15 15:24:53 +00:00
nightwing 461d910a63 use normalized docId instead of one from data 2016-06-09 23:54:01 +04:00
Tim Robinson 113bd19640 Use docId instead of path for notifying user of changes 2016-06-09 19:38:11 +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
Tim Robinson 4364617699 Added log about expiring changes. Made localfs send ctime as well as mtime 2016-06-07 16:00:56 +00:00
Tim Robinson fcd5cd8ee2 Use ctime instead of mtime for watcher 2016-06-07 12:35:07 +00:00
Tim Robinson 551b5d20d1 Merge remote-tracking branch 'origin/master' into revert-14156-revert-13838-vfs-fix-collab-code-reverting 2016-06-07 11:59:04 +00:00
c9bot f3b9781a7e c9-auto-bump 3.1.2658 2016-06-07 12:41:07 +02:00
c9bot 8f9e5a2b81 c9-auto-bump 3.1.2657 2016-06-07 12:00:30 +02:00
c9bot 74451d3d89 c9-auto-bump 3.1.2656 2016-06-07 09:25:17 +02:00
Tim Robinson 4296dfd20b Added syncing of files with disk when a user explicitly closes them 2016-06-07 00:11:07 +00:00
Tim Robinson 7ec2d04a88 Show the tab as unsaved if it has pending changes that haven't been saved 2016-06-06 22:41:58 +00:00
Tim Robinson 8db82648ea Revert "Retry setting changed or pending changes on a document who's tab isn't loaded"
This reverts commit 359053d792.
2016-06-06 20:41:11 +00:00
Tim Robinson 359053d792 Retry setting changed or pending changes on a document who's tab isn't loaded 2016-06-06 20:34:44 +00:00
Tim Robinson 771e71812d Adding some more logging to collab 2016-06-06 19:43:35 +00: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
Tim Robinson 15d8db963a Expire unsaved changes after 24 hours 2016-06-06 16:51:25 +00:00
c9bot 04ac2190ef c9-auto-bump 3.1.2655 2016-06-06 17:58:57 +02:00
c9bot 1959ee08c5 c9-auto-bump 3.1.2654 2016-06-06 17:11:56 +02:00
c9bot 03e1f3a9c6 c9-auto-bump 3.1.2653 2016-06-06 17:09:55 +02:00
c9bot c75cb907b7 c9-auto-bump 3.1.2652 2016-06-06 16:30:39 +02: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
c9bot ff6fffcd90 c9-auto-bump 3.1.2651 2016-06-06 16:16:37 +02:00
c9bot 3085279f88 c9-auto-bump 3.1.2650 2016-06-06 12:18:46 +02:00
c9bot 86f4d07f78 c9-auto-bump 3.1.2649 2016-06-06 11:05:02 +02:00
Harutyun Amirjanyan 12f77b8986 Merge pull request +14133 from c9/pull/c9.ide.run.debug/34
GDB perform evaluate call in correct frame
2016-06-06 13:04:52 +04:00
c9bot 76b724d930 c9-auto-bump 3.1.2648 2016-06-06 11:00:23 +02:00
Harutyun Amirjanyan 83806e8991 Merge pull request +14144 from c9/fix-client-tests
Fix client tests
2016-06-06 13:00:09 +04:00
c9bot d5b07de282 c9-auto-bump 3.1.2647 2016-06-06 09:26:39 +02:00
nightwing a4d6876baa fix another error in terminal test 2016-06-06 04:42:53 +04:00
nightwing d13dc1fd3d handle broken colors in theme importer 2016-06-06 03:21:00 +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
c9bot 0175a9d88d unhandled error doesn't make new engineio reconnect 2016-06-06 01:06:29 +04:00
c9bot 6d9a77b720 c9-auto-bump 3.1.2646 2016-06-03 16:51:33 +02: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
c9bot 2b045d0ab8 c9-auto-bump 3.1.2645 2016-06-03 11:46:18 +02:00
Matthijs van Henten 972a690cd6 Merge pull request +14121 from c9/ide-profile-fix-logout
Ide profile fix logout
2016-06-03 11:46:09 +02:00
c9bot 814c38729a c9-auto-bump 3.1.2644 2016-06-03 11:43:13 +02:00
c9bot 2617688031 c9-auto-bump 3.1.2643 2016-06-03 11:41:42 +02:00
Lennart Kats c87c0ff83a Merge remote-tracking branch 'origin/master' into ide-remove-agpl-2 2016-06-03 09:30:18 +00:00
c9bot 2a9592bd3b c9-auto-bump 3.1.2642 2016-06-03 11:29:46 +02:00
Lennart C. L. Kats dd778c57e5 Merge pull request +14113 from c9/none-remove-agpl-1
Remove AGPL licenses, step 1
2016-06-03 11:29:39 +02:00
c9bot e6f236c440 c9-auto-bump 3.1.2641 2016-06-03 11:21:53 +02:00
c9bot e6294a1f75 c9-auto-bump 3.1.2640 2016-06-03 11:21:07 +02:00
Matthijs van Henten fd5b54d379 disables salesforce ws type 2016-06-03 08:57:22 +00:00
Tim Robinson f2c92a7819 Remove fsHash from Revisions, don't do hash comparison checks 2016-06-03 01:15:49 +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