Commit graph

792 commits

Author SHA1 Message Date
Alasdair Smith
e02c3bbb09 Remove beta program badge 2017-10-16 10:27:33 +01:00
Shane Kilkelly
ee29cb45d2 Translations for the new link-sharin (token access) feature 2017-10-13 13:57:11 +01:00
Brian Gough
45ed090326 Merge pull request #37 from sharelatex/bg-rate-limit-autocompile
rate limit autocompile (connects to #18)
2017-10-12 09:25:59 +01:00
Brian Gough
ea89638010 rename autocompile_disabled to autoCompileDisabled
for consistency
2017-10-09 15:21:01 +01:00
Shane Kilkelly
1500976226 Add temporary text to share modal 2017-10-05 14:47:50 +01:00
Alasdair Smith
550e7d75ca Check if user is part of autocompile rollout when showing setting or running autocompile 2017-10-03 17:19:51 +01:00
Brian Gough
2723537f82 disable autocompile when rate limit is hit 2017-10-03 16:23:49 +01:00
Paulo Jorge Reis
05f9e9b2c1 Merge pull request #27 from sharelatex/as-autocompile-onboarding
Autocompile onboarding
2017-10-03 11:09:51 +01:00
Alasdair Smith
a3800a321b Add beta program badge on autocompile popover & setting 2017-10-02 14:12:18 +01:00
Alasdair Smith
a69afae03d Remove unnecessary arrow elem 2017-10-02 13:49:28 +01:00
Alasdair Smith
a4fa713f38 Fix typo 2017-09-29 11:18:44 +01:00
Shane Kilkelly
e04d10d11f Styling of link-share, and fix read-only link 2017-09-29 10:59:30 +01:00
Alasdair Smith
ab7d83b1c5 Switch to translations 2017-09-29 10:59:01 +01:00
Alasdair Smith
dd7e6f0612 Make class names more consistent & switch to JS targeting through id 2017-09-29 10:49:45 +01:00
Shane Kilkelly
df338ebd6d Show tokens in share modal 2017-09-29 10:11:23 +01:00
Shane Kilkelly
9810f63245 Render editor for token access, stub out ui changes 2017-09-28 16:06:08 +01:00
Brian Gough
c50f309b09 add missing whitespace in pdf.pug 2017-09-28 15:12:37 +01:00
Alasdair Smith
d9af9e723b Clean up popover wrapper 2017-09-28 12:12:48 +01:00
Alasdair Smith
2d5a61f5b6 Determine placement of popover based on width of pdf panel 2017-09-28 11:32:38 +01:00
Alasdair Smith
fcc2db9ea7 Use width of button instead of hardcoded 2017-09-28 11:13:49 +01:00
Alasdair Smith
7e407621e9 Position onboarding popover after measuring position 2017-09-28 11:13:49 +01:00
Alasdair Smith
3259b871c0 Dismiss autocompile onboarding 2017-09-28 11:13:49 +01:00
Alasdair Smith
9386ddf4a9 Only show autocompile onboarding when first manual compile is run 2017-09-28 11:13:49 +01:00
Alasdair Smith
316cf07225 Add AutoCompileOnboardingController 2017-09-28 11:13:49 +01:00
Alasdair Smith
8d2a451b44 First pass at autocompile onboarding popover 2017-09-28 11:13:49 +01:00
Brian Gough
0f855689a7 show error for compile in progress 2017-09-26 08:07:35 +01:00
Alasdair Smith
66bed67270 Merge pull request #4 from sharelatex/as-client-auto-compile
Client-side auto compile
2017-09-19 15:20:07 +01:00
Alasdair Smith
320466a4f7 Catch invalid email address and show specific error message 2017-09-06 13:47:45 +01:00
Alasdair Smith
79566a9214 Prevent autocomplete on suggestions that don't match
The behaviour of the ngTagsInput directive is somewhat counter-intuitive -
typing part of a suggested email will appear as though it matches but pressing
enter will not input the suggestion, but the current typed value.

Disabling add on enter will still allow enter to select the selection, but
prevents selection of the partially typed email/name.
2017-09-06 11:39:30 +01:00
Alasdair Smith
32b849faf7 Use translations 2017-09-05 14:57:06 +01:00
Alasdair Smith
42ae7a6479 Only show auto compile option for beta program users 2017-09-05 14:57:06 +01:00
Alasdair Smith
cca7f55322 Add autocompile setting 2017-09-05 14:57:06 +01:00
Alasdair Smith
9f1adfd0c0 Replace separate autocompile ctrl with listener in PdfController 2017-09-05 14:57:06 +01:00
Alasdair Smith
dab799a81b First pass at auto compile ctrl 2017-09-05 14:57:06 +01:00
James Allen
7538c8834f Merge branch 'master' into ja-per-user-track-changes 2017-08-09 14:05:36 +02:00
Shane Kilkelly
05c5b4f9c5 Merge branch 'master' into sk-fully-hide-trackchanges 2017-08-03 15:20:20 +01:00
Shane Kilkelly
670d4438dc If track-changes is not enabled, don't show hotkeys for it. 2017-08-03 15:16:54 +01:00
Paulo Reis
fbce49f5cd Merge branch 'master' into ja-per-user-track-changes 2017-08-01 10:56:02 +01:00
Paulo Reis
4849c705de Optionally ask the translate local method to HTML encode; use it in the problematic tooltip. 2017-07-28 17:31:28 +01:00
Paulo Reis
0c28c6cc3a Add translation keys. 2017-07-07 10:38:13 +01:00
Paulo Reis
6cfa10d511 Add a per-user TC notice dialog. 2017-07-07 10:38:13 +01:00
Paulo Reis
8925dc5a78 Revert "Show simpler UI when there is only one user."
This reverts commit 48300bd5b2ef01651e64dad3183e65d5d5798955.
2017-07-07 10:38:13 +01:00
Paulo Reis
dae5381af7 Show simpler UI when there is only one user. 2017-07-07 10:38:13 +01:00
Paulo Reis
139c2ab1fd Consolidate members list. 2017-07-07 10:38:13 +01:00
Paulo Reis
e421b6550a Filter out read-only users from TC users list. 2017-07-07 10:38:13 +01:00
Paulo Reis
bc88dbd0f8 Handle read-only permissions; allow read-only users to see state but not change it. 2017-07-07 10:38:13 +01:00
Paulo Reis
71e0a6935f Readd feature flag handling. 2017-07-07 10:38:13 +01:00
Paulo Reis
7bf203c77f Styling. 2017-07-07 10:38:13 +01:00
Paulo Reis
e7dd4874ad Add collapse state indicator. 2017-07-07 10:38:13 +01:00
Paulo Reis
8e6265e3d2 Enable global setting. 2017-07-07 10:38:13 +01:00
Paulo Reis
1ae53a243a Correctly fetch users from project info. 2017-07-07 10:38:13 +01:00
Paulo Reis
f4bdd5eb2b Control sync state with server. 2017-07-07 10:38:13 +01:00
Paulo Reis
0ac52e7f19 Disable individual users TC control when TC is on for everyone; add styling for disabled toggles. 2017-07-07 10:38:13 +01:00
Paulo Reis
1fa7338baf Wire up TC widget to controller methods. 2017-07-07 10:38:13 +01:00
Paulo Reis
dc2085c6e1 Basic widget for toggling TC state. 2017-07-07 10:38:13 +01:00
James Allen
710c89a629 Support per user track changes (proof of concept) 2017-07-07 10:38:13 +01:00
Shane Kilkelly
04c94760f5 Merge branch 'sk-auto-pair-braces' into sk-ac-improvements-integration 2017-07-06 14:39:28 +01:00
Shane Kilkelly
009cadb8b8 Change translation for autoPairDelimiters setting 2017-07-06 14:32:30 +01:00
Shane Kilkelly
34b2012727 Enable (optional) auto-pairing for latex mode 2017-07-06 11:06:51 +01:00
Paulo Reis
ddee75e479 Use a getterSetter to manage int values in settings. 2017-06-20 17:08:53 +01:00
Shane Kilkelly
9607174b64 Merge branch 'master' into sk-server-side-labels-loading 2017-06-15 08:49:14 +01:00
Shane Kilkelly
5e37b1dac1 Move logic for selectively loading labels.
Only load labels if the user has write permission
2017-06-14 13:26:02 +01:00
Shane Kilkelly
3b066758bb Don't load labels for anonymous/read-only users 2017-06-13 14:06:00 +01:00
Shane Kilkelly
234a2d0e21 Remove cruft 2017-06-12 11:37:34 +01:00
Shane Kilkelly
5443b92e7d Move state management into LabelsMaster on the ide 2017-06-09 11:28:27 +01:00
Shane Kilkelly
c7dbd21cd1 use flag on aceEditor to enable autocomplete features 2017-06-08 09:22:08 +01:00
Paulo Reis
19ecffd654 Merge branch 'master' into pr-aggregate-insert-delete 2017-06-06 17:04:31 +01:00
Paulo Reis
34796b18c5 Add translation keys. 2017-06-06 16:46:36 +01:00
Paulo Reis
e616a62d68 Save entry ids inside entry object, not only as the key. 2017-06-05 16:29:55 +01:00
James Allen
d7981fd2d4 Merge pull request #512 from sharelatex/ja-project-name-validation
Refactor project name validation into one place and restrict /s
2017-06-05 11:55:39 +01:00
Paulo Reis
d4ac91f75e Use correct handlers in directives. 2017-06-05 10:52:11 +01:00
Paulo Reis
e2edf4184f Explicit naming. 2017-06-02 11:43:43 +01:00
Paulo Reis
2a0454f2f1 Integrate aggregate changes with bulk actions. 2017-06-01 15:18:43 +01:00
Paulo Reis
1490ea7b04 Change aggregated change model: the main change is now the insertion, deletion is stored in metadata. 2017-06-01 15:03:37 +01:00
Paulo Reis
11c0644490 Aggregate changes; make accept and reject work. 2017-06-01 11:47:55 +01:00
Paulo Reis
b6cef2e3d7 Include directive; add some styling. 2017-05-31 15:53:14 +01:00
Paulo Reis
8dfb91fa6f Blur toggler after clicking. 2017-05-22 11:11:26 +01:00
James Allen
ba62206b91 Refactor project name validation into one place and restrict /s 2017-05-19 17:42:24 +01:00
Paulo Reis
914e50f3f6 Add new review-related hotkeys; re-arrange hotkeys modal. 2017-05-19 15:52:04 +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
832764dd3d Add key shortcut to toggle the review panel. 2017-05-18 11:02:50 +01:00
Paulo Reis
5a9519d18f Add a toggler element inside the review panel. 2017-05-17 16:41:53 +01:00
Paulo Reis
82a19444b3 Merge branch 'master' into pr-bulk-actions 2017-05-15 10:29:15 +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
f3e020df7e Add dialog to confirm bulk actions. 2017-05-09 16:06:19 +01:00
Paulo Reis
6662ec34ae Only show bulk actions when n changes > 1. 2017-05-04 11:30:05 +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
0249a13012 Add bulk actions as in-editor widgets. 2017-05-03 11:41:17 +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
Paulo Reis
bca916d504 Use header button classes in the PDF button. 2017-05-01 15:04:08 +01:00
Henry Oswald
c733925a26 show rate limit message when compiled too much 2017-04-24 15:56:09 +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
6b03e4b2a1 Merge pull request #470 from sharelatex/pr-fix-high-cpu-firefox
Set video source only when the onboarding prompt is shown.
2017-04-03 14:04:27 +01:00
Paulo Reis
6b9b8480a8 Only show the tooltip if the project name is truncated. 2017-03-31 16:36:58 +01:00
Paulo Reis
5b8c36dfc0 Add a project name tooltip. 2017-03-31 16:13:23 +01:00
Paulo Reis
250d19163b Set video source only when the onboarding prompt is shown. 2017-03-30 10:35:16 +01:00
Paulo Reis
78e8a8319d Put review panel widgets container inside the review panel element; rearrange visibility logic. 2017-03-24 14:04:37 +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
James Allen
8f434cdd8b Merge commit 'ab16aa9' 2017-03-09 11:36:22 +00:00
James Allen
eb30c46458 Turn on track changes for everyone and take out of beta 2017-03-08 11:58:16 +00:00
James Allen
fb91219661 Don't submit comment on clicking cancel 2017-03-08 11:38:28 +00:00
James Allen
e83c7dfe05 Merge pull request #429 from sharelatex/pr-collapse-overview-entries
Collapse overview entries
2017-02-22 13:45:23 +01:00
Paulo Reis
519cd3c0bd Avoid showing files in overview if the associated review entries object is still undefined. 2017-02-21 15:20:00 +00:00
James Allen
1b6cbdba1b Merge pull request #428 from sharelatex/ja-translate-track-changes
Translate track changes
2017-02-21 15:10:47 +01:00
James Allen
00fce4d2da Merge branch 'master' into pr-collapse-overview-entries 2017-02-21 14:25:45 +01:00
James Allen
53a127cc65 Make consistent with file tree 2017-02-21 14:25:26 +01:00
James Allen
2553dfbf82 Translate placeholders 2017-02-21 14:19:46 +01:00
Paulo Reis
0b7863185c Make expand/collapse indicator consistent with the one used in filetree. 2017-02-21 11:05:55 +00:00
James Allen
8c5800ceaf Only render the entries that are visible in the text 2017-02-20 16:03:02 +01:00
James Allen
637cfa2e18 Translate tooltips 2017-02-20 11:51:06 +01:00
James Allen
44377ed03c Fix typo 2017-02-17 16:37:49 +01:00
James Allen
71b13b3f43 Fix translation string 2017-02-17 16:30:06 +01:00
James Allen
f180b25850 Convert track changes text to translation strings 2017-02-17 16:28:53 +01:00
Paulo Reis
121b783b4a Show number of entries per file, when collapsed. 2017-02-17 14:32:06 +00:00
Paulo Reis
1f92a494e7 Remove unneeded CSS animation. 2017-02-17 11:55:20 +00:00
Paulo Reis
0841ab8278 Add directive to collapse elements via height. 2017-02-17 11:24:21 +00:00
Henry Oswald
debe78030a use html from jade as strings now fully html escaped 2017-02-17 11:05:32 +00:00
James Allen
04b9f8d249 Merge branch 'master' into ja-track-changes 2017-02-16 17:07:12 +01:00
Paulo Reis
a639f13cb6 Bootstrap collapsing behavior in files list. Store state. 2017-02-16 15:48:58 +00:00
Henry Oswald
5626be2913 change free trial from track changes to real-time-track-changes, conflict with old event 2017-02-15 12:39:29 +00:00
James Allen
d01d6a35cf Only create Controller when showing onboarding 2017-02-15 09:47:37 +01:00
Paulo Reis
badc4ecb7a Show add comment tooltip to the left when appropriate. 2017-02-14 14:40:21 +00:00
James Allen
03ceb23fcf Update wording slightly 2017-02-14 15:23:02 +01:00
James Allen
4dbc2c3066 Merge pull request #418 from sharelatex/pr-review-panel-onboarding
Pr review panel onboarding
2017-02-14 15:00:39 +01:00
James Allen
bb3589ab2d Merge pull request #420 from sharelatex/ja-track-changes
List track changes in beta program
2017-02-14 14:41:57 +01:00
James Allen
b48f57c2cb Submit comment on blur or selection change 2017-02-14 13:41:04 +01:00
Paulo Reis
594f2024d1 Style the onboarding prompt as a modal; close it when clicked outside. 2017-02-14 12:09:05 +00:00
James Allen
cc0986b4da List track changes in beta program 2017-02-14 12:22:53 +01:00
James Allen
3f2ebbcf91 Show message asking owner to upgrade if user is not owner 2017-02-14 11:18:22 +01:00
James Allen
c08c8e09ff Only show onboarding for users with track changes enabled 2017-02-14 11:09:37 +01:00
James Allen
c8baae84da Merge branch 'pr-review-panel-onboarding' of github.com:sharelatex/web-sharelatex into pr-review-panel-onboarding 2017-02-13 16:51:16 +01:00
Paulo Reis
7dd9a3fa44 Add a dismiss button. 2017-02-13 15:49:58 +00:00
James Allen
6a4f0ace3b Merge branch 'master' into pr-review-panel-onboarding 2017-02-13 16:19:56 +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
d7c40fa6ef Run comments through same URL linking filter as chat 2017-02-13 10:05:48 +01:00
Paulo Reis
faef71d812 Wording. 2017-02-10 15:28:44 +00:00
Paulo Reis
a8a7589973 More style adjustments. 2017-02-09 17:13:23 +00:00
Paulo Reis
dd15cc06a0 Integrate playback state directive in tutorial videos; style adjustments. 2017-02-09 15:44:38 +00:00
Paulo Reis
d137b00822 Relayout the onboarding, making a video slideshow. 2017-02-08 17:19:29 +00:00
Paulo Reis
d792230bf0 Basic onboarding tutorial for track-changes. 2017-02-07 15:07:26 +00:00
Paulo Reis
31102d30da Update prompt title. 2017-02-06 12:24:20 +00:00
James Allen
343abfde23 Use user feature flags to determine track changes state 2017-02-03 14:36:11 +01: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
Shane Kilkelly
b0dd7475b0 fix pug syntax 2017-01-31 14:57:22 +00:00
Shane Kilkelly
83d0f26011 Merge branch 'master' into sk-pug 2017-01-31 10:18:53 +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
Shane Kilkelly
4e9426e6bf Merge branch 'master' into sk-pug 2017-01-30 14:36:10 +00:00
Paulo Reis
15ad3f4769 Avoid stopping propagation, check event target instead. 2017-01-26 16:11:02 +00:00
James Allen
0479b01b9d Jump to code when clicking on review panel entries 2017-01-26 16:04:08 +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
32b0c6a4fb Merge pull request #398 from sharelatex/ja-track-changes
Fix style issues in IE 10
2017-01-25 15:55:15 +01:00
Paulo Reis
a924794a5a Add expandable text area directive; apply it to review panel text areas. 2017-01-25 13:51:33 +00:00
James Allen
59c40ea5cc Only show delete options when thread has more than one message! 2017-01-24 17:03:32 +01:00
James Allen
798e09f011 Don't show 'no comments' when submitting 2017-01-24 16:56:08 +01:00
James Allen
f9ba7392e9 Allow editing/deleting of comments and threads 2017-01-24 16:21:14 +01:00
Shane Kilkelly
57cd54bf55 WIP: migrate from jade to pug 2017-01-20 12:03:02 +00:00
Paulo Reis
76ea469970 Reposition the track-changes indicator element to avoid issues with IE positioning. 2017-01-19 12:12:34 +00:00
Paulo Reis
5489514d7a Add some compatibility style rules for IE10. 2017-01-18 15:38:34 +00:00
James Allen
f97d36eb73 Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes 2017-01-18 14:07:29 +01:00
Paulo Reis
329c6af168 Add a track-changes indicator in the editor, for when the review panel is closed. 2017-01-17 17:20:51 +00:00
James Allen
786c92b2fc Don't show delete comment button (until it works) 2017-01-17 17:34:11 +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
James Allen
960d1e8b2f Only call /project/.../threads if we need the threads 2017-01-17 15:04:49 +01:00
James Allen
9c0bf885be Merge branch 'master' into ja-track-changes 2017-01-17 10:16:41 +01:00
Paulo Reis
36f15ff56e Avoid empty comment submission. 2017-01-16 17:14:06 +00:00
Paulo Reis
121629426e Avoid empty comment replies. 2017-01-16 17:06:57 +00:00
James Allen
bf56952f88 Make overview panel entries jump to place in doc again 2017-01-16 15:31:51 +01:00
James Allen
d4f60977fd Add loading indicator while submitting new comments 2017-01-16 15:25:10 +01:00
James Allen
e5c96eb619 Focus on text area when adding a comment 2017-01-16 15:17:56 +01:00
James Allen
278bfc1f50 Use 'show all' instead of 'more' 2017-01-16 15:06:47 +01:00
Shane Kilkelly
82ddeab2bd If user tries to invite themselves to project, don't. 2017-01-16 13:45:01 +00:00
Paulo Reis
3968761ac8 Add collapsing behaviour to resolved comments. 2017-01-13 15:37:24 +00:00
Paulo Reis
5eece9f5d9 Add collapsing behaviour to long entries. 2017-01-13 15:30:31 +00: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
aab4dea8ae Merge branch 'master' into ja-track-changes 2017-01-13 13:46:01 +01:00
Paulo Reis
823c2c854a Add styling to have left-based layout when there is no space on the right. 2017-01-12 17:06:08 +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
a42cc48be8 Fix doc names and sort order in resolved comments dropdown 2017-01-12 13:44:54 +01:00
James Allen
8e0c2ff0b3 Adjust resolved comments buttons and add tooltip 2017-01-12 13:37:44 +01:00
Paulo Reis
0b57cc650b Fix merge mistake; adjust animation timings. 2017-01-12 11:56:04 +00:00
Paulo Reis
88b694f894 Animate comment resolving. 2017-01-12 11:25:36 +00:00
James Allen
9a867438b2 Always show user name next to comment 2017-01-12 12:06:02 +01:00
James Allen
e7ab92b7c9 Only show users controls they have permission to use 2017-01-12 11:52:39 +01:00
Paulo Reis
d701c1ef5e Make the dropdown scrollable. 2017-01-11 11:25:18 +00: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