Shane Kilkelly
|
e2f4fc3653
|
Merge branch 'master' into sk-rate-limit-cluster
|
2017-01-25 10:52:34 +00:00 |
|
Henry Oswald
|
3eb13ccdd1
|
fix stupid mistake
|
2017-01-25 10:38:39 +00:00 |
|
Henry Oswald
|
2a00b9c7a2
|
use user._id for error log
|
2017-01-25 10:33:30 +00:00 |
|
Shane Kilkelly
|
239164fe26
|
Merge branch 'master' into sk-rate-limit-cluster
|
2017-01-25 09:56:08 +00:00 |
|
Henry Oswald
|
cc717f0357
|
domainAnnouncementsToShow -> domainAnnouncements
|
2017-01-25 09:44:13 +00:00 |
|
Henry Oswald
|
02e6eb4dd1
|
Merge pull request #399 from sharelatex/ho-promote-case-study
promote domain alerts
|
2017-01-25 09:41:50 +00:00 |
|
Henry Oswald
|
1280a2313d
|
add check for id to exist in domain announcments
null check user at start of getUnreadAnnouncements
fix spelling mistake
|
2017-01-25 09:35:11 +00:00 |
|
Henry Oswald
|
69ab275404
|
Update list.jade
|
2017-01-25 09:14:21 +00:00 |
|
Henry Oswald
|
13d21b881f
|
use new annoncments feature for case study info
|
2017-01-24 16:03:05 +00:00 |
|
Henry Oswald
|
2341a8481a
|
Merge branch 'master' into ho-promote-case-study
|
2017-01-24 14:49:35 +00:00 |
|
Shane Kilkelly
|
a148eb1f43
|
Merge branch 'master' into sk-rate-limit-cluster
|
2017-01-24 09:24:47 +00:00 |
|
Henry Oswald
|
9153ffac41
|
limit project name in email to 40 chars
|
2017-01-21 12:58:16 +00:00 |
|
Henry Oswald
|
74240e28c7
|
rate limit via ip the number of invite to project requests
|
2017-01-21 12:44:09 +00:00 |
|
Henry Oswald
|
6d35585847
|
limit number of invites each user can do
done with the number of collaborators a user can add
prevents notifications getting filled up as well
|
2017-01-21 12:43:15 +00:00 |
|
Shane Kilkelly
|
cfa2777d62
|
Merge branch 'sk-launchpad'
|
2017-01-20 13:58:16 +00:00 |
|
Shane Kilkelly
|
8922c9dbf5
|
New email layout for "testEmail"
|
2017-01-18 15:28:51 +00:00 |
|
James Allen
|
3413687833
|
Merge pull request #393 from sharelatex/ja-track-changes
Ja track changes
|
2017-01-18 15:32:16 +01: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 |
|
Shane Kilkelly
|
707838baa4
|
Merge branch 'master' into sk-launchpad
|
2017-01-17 16:25:59 +00:00 |
|
Shane Kilkelly
|
59ab66fca2
|
Fix double-callback
|
2017-01-17 16:25:18 +00: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 |
|
Shane Kilkelly
|
d7251c6bfe
|
Merge branch 'master' into sk-launchpad
|
2017-01-17 14:55:08 +00:00 |
|
Shane Kilkelly
|
1137ab0715
|
Don't record redirect to static asset paths
|
2017-01-17 14:35:37 +00:00 |
|
James Allen
|
960d1e8b2f
|
Only call /project/.../threads if we need the threads
|
2017-01-17 15:04:49 +01:00 |
|
Shane Kilkelly
|
70c7e32e58
|
Add a 'testEmail' email type
|
2017-01-17 10:52:04 +00: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 |
|
Shane Kilkelly
|
635b935acc
|
Add an acceptance test for login rate limits, cleanup
|
2017-01-16 11:46:59 +00:00 |
|
Henry Oswald
|
fed88504f8
|
rate limit emails sent sharing projects by users
|
2017-01-14 14:52:32 +00:00 |
|
Shane Kilkelly
|
25956d4c62
|
Fix up tests
|
2017-01-13 16:04:26 +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 |
|
Shane Kilkelly
|
525e871d55
|
Merge branch 'master' into sk-rate-limit-cluster
|
2017-01-13 14:17:18 +00: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 |
|