117 commits

Author	SHA1	Message	Date
James Allen	f840a20f5c	Merge pull request #417 from sharelatex/pr-track-changes-upgrade-prompt ... Turn on track changes for beta users with upgrade prompt	2017-02-13 12:44:04 +01:00
James Allen	47a66eed50	Merge branch 'ja-include-track-changes-feature' into pr-track-changes-upgrade-prompt	2017-02-13 11:50:56 +01:00
James Allen	85c2910738	Don't animate review panel entries on toggle and resize	2017-02-13 09:49:51 +01:00
James Allen	f6743b839f	Reflow review panel as editor pane changes size	2017-02-07 16:45:45 +01:00
James Allen	1b06af766d	Merge pull request #406 from sharelatex/pr-expandable-text-area-fixes ... Expandable text area fixes	2017-02-07 09:04:10 +01:00
James Allen	343abfde23	Use user feature flags to determine track changes state	2017-02-03 14:36:11 +01:00
James Allen	27c48f3790	Clear selection after creating a comment	2017-02-03 14:17:09 +01:00
Paulo Reis	6ef8d2d46d	Merge branch 'master' into pr-expandable-text-area-fixes	2017-02-02 14:38:09 +00:00
Paulo Reis	9d1d2df977	Disable mocked feature flag behaviour.	2017-02-02 12:19:44 +00:00
Paulo Reis	8f9e43f339	Handle track changles toggling when the feature is not enabled.	2017-02-02 12:12:14 +00:00
Paulo Reis	98b98005a6	Create and integrate track changes upgrade prompt.	2017-02-01 16:52:18 +00:00
Paulo Reis	ce89714a48	Emit event when textarea resizes; capture it in the review panel and trigger reflow.	2017-01-26 14:35:01 +00:00
James Allen	76328ff93f	Tell other clients when threads are deleted	2017-01-26 15:12:59 +01:00
James Allen	abb4ef14d8	Streamline the update/rendering process to not do extra work	2017-01-26 15:08:30 +01:00
James Allen	f9ba7392e9	Allow editing/deleting of comments and threads	2017-01-24 16:21:14 +01:00
James Allen	318313d66c	Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes	2017-01-17 16:55:25 +01:00
James Allen	4d15fc30ba	Don't flash resolved comments when editor is loading	2017-01-17 16:55:18 +01:00
James Allen	5a34d17947	Toggle track changes in a project based on the owner's feature switch	2017-01-17 15:59:18 +01:00
Paulo Reis	2f119e5787	Track review features usage.	2017-01-17 14:39:31 +00:00
James Allen	dec9b5bf1e	Use email if name is blank	2017-01-17 15:10:44 +01:00
James Allen	960d1e8b2f	Only call /project/.../threads if we need the threads	2017-01-17 15:04:49 +01:00
James Allen	5fb54d8447	Don't refresh resolved comments every times an entry changes	2017-01-16 16:55:14 +01:00
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