208 commits

Author	SHA1	Message	Date
Paulo Reis	82a19444b3	Merge branch 'master' into pr-bulk-actions	2017-05-15 10:29:15 +01:00
Paulo Reis	dd85c2fab2	Remove debug line.	2017-05-12 15:44:49 +01:00
Paulo Reis	f2dac28a65	Consolidate some watchers.	2017-05-11 10:23:41 +01:00
Paulo Reis	a3ab994ab3	Use the same watcher to control miniRP visibility and trigger Ace resizing.	2017-05-11 10:17:25 +01:00
Paulo Reis	8aee0edfe8	Integrate bulk actions dialog with controller actions.	2017-05-09 16:06:34 +01:00
Paulo Reis	f3e020df7e	Add dialog to confirm bulk actions.	2017-05-09 16:06:19 +01:00
Paulo Reis	499272cbb5	Use new range-tracker method.	2017-05-08 16:12:21 +01:00
Paulo Reis	3ced808411	Use a single accept changes method.	2017-05-05 15:19:31 +01:00
Paulo Reis	f25db3ff64	Reflect accepted changes on the UI layer.	2017-05-04 15:47:25 +01:00
Paulo Reis	19828d3c5b	Basic bulk accept support.	2017-05-04 15:33:47 +01:00
Paulo Reis	dae66d5edf	Add bulk methods in controller.	2017-05-03 17:16:29 +01:00
Paulo Reis	05d9bf47d1	Use entry ids instead.	2017-05-03 16:53:04 +01:00
Paulo Reis	bf7bf701ed	Store selected entries; improve visibility logic.	2017-05-03 16:35:58 +01:00
Paulo Reis	722d75f6ef	Correctly check if deletions are within selection.	2017-05-02 17:08:41 +01:00
Paulo Reis	3f441ff38c	Count entries within selection; only show bulk actions if there are selected entries.	2017-05-02 17:02:30 +01:00
Paulo Reis	76ea497b33	Use a single entry for bulk actions.	2017-05-02 15:43:45 +01:00
Paulo Reis	d874eb70f8	Add and remove bulk accept and reject entries with selections.	2017-05-02 15:34:05 +01:00
Paulo Reis	15de552c2c	Make new add comment button styles as the default; removed old add comment button code.	2017-04-04 10:40:53 +01:00
James Allen	567edbfb31	Fix on the new comment button variation	2017-04-03 17:11:33 +01:00
James Allen	efac6b70f4	Merge pull request #468 from sharelatex/ja-allow-overlapping-comments ... Allo overlapping comments	2017-04-03 14:04:14 +01:00
Paulo Reis	855d37289b	Use ISO strings instead of of date type in locally resolved comments.	2017-03-31 14:29:28 +01:00
James Allen	4c8ce65ce7	Allo overlapping comments	2017-03-28 16:50:30 +01:00
Paulo Reis	93934b9c8f	Use deploy date.	2017-03-27 09:32:02 +01:00
Paulo Reis	c72ee95177	Refactor AB test participation code; add conversion code.	2017-03-23 15:00:43 +00:00
Paulo Reis	254e4953cb	Wire-up AB test for adding comments.	2017-03-23 12:26:21 +00:00
Paulo Reis	a35f2585c7	Remove unused flag.	2017-03-20 14:02:25 +00:00
Paulo Reis	0e24d7118d	Hide new UI behind query string parameter.	2017-03-20 13:56:36 +00:00
Paulo Reis	2c2abc3cae	Wire up new button with existing UI for adding comments.	2017-03-20 11:18:29 +00:00
Paulo Reis	beac43741c	New add comment button.	2017-03-17 17:05:38 +00:00
Paulo Reis	c74449b2e3	Don't show the mini review panel when the only visible entry is the add comment one.	2017-03-17 16:28:21 +00:00
Paulo Reis	7f6941677d	Check local storage on load; use explicit condition syntax.	2017-02-21 14:43:05 +00:00
Paulo Reis	5c7fc66964	Merge branch 'pr-collapse-overview-entries' of github.com:sharelatex/web-sharelatex into pr-collapse-overview-entries	2017-02-21 14:21:10 +00:00
Paulo Reis	33c8bc8684	Support saving state to local storage.	2017-02-21 14:20:51 +00:00
James Allen	00fce4d2da	Merge branch 'master' into pr-collapse-overview-entries	2017-02-21 14:25:45 +01:00
James Allen	8c5800ceaf	Only render the entries that are visible in the text	2017-02-20 16:03:02 +01:00
James Allen	995fa6122b	Scroll the review panel past the limits of Ace	2017-02-20 12:56:26 +01:00
Paulo Reis	a639f13cb6	Bootstrap collapsing behavior in files list. Store state.	2017-02-16 15:48:58 +00:00
James Allen	b48f57c2cb	Submit comment on blur or selection change	2017-02-14 13:41:04 +01:00
James Allen	61ef158f76	Don't show review panel if user doesn't have track changes	2017-02-14 09:38:58 +01:00
James Allen	bf5f5f832d	Use correct flag for determining mini panel visibility	2017-02-13 14:39:43 +01:00
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	fe33fa1f65	Add modal controller.	2017-02-02 10:19:00 +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
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