e2a207d618
Merge branch 'master' into sk-pug
2017-01-31 09:39:06 +00:00
e7efa40c75
Merge pull request #401 from sharelatex/ja-spam-code-fixes
...
Refactor rate limiting code around sending invites
2017-01-31 10:21:55 +01:00
4e9426e6bf
Merge branch 'master' into sk-pug
2017-01-30 14:36:10 +00:00
3ed85dad42
Merge branch 'master' into sk-upgrade-uuid
2017-01-30 11:09:50 +00:00
b086d7afa2
Refactor rate limiting code around sending invites
2017-01-27 16:26:58 +01:00
757c7002eb
Merge pull request #397 from sharelatex/ja-modify-threads
...
Allow editing/deleting of comments and threads
2017-01-25 15:50:00 +01:00
e2f4fc3653
Merge branch 'master' into sk-rate-limit-cluster
2017-01-25 10:52:34 +00:00
3eb13ccdd1
fix stupid mistake
2017-01-25 10:38:39 +00:00
2a00b9c7a2
use user._id for error log
2017-01-25 10:33:30 +00:00
239164fe26
Merge branch 'master' into sk-rate-limit-cluster
2017-01-25 09:56:08 +00:00
cc717f0357
domainAnnouncementsToShow -> domainAnnouncements
2017-01-25 09:44:13 +00:00
02e6eb4dd1
Merge pull request #399 from sharelatex/ho-promote-case-study
...
promote domain alerts
2017-01-25 09:41:50 +00:00
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
13d21b881f
use new annoncments feature for case study info
2017-01-24 16:03:05 +00:00
f9ba7392e9
Allow editing/deleting of comments and threads
2017-01-24 16:21:14 +01:00
2341a8481a
Merge branch 'master' into ho-promote-case-study
2017-01-24 14:49:35 +00:00
a148eb1f43
Merge branch 'master' into sk-rate-limit-cluster
2017-01-24 09:24:47 +00:00
0add3ed66e
Merge branch 'master' into sk-upgrade-uuid
2017-01-23 10:04:31 +00:00
abbffb8e4b
Remove deprecated node-uuid package, replace with uuid.
2017-01-23 10:03:16 +00:00
9153ffac41
limit project name in email to 40 chars
2017-01-21 12:58:16 +00:00
74240e28c7
rate limit via ip the number of invite to project requests
2017-01-21 12:44:09 +00:00
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
cfa2777d62
Merge branch 'sk-launchpad'
2017-01-20 13:58:16 +00:00
57cd54bf55
WIP: migrate from jade to pug
2017-01-20 12:03:02 +00:00
8922c9dbf5
New email layout for "testEmail"
2017-01-18 15:28:51 +00:00
3413687833
Merge pull request #393 from sharelatex/ja-track-changes
...
Ja track changes
2017-01-18 15:32:16 +01:00
707838baa4
Merge branch 'master' into sk-launchpad
2017-01-17 16:25:59 +00:00
59ab66fca2
Fix double-callback
2017-01-17 16:25:18 +00:00
5a34d17947
Toggle track changes in a project based on the owner's feature switch
2017-01-17 15:59:18 +01:00
d7251c6bfe
Merge branch 'master' into sk-launchpad
2017-01-17 14:55:08 +00:00
1137ab0715
Don't record redirect to static asset paths
2017-01-17 14:35:37 +00:00
70c7e32e58
Add a 'testEmail' email type
2017-01-17 10:52:04 +00:00
9c0bf885be
Merge branch 'master' into ja-track-changes
2017-01-17 10:16:41 +01:00
82ddeab2bd
If user tries to invite themselves to project, don't.
2017-01-16 13:45:01 +00:00
635b935acc
Add an acceptance test for login rate limits, cleanup
2017-01-16 11:46:59 +00:00
fed88504f8
rate limit emails sent sharing projects by users
2017-01-14 14:52:32 +00:00
25956d4c62
Fix up tests
2017-01-13 16:04:26 +00:00
525e871d55
Merge branch 'master' into sk-rate-limit-cluster
2017-01-13 14:17:18 +00:00
aab4dea8ae
Merge branch 'master' into ja-track-changes
2017-01-13 13:46:01 +01:00
d17483fd47
Merge branch 'sk-top-menu-rework'
2017-01-12 13:24:47 +00:00
daee77f052
Merge pull request #387 from sharelatex/pr-email-template-improvements
...
Email template improvements
2017-01-12 12:34:35 +00:00
f9b8ada215
track changes for anonymous users
2017-01-12 13:29:57 +01:00
64b9fe52dd
Handle deleted users in comments gracefully
2017-01-12 12:31:01 +01:00
e7ab92b7c9
Only show users controls they have permission to use
2017-01-12 11:52:39 +01:00
5c25d15a18
WIP: try switch to rolling rate limiter
2017-01-12 09:25:18 +00:00
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
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
f31fa98679
Sync track changes state between sessions and client
2017-01-10 16:11:12 +01:00
d03aa7056e
Rename /ranges/users end point to /changes/users
2017-01-10 13:43:53 +01:00
4e128b6ab7
Send user data in /threads dat
2017-01-09 17:25:06 +01:00
Shane Kilkelly