James Allen 9682af3981 Merge branch 'master' into ja-track-changes ... Conflicts: public/coffee/ide/history/HistoryManager.coffee		2016-10-10 17:10:10 +01:00
..
controllers	Revert "Report unsaved changes after 60 seconds"	2015-11-19 12:04:35 +00:00
directives	Merge branch 'master' into ja-track-changes	2016-10-10 17:10:10 +01:00
sharejs	Don't throw an error if we get an ack for our update more than once, since we may try sending it more than once	2016-05-27 10:46:14 +01:00
Document.coffee	Don't clean up a documents event listener until after the socket has disconnected on error	2016-05-27 14:39:33 +01:00
EditorManager.coffee	updated comments	2016-08-16 10:59:27 +01:00
ShareJsDoc.coffee	Don't try to resend an update if the editor is not joined to the project	2016-05-27 10:46:14 +01:00