James Allen
0a2fe7e941
Merge pull request #687 from sharelatex/ja-fix-subscription-upsell
...
Fix check for hasSubscription
2018-06-22 15:59:51 +01:00
James Allen
0edd2b5fe7
Fix check for hasSubscription
2018-06-22 14:10:20 +01:00
Alberto Fernández-Capel
d36dbfda07
Merge pull request #665 from sharelatex/afc-import-team-invites
...
Add method to import invites
2018-06-22 09:55:19 +01:00
Timothée Alby
caee25d85d
Revert "Replace OldAssetsProxy"
2018-06-21 15:52:20 +02:00
Timothée Alby
c30cdf955b
Merge pull request #666 from sharelatex/ta-smart-proxy
...
Replace OldAssetsProxy
2018-06-21 14:35:16 +02:00
James Allen
46fbf0c641
Merge pull request #672 from sharelatex/ja-refactor-email-templating
...
Refactor email templating
2018-06-21 10:28:26 +01:00
James Allen
4608a59e3d
Store OneTimeTokens in mongo rather than redis
2018-06-21 10:22:08 +01:00
James Allen
0dcbc5facb
Send out confirmation emails on register and record confirmedAt date
2018-06-21 10:21:15 +01:00
Alasdair Smith
6c1994e25b
Stub errors in tests to cache
2018-06-20 11:19:23 +01:00
Tim Alby
bbed5fca9a
simplify proxy
2018-06-20 10:58:19 +02:00
Michael Mazour
0246631443
Add public API endpoints to reach CLSIs
...
- `/api/clsi/compile/:submission_id`
- `/api/clsi/compile/:submission_id/build/:build_id/output/:file`
Also per review:
- DRY up ClsiManager.sendRequestOnce and ClsiManager.sendExternalRequest
- Include submission_id in a log message
- Don't include timeout in limits when getting file
2018-06-19 12:04:02 +01:00
Tim Alby
3d272ca297
replace OldAssetProxy
2018-06-18 18:37:58 +02:00
Alberto Fernández Capel
81c102b501
Add method to import invites
2018-06-18 14:48:27 +01:00
Timothée Alby
55112dc7dc
Merge pull request #648 from sharelatex/hb-export-status
...
Export status endpoint
2018-06-14 13:59:11 +02:00
Timothée Alby
984d81f5b8
Merge pull request #649 from sharelatex/ta-emails-endpoints
...
Add Emails Endpoints
2018-06-14 13:59:00 +02:00
hugh-obrien
0321780eba
adding tests for exports status checker
2018-06-14 09:44:05 +01:00
James Allen
82c6d9b293
Merge pull request #629 from sharelatex/ja-display-subscriptions
...
Link subscriptions to v1
2018-06-13 13:55:57 +01:00
Shane Kilkelly
3baf0836bc
Support project-linked-files originating from imported v1 projects
2018-06-13 10:02:54 +01:00
James Allen
6e2ec2f982
Update remaining unit tests
2018-06-12 13:52:47 +01:00
James Allen
28f51cd4b4
Update SubscriptionController unit tests
2018-06-12 13:52:47 +01:00
James Allen
606419476f
Update LimitationsManager unit tests
2018-06-12 13:52:47 +01:00
James Allen
f7532e5854
Merge pull request #619 from sharelatex/afc-email-tokens
...
Use emails with tokens for team invites
2018-06-12 08:30:23 +01:00
James Allen
155102df64
Use Error classes, and ensure invited_emails is cleared on new invite
2018-06-11 14:20:35 +01:00
Tim Alby
97c145433e
use EmailHelper.parseEmail on registration
...
Also changed EmailHelper to use the regexp already used in
UserRegistrationHandler rather than the `mimelib` package as it is
deprecated.
2018-06-11 12:31:18 +02:00
Tim Alby
e614ed9248
add emails endpoints
2018-06-11 10:35:23 +02:00
Tim Alby
5438a565b9
use multiple emails when relevant
2018-06-08 17:53:45 +02:00
Tim Alby
31827ae6b5
add emails attribute on user creation
2018-06-08 17:53:45 +02:00
Jessica Lawshe
d57660aeb5
Merge pull request #632 from sharelatex/jel-plans-pricing-fix
...
Plans and Pricing fixes
2018-06-08 07:17:28 -05:00
Alberto Fernández Capel
59688efb56
Merge remote-tracking branch 'origin/master' into afc-email-tokens
2018-06-08 12:21:17 +01:00
Alberto Fernández Capel
57775e60b1
Merge remote-tracking branch 'origin/master' into afc-update-user-references
2018-06-08 11:28:58 +01:00
Alberto Fernández Capel
c45b4463bb
Fix unit test
2018-06-08 10:05:26 +01:00
Alberto Fernández Capel
5159f6f33d
Check the subscription is in a group plan before adding new members
2018-06-08 09:58:51 +01:00
Timothée Alby
7cdcd725fd
Revert "Use Multiple Emails"
2018-06-07 18:44:59 +02:00
Jessica Lawshe
484ee9ad61
Should not AB test when signed up before 2018-06-06
2018-06-07 10:30:21 -05:00
Alberto Fernández Capel
a3bb99d755
Honour invited_emails for the team being
...
We'll remove them soon, but we want to keep them for a while so
recent invites can join their teams.
2018-06-07 16:22:38 +01:00
Alberto Fernández Capel
670f24ef6f
Simplify method name
2018-06-07 16:12:02 +01:00
Hugh O'Brien
6f5c777163
Merge pull request #622 from sharelatex/hb-take-emis-names-as-input
...
Take user entered first and last names for EMIS
2018-06-07 15:52:33 +01:00
Timothée Alby
f422b7242d
Merge pull request #603 from sharelatex/ta-use-multi-emails
...
Use Multiple Emails
2018-06-07 15:40:43 +02:00
James Allen
c2ef93b212
Merge pull request #610 from sharelatex/ja-sync-from-v2
...
Tell v1 when refreshing features in v2
2018-06-07 13:30:34 +01:00
Alberto Fernández Capel
959db80177
Check all emails to prevent invite duplicates
2018-06-07 12:49:46 +01:00
Alberto Fernández Capel
566c41cafd
Merge remote-tracking branch 'origin/master' into afc-email-tokens
2018-06-07 11:40:03 +01:00
Alberto Fernández Capel
1fc047d08e
Fix invitation resend
2018-06-06 17:11:25 +01:00
Alberto Fernández Capel
553878064b
Resend email if the user has already been invited
2018-06-06 15:36:53 +01:00
Alberto Fernández Capel
e753ef3af5
Invite users in the invited_emails array
...
We'll remove that attribute soon, but for the time being we want
users to still be able to join the team.
2018-06-06 15:36:53 +01:00
Tim Alby
7726314e7c
add test to explicitely check filter
2018-06-06 15:45:12 +02:00
Tim Alby
e4da748257
add filter to query on emails attribute
2018-06-06 14:52:09 +02:00
Tim Alby
813289f5de
use multiple emails when relevant
2018-06-06 11:45:01 +02:00
Tim Alby
c5530163f5
add emails attribute on user creation
2018-06-06 11:45:01 +02:00
Alberto Fernández Capel
6fb6119ca8
Merge remote-tracking branch 'origin' into afc-email-tokens
2018-06-05 15:42:17 +01:00
Tim Alby
613c9193e3
implement multi emails logic
2018-06-05 16:42:12 +02:00
