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
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
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
0b67265eb6
use admin email for closed site
2017-01-06 11:32:57 +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
Paulo Reis
42bd1852c6
Use HTML binding in the excerpt.
2016-12-07 15:45:22 +00:00
Paulo Reis
58ab888f3f
Add a button to show all, when filtering new items.
2016-12-07 14:57:54 +00:00
Paulo Reis
c716b86def
Add logic to dismiss unread announcements, styling fixes.
2016-12-07 14:26:10 +00:00
Henry Oswald
e6eeb86046
add read property to announcments
2016-12-07 11:39:22 +00:00
Paulo Reis
821e556dd3
Better handling of overflowing content.
2016-12-06 17:15:56 +00:00
Paulo Reis
c1355e64b3
Merge branch 'master' into pr-style-announcements
2016-12-06 15:42:24 +00:00
Paulo Reis
6a9ab1f525
Style adjusments; make announcements close when backdrop is clicked.
2016-12-06 14:17:30 +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
Paulo Reis
a00acd7458
Add animations and state toggling.
2016-12-05 15:32:38 +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
James Allen
34276520d8
Merge pull request #379 from sharelatex/sk-show-user-email
...
Add a `user_email` option to the nav "Account" dropdown.
2016-11-30 15:49:34 +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
Paulo Reis
73e0a63689
Basic mark-up and styles. Change the controller to hold all notifications.
2016-11-29 17:12:53 +00:00
Shane Kilkelly
cf94429e05
Add a user_email option to the nav "Account" dropdown.
2016-11-29 16:04:20 +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
d15659ed85
check user is present before accessing email
2016-11-28 12:01:11 +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