a417dc8ff4
v1Subscription -> v1Subscriptions
2018-06-12 13:52:47 +01:00
034e50760e
Add flag that can disable plans page
2018-06-12 13:52:47 +01:00
ce60e6941c
Check with v1 before allowing a new subscription
2018-06-12 13:52:47 +01:00
9d84263463
Fetch subscription details from v1 and display to user
2018-06-12 13:52:46 +01:00
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
dbd6ea30e9
Improve robustness of email validation
2018-06-11 15:22:42 +01:00
155102df64
Use Error classes, and ensure invited_emails is cleared on new invite
2018-06-11 14:20:35 +01:00
b716f59442
Remove deprecated removeEmailInviteFromGroup
2018-06-11 14:19:47 +01:00
5438a565b9
use multiple emails when relevant
2018-06-08 17:53:45 +02:00
31827ae6b5
add emails attribute on user creation
2018-06-08 17:53:45 +02:00
d57660aeb5
Merge pull request #632 from sharelatex/jel-plans-pricing-fix
...
Plans and Pricing fixes
2018-06-08 07:17:28 -05:00
59688efb56
Merge remote-tracking branch 'origin/master' into afc-email-tokens
2018-06-08 12:21:17 +01:00
57775e60b1
Merge remote-tracking branch 'origin/master' into afc-update-user-references
2018-06-08 11:28:58 +01:00
5159f6f33d
Check the subscription is in a group plan before adding new members
2018-06-08 09:58:51 +01:00
7cdcd725fd
Revert "Use Multiple Emails"
2018-06-07 18:44:59 +02:00
85f4a31585
Proper coffee syntax
2018-06-07 16:49:17 +01:00
484ee9ad61
Should not AB test when signed up before 2018-06-06
2018-06-07 10:30:21 -05:00
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
670f24ef6f
Simplify method name
2018-06-07 16:12:02 +01:00
30b935befd
Prevent double rendering error
2018-06-07 16:12:02 +01:00
d1b1e6c299
Do not include the Licence ending in domain invites
...
So the message reads like "University of Notre Dame has invited
you to join a team on Overleaf" instead of ""University of Notre
Dame licence..."
2018-06-07 16:12:02 +01:00
88d12b43ac
Make CTA message match regular message
2018-06-07 16:12:02 +01:00
5e70825c94
Rename view variable to invite
...
Makes the meaning more explicit
2018-06-07 16:12:02 +01:00
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
f422b7242d
Merge pull request #603 from sharelatex/ta-use-multi-emails
...
Use Multiple Emails
2018-06-07 15:40:43 +02:00
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
c684fc3383
fix first/last name check bug
2018-06-07 12:57:01 +01:00
959db80177
Check all emails to prevent invite duplicates
2018-06-07 12:49:46 +01:00
566c41cafd
Merge remote-tracking branch 'origin/master' into afc-email-tokens
2018-06-07 11:40:03 +01:00
1fc047d08e
Fix invitation resend
2018-06-06 17:11:25 +01:00
553878064b
Resend email if the user has already been invited
2018-06-06 15:36:53 +01:00
16cb5e0d35
Propagate the error further up the stack
...
Useful for error reporting and metrics.
2018-06-06 15:36:53 +01:00
8a317b5bfe
Better wording
2018-06-06 15:36:53 +01:00
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
3cb499a3c2
add comment
2018-06-06 15:46:41 +02:00
e4da748257
add filter to query on emails attribute
2018-06-06 14:52:09 +02:00
813289f5de
use multiple emails when relevant
2018-06-06 11:45:01 +02:00
c5530163f5
add emails attribute on user creation
2018-06-06 11:45:01 +02:00
6fb6119ca8
Merge remote-tracking branch 'origin' into afc-email-tokens
2018-06-05 15:42:17 +01:00
613c9193e3
implement multi emails logic
2018-06-05 16:42:12 +02:00
10cf5825a5
Add plans variant
...
Also, fix for multiple quotes. Without a closing quote subsequent quotes are considered nested, and
will use a ‘ instead of “
Also, move repeated elements to partials
2018-06-04 14:42:26 -05:00
54ce196500
test custom first and last name for exports
2018-06-04 13:16:21 +01:00
4c5f186ca2
take custom first and last names from export UI
2018-06-04 13:16:21 +01:00
58c4e72b2a
Update references to UserLocator
...
UserLocator was refactored in another branch: UserLocator -> UserGetter
2018-06-01 16:53:16 +01:00
25d7196570
Merge remote-tracking branch 'origin/master' into afc-email-tokens
2018-06-01 16:49:47 +01:00
b0b2546e43
Remove dead code
2018-06-01 16:45:36 +01:00
a73a869d03
I can haz some grammar
2018-06-01 16:17:11 +01:00
7fcdf68296
Remove dead code
2018-06-01 16:05:44 +01:00
3bd18715db
Add some tests
2018-06-01 15:37:09 +01:00
89735f4b8e
Keep method name for compatibility
2018-06-01 15:36:00 +01:00
James Allen