20 Commits

Author SHA1 Message Date
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