Commit Graph
3986 Commits
Author SHA1 Message Date
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
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
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 14c624614d Update RangesTracker 2017-01-09 10:51:55 +01:00
James Allen ae30f32481 Use deterministic ids based on a seed 2017-01-09 10:49:03 +01:00
Paulo Reis 037b61cbba Further styling. 2017-01-06 17:22:22 +00:00
Paulo Reis 0478fcd925 Add comment resolution info. 2017-01-06 15:24:33 +00:00
James Allen cb24e9390a Fix comments in overview panel 2017-01-06 14:17:57 +01:00
James Allen beb94b0756 Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes 2017-01-06 13:42:08 +01:00
James Allen 3a5d45fa32 Get user info via web, not chat 2017-01-06 13:41:58 +01:00