nightwing
64d8f259dc
cleanup tests
2017-12-14 02:50:08 +04:00
nightwing
22e4f9ae03
remove unnecessary html.mocked calls
2017-11-24 16:11:21 +04:00
nightwing
d873f0da7f
fix "reset to default settings" button
2017-11-12 22:38:01 +04:00
Lennart kats
6afb171808
Apply .eslintrc rules
2017-01-30 11:32:54 +00:00
Lennart Kats
c24ddd334c
Tweak dialog buttons
2017-01-17 13:19:59 +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
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
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
nightwing
345aaac349
update cs50
2016-07-25 09:30:51 +00: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
c9bot
106832d7b6
c9-auto-bump 3.1.2814
2016-06-26 13:53:19 +02: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
Tim Robinson
8e02fc257c
Improve automerge message
2016-06-15 17:11:00 +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
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
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
Tim Robinson
814f11407a
Code cleanup
2016-05-25 17:03:42 +00: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
nightwing
dc4e241193
fix error when trying to resolve changed file twice
2016-02-10 23:23:06 +04:00
Ruben Daniels
fbfb17f46b
Fixes c9/core+200 - correct information in the fs cache
2015-11-06 01:40:27 +04:00
Tim Robinson
1833b8c330
Allow changing of body text in filechange dialog
2015-09-10 16:30:44 +00:00
nightwing
09de6cbb60
fix tests
2015-07-14 15:05:21 +04:00
Tim Robinson
822eccb18f
Refactoring to what @nightwing mentioned
2015-07-14 15:05:20 +04:00
Tim Robinson
6c2766b6cc
Added connecting, connected and isMaster tracking
2015-07-14 15:05:20 +04:00
Tim Robinson
41d0114f73
Sending error if watcher detects a file change but collab doesn't pick up on it somehow
2015-07-14 15:05:20 +04:00
Tim Robinson
22f46d3c3d
Fixed race condition
2015-06-10 14:33:30 +00:00
Tim Robinson
f62b3eb5f2
Fix console log
2015-06-10 14:25:13 +00:00
Tim Robinson
809393434b
Resolve has knowledge of it's own path already :)
2015-06-10 14:24:08 +00:00
Tim Robinson
194f578b9d
Minor bug fix
2015-06-09 09:27:01 +00:00
Tim Robinson
ab84c52a13
Passing path to resolve function to fix race condition with global path variable
2015-06-08 14:58:45 +00:00
Tim Robinson
90baf8a727
Change current call of showChangeDialog to show it for all changed paths as it no longer calls itself recursively
2015-06-08 14:36:31 +00:00
Tim Robinson
427d344fac
Before save is called check tab conflicts are resolved
2015-06-05 13:19:30 +00:00
Tim Robinson
6c388233a9
Adding logging to track down redis failures and why they're happening
2015-05-13 09:38:16 +00:00
nightwing
8312d3d5ac
fix save test
2015-05-04 02:27:57 +04:00
Lennart Kats
e3e0fab8f8
Fix watcher bug
2015-03-16 01:52:43 +04:00
Lennart Kats
3f2dd4cf25
Revert "Revert "Merge pull request +6023 from c9/profile-integration""
...
This reverts commit e6fc5d467dc6a4c8f8d962ff0c2930b805d4d2e2.
2015-03-05 09:54:49 +01:00
Lennart Kats
e6fc5d467d
Revert "Merge pull request +6023 from c9/profile-integration"
...
This reverts commit 584e691a3f8dc298eff20401cfd9a8ef23164b16, reversing
changes made to 7af49ff62b19985c3ee39df1af7a683183a3a25b.
Conflicts:
configs/monitor.js
scripts/makestatic.js
scripts/makestatic.sh
2015-02-27 14:26:25 +01:00
Matthijs van Henten
584e691a3f
Merge pull request +6023 from c9/profile-integration
...
[WIP] Profile Pages milestone 1
2015-02-25 10:05:05 +01:00
c9bot
b0108959bc
initial commit
2015-02-10 23:41:24 +04:00
