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
92582fdc38
Merge pull request #1076 from sharelatex/ta-ui-error-handling
...
Management UI Error Handling
GitOrigin-RevId: a0567b5d54af3a8ca31f7e124c0c2d2d8d26b647
2018-10-30 14:37:59 +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
7af86b0704
Merge pull request #1045 from sharelatex/bg-fix-missing-next-in-subscription-group-controller
...
fix missing next argument
GitOrigin-RevId: 290741a98a3fb7463d6a6dd052f90c8ffe4e62ce
2018-10-24 14:03:02 +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
85f097343f
Merge pull request #1022 from sharelatex/spd-no-github-for-new-users
...
Don't add old v1 features for new accounts
2018-10-15 15:28:34 +01:00
e646c5c42a
refactor to use config file
2018-10-15 14:46:38 +02: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
6fc7468b02
Thousands of templates
2018-09-17 10:47:57 -05:00
a4956294c1
Remove plans redirect
2018-09-05 08:14:05 -05: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
195ae49052
fix id accessor in domain licence join page
2018-08-31 11:41:28 +01:00
bac90c0976
Move v2 plans redirect to router
2018-08-30 09:52:55 -05: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
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
40c1f67561
Check that the subscription is a group before exporting it to csv
...
I removed this check by mistake, just taking it back.
2018-07-11 12:10:43 +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
cb449f4b75
Delete a subscription on expiry, rather than set personal plan code
2018-07-10 10:31:25 +01:00
193579070c
Ensure features are updated for users but not for stubs
2018-06-28 13:25:04 +01:00
7e5ababe66
Ensure we can import both user and user stubs to teams
2018-06-27 12:09:58 +01:00
d36dbfda07
Merge pull request #665 from sharelatex/afc-import-team-invites
...
Add method to import invites
2018-06-22 09:55:19 +01:00
82a8e37071
Handle V1 connection refused when getting v1 subscription
2018-06-19 16:25:31 +01:00
81c102b501
Add method to import invites
2018-06-18 14:48:27 +01:00
b00a79ff1c
Redirect to v1 plans page from v2
2018-06-12 13:52:47 +01:00
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
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
Jessica Lawshe