Commit graph

1316 commits

Author SHA1 Message Date
Shane Kilkelly
25956d4c62 Fix up tests 2017-01-13 16:04:26 +00:00
Shane Kilkelly
525e871d55 Merge branch 'master' into sk-rate-limit-cluster 2017-01-13 14:17:18 +00:00
Shane Kilkelly
d17483fd47 Merge branch 'sk-top-menu-rework' 2017-01-12 13:24:47 +00: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
Shane Kilkelly
5c25d15a18 WIP: try switch to rolling rate limiter 2017-01-12 09:25:18 +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
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
Henry Oswald
862e15b842 log out user id and anonymous when loading editor 2017-01-05 15:02:10 +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
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
Shane Kilkelly
d428f9adbc Make LoginRateLimiter a thin wrapper around RateLimiter 2016-12-19 14:10:51 +00:00
Shane Kilkelly
03b541fb64 Fix small mistakes 2016-12-19 14:10:27 +00:00
Shane Kilkelly
9f787943b6 Remove stray redis imports. 2016-12-19 12:17:23 +00:00
Shane Kilkelly
ef0a5801d5 Create a RedisWrapper, and use it for rate limiting. 2016-12-19 12:17:02 +00:00
Paulo Reis
d6fcc21ab5 Add support for GMail go-to actions in the single CTA template. 2016-12-16 17:04:26 +00:00
Paulo Reis
869f729132 Fix forgotten templating function. 2016-12-16 15:15:06 +00:00
Paulo Reis
ca5040882f Use the new template in the join group email. 2016-12-16 14:57:59 +00:00
Paulo Reis
0fe3664a82 Use the new template in the reset pwd email. 2016-12-16 12:16:45 +00:00
Paulo Reis
2234c438a1 Support a secondary message in the single CTA email template. 2016-12-16 12:16:33 +00:00
Paulo Reis
7dfc2c61a6 Make the CTA button text configurable. 2016-12-16 10:06:56 +00:00
Paulo Reis
47a5eb5382 Add a new layout and body template for e-mails. 2016-12-15 17:22:39 +00:00
Henry Oswald
e6eeb86046 add read property to announcments 2016-12-07 11:39:22 +00:00
Shane Kilkelly
a5d2183441 if Recurly error, parse body xml rather than using regex match 2016-12-06 10:39:59 +00:00
Shane Kilkelly
58280bf6ee Merge branch 'master' into sk-user-delete-with-cancelled-sub 2016-12-06 09:31:42 +00:00
James Allen
48cc5a992f Merge branch 'master' into ja-set-version-in-docstore 2016-12-01 09:30:53 +00:00
Shane Kilkelly
e03d16e0cd Deleting user: if subscription is already cancelled, ignore and proceed. 2016-11-30 16:03:18 +00:00
Shane Kilkelly
d38890e9f4 Add the rolling option to session 2016-11-30 09:41:58 +00:00
James Allen
eb648b9bc8 Proxy version number to and from docstore 2016-11-29 17:16:56 +00:00
Henry Oswald
68ddf04fe8 to string record event check 2016-11-29 14:38:45 +00:00
Shane Kilkelly
a03ac8fe72 More robust session destruction after deleting user account. 2016-11-28 12:37:53 +00:00
Shane Kilkelly
52462d7020 Merge branch 'sk-sync-details-from-sso' 2016-11-28 10:11:59 +00:00
Shane Kilkelly
395135a655 Merge branch 'sk-post-login-redirect' 2016-11-28 09:52:14 +00:00
Shane Kilkelly
acce8853ba Remove redundant baseUrl from plans page. 2016-11-25 15:24:50 +00:00
Shane Kilkelly
2ab5ad4230 If we're updating details from a SSO source, don't allow editing on settings page. 2016-11-25 14:38:00 +00:00
Henry Oswald
4b59fdd453 added missing settings file to announcments controller 2016-11-25 11:59:50 +00:00
Henry Oswald
f130470971 log ip address of user when logging in 2016-11-25 11:59:50 +00:00
Shane Kilkelly
167f01857a Remove stray next params. 2016-11-24 14:15:01 +00:00
Shane Kilkelly
22101d0305 If user is sent to login page with explicit redirect, obey 2016-11-24 11:38:13 +00:00
Shane Kilkelly
cee3326ce3 fix omission of 'length' 2016-11-22 17:06:05 +00:00
Shane Kilkelly
8a4352fff2 Set redirect when redirecting from restricted 2016-11-22 16:54:03 +00:00
Shane Kilkelly
8089bb55a4 use session for the post-login redirect, remove redir query string. 2016-11-22 14:24:36 +00:00
Shane Kilkelly
da1be67aff Merge branch 'sk-ext-auth-show-email' 2016-11-18 09:34:05 +00:00
Shane Kilkelly
6606375cd7 Remove dead code: SessionInvalidator 2016-11-17 15:27:58 +00:00
Shane Kilkelly
fa146a1558 Remove redundant !! 2016-11-17 14:48:15 +00:00
Shane Kilkelly
3b8fbe8249 If using external auth, show non-editable email field.
Also defend server-side against setting email when using external auth.
2016-11-17 14:34:02 +00:00
Brian Gough
277894631a try out new pdfjs font fix
https://github.com/mozilla/pdf.js/pull/7705
2016-11-16 14:50:09 +00:00
Shane Kilkelly
f9774141b1 Fix up makeRequest, so it copes with analytics.url being un-configured. 2016-11-16 14:40:38 +00:00
Henry Oswald
5b3cd7ed2b use makeRequest func in analytics manager 2016-11-15 15:36:26 +00:00
Henry Oswald
a822cc0c92 don't log events from health check user 2016-11-15 13:41:15 +00:00