Commit graph

297 commits

Author SHA1 Message Date
Paulo Reis
a6108480f5 Add directive to show change entries. 2017-05-31 14:47:25 +01:00
Paulo Reis
8dfb91fa6f Blur toggler after clicking. 2017-05-22 11:11:26 +01:00
Paulo Reis
58ad62c413 Relayout entries when commenting. 2017-05-19 16:57:51 +01:00
Paulo Reis
15980d5427 Merge branch 'master' into pr-hide-review-panel 2017-05-19 15:31:14 +01:00
Paulo Reis
957b201fc1 Add commenting and track-changes keyboard shortcuts. 2017-05-19 15:28:49 +01:00
Paulo Reis
7f3c0ed5ac Refactor accept and reject methods to support multiple changes; support bulk actions events. 2017-05-16 14:27:06 +01:00
Paulo Reis
36b4a8e6c2 Update ranges tracker. 2017-05-16 14:04:13 +01:00
Paulo Reis
ac99422c26 Update ranges tracker. 2017-05-16 14:04:06 +01:00
Paulo Reis
a3c529d23f Update range tracker with new bulk method. 2017-05-16 14:03:52 +01:00
Paulo Reis
7bb5d65b52 Update ranges tracker. 2017-05-15 11:11:28 +01:00
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
658e70a772 Update ranges tracker. 2017-05-11 11:32:12 +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
03b8b72520 Update range tracker with new bulk method. 2017-05-08 16:10:08 +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
e2eaf6619e Bulk actions directive; include it in the review panel. 2017-05-02 16:15:40 +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
James Allen
477278eea5 Merge pull request #476 from sharelatex/ja-use-new-comment-button
Fix on the new comment button variation
2017-04-05 11:08:59 +01:00
James Allen
ce59307c91 Merge pull request #475 from sharelatex/ja-scroll-overflow-in-review-panel
Allow scrolling in the review panel to extend outside of top of text …
2017-04-05 11:08:49 +01:00
Paulo Reis
7855afa0cd Remove unused scope binding. 2017-04-04 10:48:31 +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
2fa909c707 Allow scrolling in the review panel to extend outside of top of text like Ace 2017-04-03 16:46:36 +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
James Allen
e705118dfe Merge pull request #457 from sharelatex/pr-new-add-comment-btn
New "add comment" button
2017-03-21 13:15:03 +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
8951e91e31 Remove add comment button from the mini review panel. 2017-03-20 11:35:35 +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
James Allen
6c1a15a698 Move comments when cutting and pasting 2017-03-16 15:48:57 +00:00
James Allen
fb91219661 Don't submit comment on clicking cancel 2017-03-08 11:38:28 +00:00
James Allen
dd0271e799 Only cancel deletes with inserts on undo and reject 2017-02-24 14:20:26 +01:00
James Allen
f4bbd8ea10 Use dirty state rather events to avoid O(N^2) behaviour 2017-02-23 11:27:19 +01:00
Paulo Reis
96c44eec38 Support values other than objects in the numKeys filter, returning zero if so. 2017-02-21 14:48: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
2e8f917318 Support initial closed state. 2017-02-21 14:27:57 +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
f1baa1b8ad Merge pull request #432 from sharelatex/ja-hide-offscreen-review-panel-entries
Only render the entries that are visible in the text
2017-02-21 10:28:45 +01:00
James Allen
f466be96dd Make sure first change isn't hidden under toolbar 2017-02-21 09:58:49 +01:00
James Allen
3af7cdf0a9 Merge branch 'ja-scroll-review-panel-past-ace' into ja-hide-offscreen-review-panel-entries 2017-02-20 16:24:26 +01:00
James Allen
ad05cc288c Do DOM reads first to prevent thrashing 2017-02-20 16:22:18 +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
1e66c46ca7 Add filter to retrieve number of keys in objects. 2017-02-17 14:31:50 +00:00
Paulo Reis
cd2c8e7199 Add directive based on jQuery animation API. 2017-02-17 11:54:33 +00:00
Paulo Reis
0841ab8278 Add directive to collapse elements via height. 2017-02-17 11:24:21 +00:00
James Allen
31ae2e7124 Update RangesTracker 2017-02-17 09:24:25 +01:00
James Allen
c8a6555cb1 Update RangesTracker 2017-02-16 17:07:56 +01:00
Paulo Reis
a639f13cb6 Bootstrap collapsing behavior in files list. Store state. 2017-02-16 15:48:58 +00:00
Paulo Reis
badc4ecb7a Show add comment tooltip to the left when appropriate. 2017-02-14 14:40:21 +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
f50967295d Support disabling the review-panel toggle, like a standard checkbox. 2017-02-02 12:08:17 +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
James Allen
ca11f5fa18 Merge pull request #400 from sharelatex/ja-goto-code-from-rp
Jump to code when clicking on review panel entries
2017-01-31 10:49:13 +01:00
James Allen
9663df3457 Jump to text when clicking change icon as well 2017-01-30 16:00:32 +01:00
Paulo Reis
15ad3f4769 Avoid stopping propagation, check event target instead. 2017-01-26 16:11:02 +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
2813b16ebf Use thread id for comment id 2017-01-23 09:45:37 +01:00
Paulo Reis
2589ac7d58 Remove unneeded review panel layout event. 2017-01-18 10:55:51 +00:00
Paulo Reis
49fe8ef3a3 Update entry truncating logic while typing. 2017-01-18 10:53:59 +00: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