95 commits

Author	SHA1	Message	Date
James Allen	d4f60977fd	Add loading indicator while submitting new comments	2017-01-16 15:25:10 +01:00
James Allen	b6ea338ff8	Separate resolved comments so they don't affect review panel	2017-01-13 15:27:45 +01:00
James Allen	bf7038f506	Adapt review panel line height to editor	2017-01-13 14:52:08 +01:00
James Allen	6c49b95538	Don't allow overlapping comments ... Note that this is only a 'soft' don't allow. You could resolve a comment, comment in the same area, and get them to overlap. It's not a problem if they overlap, just a bit ugly UI wise	2017-01-13 14:17:47 +01:00
Paulo Reis	3d5691ddaf	Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes	2017-01-12 16:49:56 +00:00
Paulo Reis	e3e8541a63	Add class when review panel should layout to the left.	2017-01-12 16:49:47 +00:00
James Allen	2052ee63a3	Recover tracked changes after a disconnect	2017-01-12 17:19:19 +01:00
James Allen	f9b8ada215	track changes for anonymous users	2017-01-12 13:29:57 +01:00
James Allen	64b9fe52dd	Handle deleted users in comments gracefully	2017-01-12 12:31:01 +01:00
James Allen	6cd8e2a935	Add user data to comments correctly	2017-01-12 12:05:35 +01:00
James Allen	a081ae7307	Properly sync resolved comments dropdown to entries	2017-01-11 14:13:49 +01:00
James Allen	4ee4aa9f0a	Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes	2017-01-11 13:41:16 +01:00
James Allen	2e5c6d4570	Don't remove add comment marker when updating entries	2017-01-11 13:41:07 +01:00
Paulo Reis	931187bd8b	Add a backdrop to the dropdown (to close when clicked outside).	2017-01-11 10:53:46 +00:00
Paulo Reis	72baed60ef	Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes	2017-01-10 16:29:36 +00:00
Paulo Reis	010612aacc	Keep track of resolved threads in the dropdown.	2017-01-10 16:29:27 +00:00
James Allen	f17ce2705c	Don't include wrapper for resolved comments, since it throws the review panel layout off	2017-01-10 17:17:07 +01:00
James Allen	3668d7dd1f	Remove global debugging hook	2017-01-10 16:58:59 +01:00
James Allen	f31fa98679	Sync track changes state between sessions and client	2017-01-10 16:11:12 +01:00
James Allen	85c613e161	Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes	2017-01-10 13:44:01 +01:00
James Allen	d03aa7056e	Rename /ranges/users end point to /changes/users	2017-01-10 13:43:53 +01:00
Paulo Reis	9c7d89c5bd	Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes	2017-01-10 11:23:15 +00:00
Paulo Reis	072044ee90	Remove thread from view collection; some clean-up.	2017-01-10 11:23:06 +00:00
James Allen	12e1b2bc3d	Don't show resolved comments highlighted in the text	2017-01-10 11:55:59 +01:00
Paulo Reis	32fb317820	Add delete action to the dropdown.	2017-01-10 10:33:54 +00:00
Paulo Reis	70134d44d0	Add unresolve action to the dropdown.	2017-01-09 17:22:01 +00:00
James Allen	35bdb4383a	Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes ... Conflicts: public/coffee/ide/review-panel/controllers/ReviewPanelController.coffee	2017-01-09 16:11:59 +01:00
James Allen	dbe5331566	Tell other clients when comments are resolved and reopened	2017-01-09 16:09:29 +01:00
Paulo Reis	037389b7dd	Decouple ranges update from the overview panel; integrate it with the dropdown.	2017-01-09 14:59:01 +00:00
James Allen	43f6b9de7c	Inform other clients when we accept a change	2017-01-09 15:54:12 +01:00
Paulo Reis	5e483f2a97	Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes	2017-01-09 14:31:31 +00:00
James Allen	7e33d1a24e	Fix generation of thread id	2017-01-09 15:30:48 +01:00
Paulo Reis	f0ab1fa2d4	Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes	2017-01-09 14:30:40 +00:00
Paulo Reis	4871d56725	Isolate overview panel overrides.	2017-01-09 14:30:29 +00:00
James Allen	9379cff89d	Add end point for accepting change in doc updater	2017-01-09 15:25:27 +01:00
James Allen	a4097b4709	Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes	2017-01-09 10:52:01 +01:00
James Allen	ae30f32481	Use deterministic ids based on a seed	2017-01-09 10:49:03 +01:00
Paulo Reis	0478fcd925	Add comment resolution info.	2017-01-06 15:24:33 +00:00
James Allen	3a5d45fa32	Get user info via web, not chat	2017-01-06 13:41:58 +01:00
James Allen	5155ebaeec	Don't show resolved comments when loading editor	2017-01-05 10:55:16 +01:00
James Allen	898d20a6fc	Fix signature of call to unresolveComment	2017-01-05 10:34:28 +01:00
James Allen	84d9b2aa49	Save resolve and reopened state	2017-01-04 16:26:02 +01:00
James Allen	988005e929	Send and get comments via the chat api	2016-12-16 16:42:41 +00:00
James Allen	5717cafcec	Create comments via comment ops	2016-12-13 17:57:46 +00:00
James Allen	898277b4af	Refactor ops model so it all happens in Document	2016-12-13 17:34:29 +00:00
James Allen	0a6a6c3c28	Keep files ordered in overview panel in the same was as the file tree	2016-12-09 16:17:28 +00:00
James Allen	293ba1fc4c	Fetch all ranges from docstore when viewing overview panel	2016-12-09 15:43:08 +00:00
James Allen	1d426e538f	Load ranges from docupdater and toggle track changes when possible	2016-12-08 14:10:30 +00:00
James Allen	33f6c0dd1b	Jump to position based on offset since we don't know doc lines for unopen docs	2016-11-22 16:34:39 +00:00
James Allen	db93bc8cff	Grey out and add extra info to resolved comments	2016-11-21 17:13:17 +00:00