29253c5a93
Merge branch 'master' into hb-fetch-licences-graph
2018-08-23 16:11:43 +01:00
753fb02c05
always return an array when getting affiliations
2018-08-23 15:15:53 +02:00
d838f8778a
Merge pull request #832 from sharelatex/pr-change-free-history-limits
...
Change history limits for free users
2018-08-23 14:02:08 +01:00
8d72fc78fc
send licences graph request to v1 for data instead of analytics
2018-08-22 18:31:29 +01:00
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
54e0a7cfd2
Merge branch 'master' into pr-change-free-history-limits
2018-08-21 11:23:28 +01:00
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
4dee3fd5e1
Update frontend unit tests.
2018-08-20 17:02:55 +01:00
8d6505b518
log institutions API errors
2018-08-17 17:48:00 +02:00
f5513f36ca
add param to skip affiliation creation on user create
2018-08-17 17:48:00 +02:00
9bc3fa2df0
Pass req to preDoPassportLogin module hook
2018-08-17 12:04:05 +01:00
96ffeef73d
send fixed confirmed date to v1 for affiliations
2018-08-16 13:50:34 +01:00
55597b9279
inform v1 when confirming affiliation emails
2018-08-16 13:50:34 +01:00
713a39171a
Fix history frontend tests.
2018-08-16 13:44:48 +01:00
5ed95694da
Merge pull request #801 from sharelatex/ho-mailchimp
...
Add non checked checkbox for newsletter subscription on signup and use mailchimp as newsletter provider.
2018-08-16 11:40:39 +01:00
c2828c8ca5
add unit tests
2018-08-13 10:53:43 +01:00
197e7ce8ab
refactor institutions getter
2018-08-10 13:40:25 +02:00
69e8eddff0
Merge pull request #796 from sharelatex/pr-history-labels-ui
...
History labels UI
2018-08-09 10:50:28 +01:00
9cbb51bbbc
Merge pull request #793 from sharelatex/sk-sl-login-v2
...
If we're creating v1 accounts, don't allow login for users already linked up
2018-08-08 15:51:25 +01:00
687637eec7
change email address in newsletter when changing default email
...
put mongo_id into mailchimp merge fields
2018-08-08 13:50:03 +01:00
6cf1f71604
add newsletter checkbox to user register forms
2018-08-06 17:43:03 +01:00
efcd3577ce
avoid clobbering imported image names
2018-08-06 16:56:44 +01:00
05df55c89e
Add a unit test for the preDoPassportLogin module hook.
2018-08-03 16:10:50 +01:00
d8c9a96619
If we're creating v1 accounts, don't allow login for users already linked up
2018-08-03 14:58:29 +01:00
80eeaaaaea
Update web acceptance tests.
2018-08-02 17:19:16 +01:00
22b664da1a
Merge pull request #792 from sharelatex/hb-fetch-export-zips
...
Fetch export zips
2018-08-02 13:50:11 +01:00
395406407e
add test for export fetch zip
2018-07-30 19:39:35 +01:00
ddbe1a5b22
Add compiler and imageName to export API request
2018-07-27 15:42:37 +01:00
66bcdbcac9
institution upgrade
2018-07-26 13:01:44 +02:00
63c7f756ce
refactor into InstitutionsAPI
2018-07-26 13:01:42 +02:00
7dc82597e1
Merge pull request #765 from sharelatex/ja-update-email-in-v1
...
Update email in v1 when setting as default in v2
2018-07-26 10:58:57 +01:00
f99b6b6f0a
Merge pull request #746 from sharelatex/ta-refresh-features
...
Refresh Features After Confirming Email
2018-07-24 10:04:48 +01:00
faf36f0265
Merge pull request #775 from sharelatex/revert-774-revert-750-hof-labels
...
Add v2 history labels endpoints
2018-07-24 10:04:13 +01:00
5b989f0a8e
Merge pull request #759 from sharelatex/sk-login-with-v1-credentials
...
Login with v1 credentials
2018-07-24 10:04:02 +01:00
8fb9554c3f
Revert "Revert "add v2 history labels endpoints""
2018-07-20 15:36:03 +01:00
f260f42466
Revert "add v2 history labels endpoints"
2018-07-20 12:39:01 +01:00
da632c3117
Merge pull request #750 from sharelatex/hof-labels
...
add v2 history labels endpoints
2018-07-20 11:07:29 +01:00
c423672b55
Unit test for finishLogin
2018-07-18 12:08:34 +01:00
943bfe98aa
Unit test for _loginAsyncHandlers
2018-07-18 11:13:42 +01:00
dae9506f84
Un-break unit tests
2018-07-18 09:57:05 +01:00
62f69a4bcd
Fix case sensitivity
2018-07-18 09:26:03 +01:00
823e12e4a8
Fix tests to add new Features dependency
2018-07-18 09:26:03 +01:00
c2777918fa
Add some missing unit test mocks
2018-07-17 11:26:07 +01:00
2c25cbaf25
Update error handling on backend
2018-07-17 11:12:09 +01:00
e7738b851d
Merge pull request #764 from sharelatex/afc-import-managers
...
Import managers
2018-07-17 10:10:51 +01:00
ca97698724
Handle v1 response when email is already in use
2018-07-16 17:27:01 +01:00
04bb83f3de
add v2 history labels endpoints
2018-07-16 16:06:17 +01:00
66b492ba5f
Use id to find subscription
...
It's the new method signature.
2018-07-16 14:42:41 +01:00
ae440f2ee6
Better variable name in test
...
It should be a subscription id, instead of an admin id. The test passes
anyway because the db calls are mocked, but the wrong variable name
can cause confusion.
2018-07-16 14:40:53 +01:00
d0f77abc70
Update email in v1 when setting default in v2
2018-07-16 13:26:52 +01:00
Hugh O'Brien