268 commits

Author	SHA1	Message	Date
James Allen	e69b6da684	Stop deletes overlapping comments (but leads to occasional flickering)	2016-11-10 12:01:42 +00:00
James Allen	812ee82af1	Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel ... Conflicts: app/views/project/editor/editor.jade	2016-11-10 10:52:40 +00:00
James Allen	34b2b665a3	Accept and reject changes	2016-11-10 10:52:09 +00:00
Paulo Reis	950fc0179c	Basic support for action icons.	2016-11-10 10:19:52 +00:00
James Allen	184b421b1f	Show user name in comments	2016-11-09 16:34:23 +00:00
James Allen	b44f1cde10	Add user data into changes	2016-11-09 16:23:08 +00:00
James Allen	c5532bd8a3	Add cancel buttons for comments	2016-11-09 15:51:40 +00:00
James Allen	1622269d1b	Relayout review panel as needed	2016-11-09 15:46:47 +00:00
James Allen	6d7f4e9e6a	Add basic comment replying	2016-11-09 15:25:41 +00:00
James Allen	707ed43a7d	Very crude adding of comments	2016-11-09 14:50:58 +00:00
James Allen	4f8055d998	make sure line 1 changes don't hide under toolbar	2016-11-08 16:51:20 +00:00
James Allen	064ae1945a	Toggle review panel and track changes with ui elements	2016-11-08 16:43:01 +00:00
James Allen	2ac405e58c	Allow track changes to be toggled on and off	2016-10-20 16:59:58 +01:00
James Allen	8f9a4882c8	Don't let widgets in review panel overlap	2016-10-20 15:04:10 +01:00
James Allen	7a4bebd785	Allow review panel to be toggled	2016-10-13 14:22:23 +01:00
James Allen	42ab2e8165	Init review panel with ace editor height	2016-10-13 12:21:49 +01:00
James Allen	8d968f6865	Tidy up ReviewPanelController	2016-10-13 10:09:59 +01:00
James Allen	fc782581ea	Change review panel to feel like part of ace	2016-10-12 17:27:20 +01:00