3565 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
James Allen	829ccb6641	Resize on toggling review panel	2016-11-15 16:21:45 +00:00
Paulo Reis	8a11c8c3ca	Show add comment button when review panel is off.	2016-11-15 16:02:12 +00:00
Paulo Reis	f25e144a15	Update font awesome to v4.7.	2016-11-15 16:02:03 +00:00
James Allen	3b4670509a	Remove left over debug logging	2016-11-15 15:51:15 +00:00
James Allen	09074f5413	Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel	2016-11-15 15:48:17 +00:00
James Allen	4542d1094d	Keep separate persistent change tracker for each doc	2016-11-15 15:48:12 +00:00
Paulo Reis	7bf55823b2	Hide review panel when there are no entries.	2016-11-15 15:04:29 +00:00
Paulo Reis	d0f451df2e	Improve hover behaviour on review entries.	2016-11-15 12:23:39 +00:00
Paulo Reis	b181115277	Basic review minimized state.	2016-11-15 10:34:39 +00:00
Paulo Reis	0c600ba9b8	Support overflowing panes in UI layout.	2016-11-15 10:34:19 +00:00
James Allen	c89579e1df	Focus on the focused change	2016-11-14 12:47:46 +00:00
James Allen	d447ebe304	Add timeout around reply layout render	2016-11-14 11:49:34 +00:00
Paulo Reis	7201bde2a3	Add comment UI.	2016-11-14 11:19:00 +00:00
James Allen	747e14dffe	Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel	2016-11-11 16:16:10 +00:00
Paulo Reis	3694754ca6	Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel	2016-11-11 16:10:44 +00:00
Paulo Reis	d04d7f834e	Adjustments in the threaded comments, mocked comments responses.	2016-11-11 16:10:26 +00:00
James Allen	9509e87dc1	Update entries in place and position via DOM attributes directly	2016-11-11 16:09:32 +00:00
James Allen	36b950ea30	Use evalAsync instead of timeout	2016-11-11 13:35:16 +00:00
Paulo Reis	6c5c1549b6	Add comment replies via enter keypress.	2016-11-11 10:51:32 +00:00
Paulo Reis	78e409593b	Threaded comments.	2016-11-10 17:19:41 +00:00
Paulo Reis	8dcbb6ea4f	Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel	2016-11-10 15:09:56 +00:00
Paulo Reis	c5e6ca5200	More entry styling.	2016-11-10 15:08:41 +00:00
Paulo Reis	997addf355	More entry header styling + entry body.	2016-11-10 12:35:35 +00:00
James Allen	e69b6da684	Stop deletes overlapping comments (but leads to occasional flickering)	2016-11-10 12:01:42 +00:00
James Allen	938a8c4894	Fix logic around not tracking rejections to changes	2016-11-10 10:58:55 +00:00
James Allen	4e2dd55cfd	Fix merge issues	2016-11-10 10:53:30 +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	ca178c1a85	Fix indentation	2016-11-09 17:12:01 +00:00
James Allen	f62d95dd8c	Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel	2016-11-09 17:11:02 +00:00
James Allen	2e719fc450	Start adding callouts in review panel	2016-11-09 17:10:58 +00:00
Paulo Reis	013df17192	Entry header layout.	2016-11-09 17:09:57 +00:00
Paulo Reis	f28119aacb	Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel	2016-11-09 16:36:12 +00:00
Paulo Reis	341a092231	Merge + basic layout for entries.	2016-11-09 16:36:06 +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
Paulo Reis	e0fbb45844	Add colored borders.	2016-11-09 16:00:02 +00:00
Paulo Reis	19241e571f	Distinguish between inserts and deletes in the entries repeater.	2016-11-09 15:58:03 +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
Paulo Reis	74ddd33bd9	Add colors to LESS file.	2016-11-09 15:39:01 +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	446ca7212a	Track timestamps of changes	2016-11-09 12:19:48 +00:00
James Allen	cd494f7866	Update ChangesTracker to handle delete edge case	2016-11-08 17:57:23 +00:00
James Allen	f68c615f61	Remove markers correctly	2016-11-08 17:47:54 +00:00
James Allen	084838926d	Add in dashed line callouts for changes and comments	2016-11-08 17:31:08 +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