Alasdair Smith
8a969d1c25
Redirect directly from controller instead of via handler
2018-09-13 12:09:19 +01:00
Alasdair Smith
9d600afdf8
Fix failing tests for token access
...
If project was changed from token access to private, then we want to
404 on v2 (not redirect to v1). So the logic was changed to check if the
project exists and if it does then a 404 is returned. If it does not
then it redirects to v1.
2018-09-13 12:09:19 +01:00
Alasdair Smith
e0ce988d32
Intelligently redirect to v1 if no v2 project found for token
2018-09-13 12:09:19 +01:00
Hugh O'Brien
24c479e984
Merge pull request #885 from sharelatex/hb-ip-matcher-notifications
...
IP matcher affiliation CTA notifications
2018-09-13 08:59:25 +01:00
Brian Gough
6d54e843e8
fix typo in Errors, only two underscores in __proto__
2018-09-12 10:45:50 +01:00
hugh-obrien
1e04a09ec6
remove unnecessary error returns and ip fetching
2018-09-07 18:15:32 +01:00
hugh-obrien
8ef90a0dcb
move call for creating ip matched notifcation to project controller
2018-09-05 15:40:59 +01:00
Jessica Lawshe
a4956294c1
Remove plans redirect
2018-09-05 08:14:05 -05:00
Tim Alby
9ec60a128a
add userHasSubscriptionOrIsGroupMember alias
2018-09-05 11:37:37 +01:00
hugh-obrien
23e6292fd7
updating tests for ip matcher logic
2018-09-05 11:22:26 +01:00
hugh-obrien
f20d27986b
create ip match notifications without forcing replacement
2018-09-05 11:22:26 +01:00
hugh-obrien
d950e14b3f
use new routes and params from v1 ip matcher endpoint
2018-09-05 11:22:26 +01:00
hugh-obrien
bf2ea4e7b3
test against ip matcher for notification on login if different from previous ip
2018-09-05 11:22:26 +01:00
hugh-obrien
38faa5c25e
correctly create and display ip matched affiliations
2018-09-05 11:22:25 +01:00
hugh-obrien
fa23ea75b8
Call university ip matcher api when checking notifications
2018-09-05 11:22:25 +01:00
Shane Kilkelly
d432b6799f
Merge pull request #888 from sharelatex/ta-v1-subscription-check-fix
...
Don't Regard v1 Teams as Paid Subscriptions
2018-09-05 10:22:46 +01:00
Ersun Warncke
e4e6a0fa1b
add new tag methods
2018-09-03 10:40:28 -04:00
Tim Alby
3324796086
don't regard v1 teams as paid subscriptions
...
- use `userHasV1Subscription` instead of `userHasV1SubscriptionOrTeam` in `LimitationsManager.userHasSubscriptionOrIsGroupMember `
- remove `userHasV1SubscriptionOrTeam`
- rename `LimitationsManager.userHasSubscriptionOrIsGroupMember` to `LimitationsManager.hasPaidSubscription`
- rename some variables for clarity
2018-09-03 15:09:57 +01:00
James Allen
5025b54c9c
Merge pull request #887 from sharelatex/as-logout-of-v1
...
Extract logout to function, so different redirect can be called
2018-09-03 14:04:22 +01:00
Alasdair Smith
53bd2cfd33
Add error handling on logout
2018-09-03 11:46:36 +01:00
Alasdair Smith
6569e34873
Extract logout to function, so different redirect can be called
2018-09-03 11:01:14 +01:00
Timothée Alby
855840d89a
Merge pull request #883 from sharelatex/ta-domain-licence-join-fix
...
Fix id Accessor in Domain Licence Join Page
2018-08-31 13:15:23 +02:00
Henry Oswald
245ad2a2a8
call changeEmail before the callback in setDefaultEmailAddress
2018-08-31 11:49:45 +01:00
Tim Alby
195ae49052
fix id accessor in domain licence join page
2018-08-31 11:41:28 +01:00
Henry Oswald
bab334aa44
fire and forget changeEmail in setDefaultEmailAddress
...
prevents blocking/erroring the change email workflow
2018-08-31 11:16:28 +01:00
Henry Oswald
038b18a209
change email: catch invalid emails and don't pass the error back on invalid requests
2018-08-31 11:06:55 +01:00
Jessica Lawshe
bac90c0976
Move v2 plans redirect to router
2018-08-30 09:52:55 -05:00
James Allen
52381c8fb7
Merge pull request #851 from sharelatex/jel-remove-a-b-test
...
Remove Plans and Pricing A/B Test
2018-08-30 15:19:56 +01:00
Paulo Jorge Reis
8b64f46807
Merge pull request #861 from sharelatex/ho-mailchimp-change-email
...
catch newsletter email change error if user already exists on mailing list
2018-08-30 11:29:01 +01:00
Paulo Jorge Reis
cb4d4145a1
Merge pull request #855 from sharelatex/pr-v2-light-theme
...
v2 light theme
2018-08-30 11:24:52 +01:00
Alasdair Smith
bc1f10a710
Merge pull request #868 from sharelatex/ho-mongo-health-checks
...
added a /health_check/mongo endpoint
2018-08-30 09:52:20 +01:00
Jessica Lawshe
ad55842c0a
Merge pull request #847 from sharelatex/ns-bye-typeform
...
move typeform survey to google forms
2018-08-29 12:24:12 -05:00
Henry Oswald
360618a7d3
added a /health_check/mongo endpoint
2018-08-29 11:24:01 +01:00
Shane Kilkelly
1848befcb7
Merge branch 'sk-flush-when-refreshing-linked-file'
2018-08-29 09:27:05 +01:00
Shane Kilkelly
6ee2a83885
Merge pull request #856 from sharelatex/ns-use-regex-test
...
Use regex test instead of string match
2018-08-29 09:21:40 +01:00
Jessica Lawshe
8889f2aed2
Remove Plans and Pricing A/B Test
...
Remove all layouts, analytics events, and scope related to the A/B test.
The group modal from the default layout of the A/B test should be maintained though for v2.
2018-08-28 12:42:09 -05:00
Paulo Reis
f3a4c7f2ed
Remove debug line.
2018-08-28 17:08:46 +01:00
Henry Oswald
425017930a
catch newsletter email change error if user already exists on mailing list
2018-08-28 14:26:51 +01:00
Paulo Reis
90b353298d
Switch themes at runtime.
2018-08-28 14:12:00 +01:00
Timothée Alby
107e8ce633
Merge pull request #859 from sharelatex/ho-mailchimp-change-email
...
always set status_if_new
2018-08-28 14:44:59 +02:00
Henry Oswald
60b3e6777f
always set status_if_new
2018-08-28 13:34:53 +01:00
Timothée Alby
c2ef2326b9
Merge pull request #857 from sharelatex/ho-mailchimp-change-email
...
add error handling for changing email in newsletter of user who has not subscribed
2018-08-28 14:03:44 +02:00
Henry Oswald
32749267b8
improve logging on change email in newsletter
2018-08-28 12:46:49 +01:00
Henry Oswald
423bc9312d
only set status and merge fields if required
...
Not strictly nessaserry but it is a bit safer
also improve error reporting for change email
2018-08-28 12:32:20 +01:00
Henry Oswald
75521a4c86
add error handling for changing email in newsletter of user who has not subscribed
2018-08-28 10:47:33 +01:00
Paulo Reis
307a98851d
Nest the overall theme property under ace.
2018-08-28 10:10:16 +01:00
Nate Stemen
465b9aefc5
use match in one case and remove and operator
2018-08-27 16:48:44 -04:00
Nate Stemen
4d991aa176
Merge branch 'master' into ns-use-regex-test
2018-08-27 14:26:51 -04:00
Nate Stemen
ebea8a8633
use regex test instead of match when only bool needed
2018-08-27 14:25:01 -04:00
Paulo Reis
efc926ffc5
Load theme as a user setting; allow the user to change it; update tests.
2018-08-27 15:25:00 +01:00
