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

..

binary-file.jade

Add a spinner when waiting for image preview to load.

2016-05-20 14:28:51 +01:00

chat.jade

Fix layout to support scrollable messages.

2016-08-22 16:12:29 +01:00

editor.jade

add left menu for syntax validator

2016-10-06 11:51:24 +01:00

file-tree.jade

Rename track-changes -> history on the client

2016-10-10 16:59:25 +01:00

header.jade

Rename track-changes -> history on the client

2016-10-10 16:59:25 +01:00

history.jade

Rename track-changes -> history on the client

2016-10-10 16:59:25 +01:00

hotkeys.jade

Add a <code> block to autocomplete_references.

2016-08-31 13:54:51 +01:00

left-menu.jade

add left menu for syntax validator

2016-10-06 11:51:24 +01:00

pdf.jade

finalise display of syntax check error message

2016-08-26 15:14:57 +01:00

publish-template.jade

Don't show publish buttons when showing free trial for templates

2016-01-19 16:10:50 +00:00

share.jade

Blur the resend button after response

2016-08-12 11:25:03 +01:00