James Allen 8368577867 Merge branch 'master' into ja-review-panel ... Conflicts: app/views/project/editor/editor.jade public/coffee/ide.coffee public/coffee/ide/editor/directives/aceEditor.coffee		2016-10-31 16:42:55 +00:00
..
binary-files	Add a spinner when waiting for image preview to load.	2016-05-20 14:28:51 +01:00
chat	Show different users changes in different colours	2016-10-20 12:15:22 +01:00
clone
colors	Show different users changes in different colours	2016-10-20 12:15:22 +01:00
connection	Clear SERVERID cookie when reconnecting gracefully	2016-10-25 14:09:36 +01:00
directives	Don't reload editor with file tree or PDF viewer hidden	2016-02-23 15:21:54 +00:00
editor	Merge branch 'master' into ja-review-panel	2016-10-31 16:42:55 +00:00
file-tree	Use ide.validFileRegex, not hard coded regex	2016-09-22 14:57:59 +01:00
history	Show different users changes in different colours	2016-10-20 12:15:22 +01:00
hotkeys	Use new event tracking methods.	2016-08-10 17:33:56 +01:00
human-readable-logs	Merge pull request #332 from MCribbin/patch-4	2016-10-11 11:11:10 +01:00
online-users	Show different users changes in different colours	2016-10-20 12:15:22 +01:00
pdf	Add AB test for plans (+15 squashed commits)	2016-10-21 16:17:37 +01:00
pdfng/directives	enable pdfjs cmaps in pdfRenderer	2016-10-20 12:55:58 +01:00
permissions
references	Reconnect gracefully when asked to by real-time	2016-10-24 16:36:40 +01:00
review-panel	Allow track changes to be toggled on and off	2016-10-20 16:59:58 +01:00
services	Allow Cmd+Clicking to multi select entries in the file tree	2016-02-09 15:13:58 +00:00
settings	Save syntax checking as a user setting.	2016-10-25 14:59:20 +01:00
share	Lower case email before considering if it's duplciated when sharing	2016-09-21 10:48:04 +01:00
wordcount	remove scaffolding for per-user compiles so that it is always by default	2016-06-30 14:43:03 +01:00
SafariScrollPatcher.coffee	More comments.	2016-08-01 13:35:49 +01:00