Tim Alby
791dc0df5b
check institution features on features update
2018-07-10 17:53:37 +02:00
James Allen
cb449f4b75
Delete a subscription on expiry, rather than set personal plan code
2018-07-10 10:31:25 +01:00
Alberto Fernández Capel
193579070c
Ensure features are updated for users but not for stubs
2018-06-28 13:25:04 +01:00
Alberto Fernández Capel
7e5ababe66
Ensure we can import both user and user stubs to teams
2018-06-27 12:09:58 +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
Alasdair Smith
82a8e37071
Handle V1 connection refused when getting v1 subscription
2018-06-19 16:25:31 +01:00
Alberto Fernández Capel
81c102b501
Add method to import invites
2018-06-18 14:48:27 +01:00
James Allen
b00a79ff1c
Redirect to v1 plans page from v2
2018-06-12 13:52:47 +01:00
James Allen
a417dc8ff4
v1Subscription -> v1Subscriptions
2018-06-12 13:52:47 +01:00
James Allen
034e50760e
Add flag that can disable plans page
2018-06-12 13:52:47 +01:00
James Allen
ce60e6941c
Check with v1 before allowing a new subscription
2018-06-12 13:52:47 +01:00
James Allen
9d84263463
Fetch subscription details from v1 and display to user
2018-06-12 13:52:46 +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
dbd6ea30e9
Improve robustness of email validation
2018-06-11 15:22:42 +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
James Allen
b716f59442
Remove deprecated removeEmailInviteFromGroup
2018-06-11 14:19:47 +01:00
Tim Alby
5438a565b9
use multiple emails when relevant
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
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
Alberto Fernández Capel
85f4a31585
Proper coffee syntax
2018-06-07 16:49:17 +01: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
Alberto Fernández Capel
30b935befd
Prevent double rendering error
2018-06-07 16:12:02 +01:00
Alberto Fernández Capel
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
Alberto Fernández Capel
5e70825c94
Rename view variable to invite
...
Makes the meaning more explicit
2018-06-07 16:12:02 +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
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
16cb5e0d35
Propagate the error further up the stack
...
Useful for error reporting and metrics.
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
813289f5de
use multiple emails when relevant
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
Jessica Lawshe
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
Alberto Fernández Capel
58c4e72b2a
Update references to UserLocator
...
UserLocator was refactored in another branch: UserLocator -> UserGetter
2018-06-01 16:53:16 +01:00
Alberto Fernández Capel
25d7196570
Merge remote-tracking branch 'origin/master' into afc-email-tokens
2018-06-01 16:49:47 +01:00
Alberto Fernández Capel
b0b2546e43
Remove dead code
2018-06-01 16:45:36 +01:00
Alberto Fernández Capel
7fcdf68296
Remove dead code
2018-06-01 16:05:44 +01:00
Alberto Fernández Capel
3bd18715db
Add some tests
2018-06-01 15:37:09 +01:00
James Allen
cfbb5c8f24
Remove some dead code
2018-06-01 14:55:07 +01:00
Alberto Fernández Capel
385fec1914
Clean up code that uses invited_emails
2018-06-01 11:23:25 +01:00
Alberto Fernández Capel
1c485c1884
Improve error handling
2018-05-31 16:42:09 +01:00
Alberto Fernández Capel
d262de14d6
Use team invites to join domain licensed teams
2018-05-31 16:15:47 +01:00
Alberto Fernández Capel
39c8595c27
Split SubscriptionGroupInvites and rename to DomainSubscriptionJoin
...
To not cause confusion with team invites.
They are not really an invite because they are user initiated, but
more of a user choosing to join a team.
2018-05-31 14:25:47 +01:00
Alberto Fernández Capel
11edfde153
Accept & revoke team invites
2018-05-31 11:54:50 +01:00
