 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 |
|
|
Paulo Reis
|
42585085c0
|
Integrate new directive, plumb data into it. More styling.
|
2017-01-06 12:00:17 +00:00 |
|
|
Paulo Reis
|
f2e6e69df6
|
Add an entry directive for resolved comments, with file and quoted text.
|
2017-01-06 11:59:49 +00:00 |
|
|
Henry Oswald
|
0b67265eb6
|
use admin email for closed site
|
2017-01-06 11:32:57 +00:00 |
|
|
Henry Oswald
|
84ce2d0e14
|
change default nav to use translations for login and register
|
2017-01-06 11:00:21 +00:00 |
|
|
Paulo Reis
|
a1435d13a3
|
Basic structure for the resolved comments dropdown.
|
2017-01-05 17:15:27 +00:00 |
|
|
Henry Oswald
|
862e15b842
|
log out user id and anonymous when loading editor
|
2017-01-05 15:02:10 +00:00 |
|
|
Paulo Reis
|
22db36d21b
|
Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes
|
2017-01-05 11:51:00 +00:00 |
|
|
Paulo Reis
|
d13035a4f4
|
Simpler UI for comments; remove some unused code.
|
2017-01-05 11:50:43 +00:00 |
|
|
James Allen
|
5155ebaeec
|
Don't show resolved comments when loading editor
|
2017-01-05 10:55:16 +01:00 |
|
|
James Allen
|
898d20a6fc
|
Fix signature of call to unresolveComment
|
2017-01-05 10:34:28 +01:00 |
|
|
Paulo Reis
|
1599c41670
|
Sizing adjustments.
|
2017-01-04 15:34:24 +00:00 |
|
|
James Allen
|
60152e219b
|
Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes
|
2017-01-04 16:26:08 +01:00 |
|
|
James Allen
|
84d9b2aa49
|
Save resolve and reopened state
|
2017-01-04 16:26:02 +01:00 |
|
|
Paulo Reis
|
fdafcf9677
|
Restyle insertions and deletions - increasing info density.
|
2017-01-04 15:24:49 +00:00 |
|
|
Shane Kilkelly
|
7bbbfe20b9
|
If external auth is used, remove /register items from header nav.
(logic moved from docker-image settings file)
|
2016-12-21 13:50:13 +00:00 |
|
|
Shane Kilkelly
|
64f69069b2
|
Experimental: upgrade to node 6.9.2 (latest LTS release)
|
2016-12-21 10:23:42 +00:00 |
|
|
Henry Oswald
|
bcf9a17fb3
|
Merge branch 'master' into node-4.2
|
2016-12-20 15:23:02 +00:00 |
|
|
Shane Kilkelly
|
259c589076
|
Add option to restrict invites to existing user accounts.
|
2016-12-20 09:54:42 +00:00 |
|
|
Shane Kilkelly
|
822f76a883
|
Add unit tests for RedisWrapper
|
2016-12-19 15:12:22 +00:00 |
|