Paulo Reis
af4094a88c
Use CSS hashed paths when hot-swapping themes.
2018-09-02 14:44:15 +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
Ersun Warncke
afc22dc5c2
Revert "Merge pull request #790 from sharelatex/ew-add-cookie-and-form-to-proxy"
...
This reverts commit ebefc2f28c6e88bbfa632f2b22cb8b99b75e95ec, reversing
changes made to 223beab491d2f8dcf4c7285267fda355cfce3f05.
2018-08-29 12:00:20 -04:00
Ersun Warncke
e7eefc0474
Merge pull request #790 from sharelatex/ew-add-cookie-and-form-to-proxy
...
set options and method for request, pass cookies and form body
2018-08-29 10:17:21 -04:00
Henry Oswald
360618a7d3
added a /health_check/mongo endpoint
2018-08-29 11:24:01 +01:00
James Allen
6a04800f70
Merge pull request #810 from sharelatex/ja-v2-templates
...
Split out feature flags into publish and view templates
2018-08-29 10:27:23 +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
Tim Alby
ef37902dfc
check institution confirmation status
2018-08-27 15:45:31 +02:00
Nate Stemen
6d00f38a71
move typeform survey to google forms
2018-08-23 12:34:13 -04:00
Hugh O'Brien
29253c5a93
Merge branch 'master' into hb-fetch-licences-graph
2018-08-23 16:11:43 +01:00
hugh-obrien
bd721d52f4
review fixes and moving licences endpoint to module
2018-08-23 14:39:48 +01:00
Tim Alby
753fb02c05
always return an array when getting affiliations
2018-08-23 15:15:53 +02:00
hugh-obrien
8d72fc78fc
send licences graph request to v1 for data instead of analytics
2018-08-22 18:31:29 +01:00
Hugh O'Brien
eeadd1e9bb
Merge pull request #797 from sharelatex/hb-inform-v1-affiliation-confirms
...
Tell v1 confirmation status of affiliation emails
2018-08-22 08:34:33 +01:00
Henry Oswald
473063cf3d
set rclient.expire for server ttl even when there is no server id
2018-08-21 10:36:18 +01:00
Alasdair Smith
d99a42e678
Merge pull request #824 from sharelatex/as-redirect-sl-login-to-v2-login
...
Allow for redirection of unlinked SL account to /user/login_to_ol_v2
2018-08-21 10:13:52 +01:00
Shane Kilkelly
034586b296
Flush source project to mongo before linked-file create/refresh
2018-08-20 12:19:59 +01:00
Tim Alby
8d6505b518
log institutions API errors
2018-08-17 17:48:00 +02:00
Tim Alby
f5513f36ca
add param to skip affiliation creation on user create
2018-08-17 17:48:00 +02:00
Alasdair Smith
9bc3fa2df0
Pass req to preDoPassportLogin module hook
2018-08-17 12:04:05 +01:00
Alasdair Smith
b9e63421a8
Merge pull request #814 from sharelatex/as-fix-delete-modal-copy
...
Fix delete wording on archive modal
2018-08-16 16:33:30 +01:00
Alasdair Smith
38689dbb1d
Merge pull request #802 from sharelatex/as-sl-redirect
...
Add feature flag for redirecting SL to v2
2018-08-16 16:32:55 +01:00
hugh-obrien
96ffeef73d
send fixed confirmed date to v1 for affiliations
2018-08-16 13:50:34 +01:00
hugh-obrien
55597b9279
inform v1 when confirming affiliation emails
2018-08-16 13:50:34 +01:00
