a18176b2fa
Merge pull request #1128 from sharelatex/jel-add-user-to-team-db-op
...
Change database operator to add user to team
GitOrigin-RevId: 0bf23c1f8958f74fa00a97559ebbf03e4edadfa6
2018-11-08 16:11:58 +00:00
3d94be22b1
Merge pull request #1065 from sharelatex/ta-manage-group-members
...
Manage Group Members
GitOrigin-RevId: f0b120630ded1874dfc0352055633afff0015da9
2018-10-25 15:26:00 +00:00
aa549dd0d4
Merge pull request #1063 from sharelatex/ta-remove-add-user-to-group
...
Remove addUserToGroup Action
GitOrigin-RevId: 4f0cbf3dce47ee317b14784402128960a2caffa1
2018-10-25 15:25:55 +00:00
edd832b1f2
Merge pull request #1067 from sharelatex/ta-add-missing-mock
...
Add Missing Test Mock
GitOrigin-RevId: 69a08a1a13a72fe180ab11d1001eca424b149d1f
2018-10-25 15:25:44 +00:00
0f54bc2c52
Add additional tests for V1SubscriptionManager
...
One call was not returning the v1Id correctly. These tests check for that case. Also added some more generic tests for the v1 API call.
bug: overleaf/sharelatex#1014
2018-10-16 10:15:42 +01:00
6fc6c44605
Don't add old v1 features for new accounts
...
Introduces the notion of v1 'grandfathered features', specifically Gihub and Mendeley integration. This allows us to create new v1 accounts for new users without them automatically getting the new features.
Requires a settings change in `settings.web.sl.coffee` to disable these features by default for v1 accounts.
bug: overleaf/sharelatex#1014
2018-10-16 09:45:16 +01:00
ec9c38df57
Revert "Don't add old v1 features for new accounts"
2018-10-15 17:46:48 +01:00
48995d2d44
Don't add old v1 features for new accounts
...
Introduces the notion of v1 'grandfathered features', specifically Gihub and Mendeley integration. This allows us to create new v1 accounts for new users without them automatically getting the new features.
Requires a settings change in `settings.web.sl.coffee` to disable these features by default for v1 accounts.
bug: overleaf/sharelatex#1014
2018-10-12 17:45:57 +01:00
48e5c6b523
add UserMembership logic
2018-10-09 12:09:11 +01:00
6d5908f2f4
Merge pull request #893 from sharelatex/ja-fix-duplicate-text-in-email
...
Don't include the license name twice in invite emails
2018-09-28 11:15:40 +01:00
9ec60a128a
add userHasSubscriptionOrIsGroupMember alias
2018-09-05 11:37:37 +01:00
24f60bf791
Don't include the license name twice in invite emails
2018-09-05 11:05:38 +01:00
3324796086
don't regard v1 teams as paid subscriptions
...
- use `userHasV1Subscription` instead of `userHasV1SubscriptionOrTeam` in `LimitationsManager.userHasSubscriptionOrIsGroupMember `
- remove `userHasV1SubscriptionOrTeam`
- rename `LimitationsManager.userHasSubscriptionOrIsGroupMember` to `LimitationsManager.hasPaidSubscription`
- rename some variables for clarity
2018-09-03 15:09:57 +01:00
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
e7738b851d
Merge pull request #764 from sharelatex/afc-import-managers
...
Import managers
2018-07-17 10:10:51 +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
0bf807fa9f
Remove SubscriptionLocator.getManagedSubscription
...
It was used as a kind of access control check, but it's clearer
if the check is in the only controller that actually needs it.
2018-07-13 11:47:26 +01:00
46a1cdc510
Use the admin_ids array to query for subscriptions
2018-07-13 09:38:58 +01:00
abcfa0b0d2
Store manager ids in an array
2018-07-12 16:35:27 +01:00
3586fe8406
Update var name
2018-07-11 11:50:14 +01:00
4e8185d369
Use the id in methods that modify a subscription
...
This will make it easier to allow a user to manage multiple
groups.
2018-07-11 09:56:36 +01:00
791dc0df5b
check institution features on features update
2018-07-10 17:53:37 +02:00
91079f3af2
Fix unit tests
2018-07-10 11:32:19 +01:00
cb449f4b75
Delete a subscription on expiry, rather than set personal plan code
2018-07-10 10:31:25 +01:00
f1ef053caf
Merge pull request #705 from sharelatex/afc-import-team-from-v1
...
Changes to allow importing a team from v1
2018-07-03 13:39:19 +01:00
20835a79e2
Repair not logged in subscription controller test
2018-06-29 19:36:40 -03:00
18ded60619
Fix unit tests
2018-06-28 15:28:44 +01:00
193579070c
Ensure features are updated for users but not for stubs
2018-06-28 13:25:04 +01:00
4366a0ea2c
Remove trailing whitespace
2018-06-28 11:08:20 +01:00
81c102b501
Add method to import invites
2018-06-18 14:48:27 +01:00
6e2ec2f982
Update remaining unit tests
2018-06-12 13:52:47 +01:00
28f51cd4b4
Update SubscriptionController unit tests
2018-06-12 13:52:47 +01:00
606419476f
Update LimitationsManager unit tests
2018-06-12 13:52:47 +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
155102df64
Use Error classes, and ensure invited_emails is cleared on new invite
2018-06-11 14:20:35 +01:00
5438a565b9
use multiple emails when relevant
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
c45b4463bb
Fix unit test
2018-06-08 10:05:26 +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
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
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
959db80177
Check all emails to prevent invite duplicates
2018-06-07 12:49:46 +01:00
1fc047d08e
Fix invitation resend
2018-06-06 17:11:25 +01:00
Jessica Lawshe