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
Henry Oswald
fed88504f8
rate limit emails sent sharing projects by users
2017-01-14 14:52:32 +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
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
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
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
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
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
072044ee90
Remove thread from view collection; some clean-up.
2017-01-10 11:23:06 +00: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
4e128b6ab7
Send user data in /threads dat
2017-01-09 17:25:06 +01:00
Paulo Reis
1a100b77df
Hide resolved comments from the review panel.
2017-01-09 15:15:03 +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
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