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
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
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
Paulo Reis
9f008318cc
Emit event after linking the layout directive.
2017-01-12 16:49:29 +00:00
James Allen
b31d086330
Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes
2017-01-12 17:22:18 +01:00
James Allen
2052ee63a3
Recover tracked changes after a disconnect
2017-01-12 17:19:19 +01:00
Paulo Reis
b97ce52c6f
Handle z-index issues with mini review panel.
2017-01-12 14:20:41 +00:00
Brian Gough
a153375688
Merge pull request #391 from sharelatex/bg-syntax-checker-mathmode
...
math mode syntax checking improvements
2017-01-12 14:18:11 +00:00
Brian Gough
df4b5c1b37
math mode syntax checking improvements
...
for beta users
from our ace commit 442a1c522c58b1e511d2fd2c6f03909488d41e60
2017-01-12 13:25:19 +00:00
Shane Kilkelly
d17483fd47
Merge branch 'sk-top-menu-rework'
2017-01-12 13:24: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
Henry Oswald
daee77f052
Merge pull request #387 from sharelatex/pr-email-template-improvements
...
Email template improvements
2017-01-12 12:34:35 +00:00
James Allen
f9b8ada215
track changes for anonymous users
2017-01-12 13:29:57 +01:00
James Allen
0d02b860d9
Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes
2017-01-12 13:08:57 +01:00
Paulo Reis
0b57cc650b
Fix merge mistake; adjust animation timings.
2017-01-12 11:56:04 +00:00
James Allen
64b9fe52dd
Handle deleted users in comments gracefully
2017-01-12 12:31:01 +01: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
ea7f1abb6b
Darken comment reply text area
2017-01-12 12:05:50 +01:00
James Allen
6cd8e2a935
Add user data to comments correctly
2017-01-12 12:05:35 +01:00
James Allen
e7ab92b7c9
Only show users controls they have permission to use
2017-01-12 11:52:39 +01:00
James Allen
953371ad2d
Don't double track a reject
2017-01-12 10:59:16 +01:00
Shane Kilkelly
5c25d15a18
WIP: try switch to rolling rate limiter
2017-01-12 09:25:18 +00:00
James Allen
0264efccae
Don't let review panel entries go off the top of the screen
2017-01-11 14:57:00 +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
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
Shane Kilkelly
411cb4330c
Fix typo in hyperlink
2017-01-11 10:39:34 +00:00
Shane Kilkelly
731f280e2e
Move auth parts of top menu out of config and into web templates.
...
Move the remaining configuration into a new config var: `nav.header_extras`.
Add a `nav.showSubscriptionLink` var to control visibility of subscription link
in the Account menu.
This will allow admins to more easily configure extra links in the top
navigation bar, without the danger of overwriting the important auth menus.
2017-01-11 10:27:38 +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
Shane Kilkelly
f5ced03074
Set redirect when sending user to login page.
...
Allows smart redirecting to work when public access is turned off.
2017-01-10 15:42:36 +00:00
James Allen
f31fa98679
Sync track changes state between sessions and client
2017-01-10 16:11:12 +01:00
Shane Kilkelly
f3af44fab0
add on-success and on-error handlers to async-form.
2017-01-10 14:46:09 +00: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
5bd49c08f8
Simpler resolved comments dropdown data structure.
2017-01-10 12:16:58 +00: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
7ae33041b5
Don't enter infinite loop generating id
2017-01-10 11:58:55 +01: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
