Commit graph

209 commits

Author SHA1 Message Date
Jakob Ackermann
9dccd6173a Merge pull request #4305 from overleaf/jpa-fix-undef
[misc] fix undefined references in all the places and enable lint rule

GitOrigin-RevId: 473dbab577b34f60d6a3fe567e29e13cb5b1cb24
2021-07-14 12:40:42 +00:00
Jakob Ackermann
5e773ce950 Merge pull request #4101 from overleaf/ae-settings-module
Migrate from `settings-sharelatex` to `@overleaf/settings`

GitOrigin-RevId: 9a298ba26382180c1351683c5fddc9004418c1e6
2021-07-08 02:08:28 +00:00
Alexandre Bourdin
40c7f2dae1 Merge pull request #4219 from overleaf/ab-group-subscription-user-property
Send group subscription user property

GitOrigin-RevId: d1033ab4e0b5061b9d4a781e319d6b690f7e6154
2021-07-06 02:05:54 +00:00
Thomas
be73463e35 Merge pull request #4248 from overleaf/tm-ta-new-subscription-currency-fixes
Fix getCurrencyCode behavior and add fallback in frontend for invalid currencies

GitOrigin-RevId: 5cc40b524148f88c0f110d2cf4bb4d3b69844f1b
2021-06-24 02:07:14 +00:00
Alexandre Bourdin
c370785510 Merge pull request #4216 from overleaf/ab-mixpanel-events-cleanup
Cleanup analytics subscription events

GitOrigin-RevId: b55debe0d76f5e2d84e12de9cced8f69a03b8b95
2021-06-17 02:09:50 +00:00
Alexandre Bourdin
9f1784b4c4 Merge pull request #4200 from overleaf/ab-feature-set-user-property
Resolve and send feature set user property to analytics

GitOrigin-RevId: 08ddd0fe9202b02f7d37547dab1d078bf441a8cf
2021-06-17 02:09:46 +00:00
Alexandre Bourdin
bb760a3ee2 Merge pull request #4186 from overleaf/ab-expired-sub-plan-code-prop
Keep subscription plan code user property when a subscription expires

GitOrigin-RevId: 195bfa440dc3fb020f4cbefe44f87bc975aade70
2021-06-12 02:08:44 +00:00
Alexandre Bourdin
ca1e828ea7 Merge pull request #4138 from overleaf/ab-recurly-webhook-analytics
Send analytics events and user properties from Recurly webhook

GitOrigin-RevId: 3227dd9e42bad61e17d2ca471f6d68adb7212dab
2021-06-11 02:05:59 +00:00
Thomas
d56d4c3b4a Add HTTP Basic Auth to Recurly webhook endpoint (#4054)
* Add HTTP authentication to Recurly webhook endpoint

Co-authored-by: Eric Mc Sween <eric.mcsween@overleaf.com>
GitOrigin-RevId: 81c32459d643895c096bc195ae6aef53248418da
2021-06-09 02:05:31 +00:00
Jakob Ackermann
95c83866c5 Merge pull request #4112 from overleaf/tm-private-api-basic-auth
Add requireBasicAuth middleware and refactor httpAuth to use it

GitOrigin-RevId: 7f68c0dc4a40102bfe4a97711def517e465ec7fd
2021-06-01 02:05:46 +00:00
Alexandre Bourdin
a65c5dde01 Merge pull request #4068 from overleaf/ab-split-test-user-properties
Store assigned split tests as user properties

GitOrigin-RevId: 1cc09d4d8f19badb73e87c46064bdeac131dd307
2021-05-27 02:06:10 +00:00
Alexandre Bourdin
18d62dcee9 Merge pull request #4071 from overleaf/ab-subscription-decaf-cleanup
Subscription controller decaf cleanup

GitOrigin-RevId: 79b8adfabe30e4557a95b1aad71a5162e6f42cce
2021-05-27 02:06:03 +00:00
Timothée Alby
03b2d184b5 Merge pull request #4052 from overleaf/ab-subscription-page-split-test-2
Subscription page split test

GitOrigin-RevId: 022a91d97f20d584e47e1f6b5575e689983df129
2021-05-20 02:05:00 +00:00
Jessica Lawshe
3af7b2da30 Merge pull request #4049 from overleaf/jel-featuresUpdatedAt
Set featuresUpdatedAt

GitOrigin-RevId: 87d53e5ff27a8ebce2ba8c7223d498b291d05a23
2021-05-19 02:06:10 +00:00
Jessica Lawshe
9b29fa7cbc Merge pull request #4035 from overleaf/jel-reconfirmation-dropbox-notification
Notification for Dropbox unlinked due to reconfirmation lapse

GitOrigin-RevId: 03d2bed922e1d3dd993f9227b8e7675af42eda4b
2021-05-19 02:06:06 +00:00
Thomas
f7fd2dec65 Merge pull request #3503 from overleaf/cmg-downgrade-group-subscription
Downgrade group subscription properly

GitOrigin-RevId: 6d028b79f8d5cc1ae9257e72b12d06190fed4121
2021-05-18 02:08:24 +00:00
Thomas
f7b96e86a7 Merge pull request #4034 from overleaf/tm-pending-subscription-addons
Display correct information when pending subscription has addons

GitOrigin-RevId: 7634ccf24788951507963b6d421fdb86e0dc38d5
2021-05-18 02:08:16 +00:00
Jessica Lawshe
5d7faa7977 Merge pull request #4006 from overleaf/jel-refresh-features-reason
Pass reason to refreshFeatures

GitOrigin-RevId: 400e3081333239248e3408f93b0517b9bbdbc90c
2021-05-12 02:09:55 +00:00
Miguel Serrano
46ecb39bdb Merge pull request #3986 from overleaf/tm-decaf-limitations-manager
Decaf cleanup of LimitationsManager and tests

GitOrigin-RevId: 9bbfc4c3ad002a424863a43c3c19dc66fa5e9854
2021-05-06 02:09:39 +00:00
Miguel Serrano
6583d6de21 Merge pull request #3971 from overleaf/tm-migrate-recurly-cancellations
Migrate cancel/reactivatation of recurly subscription to node client

GitOrigin-RevId: 68a8a3eba7b653ec923d020a74a09e49efa8ba21
2021-05-06 02:09:35 +00:00
Miguel Serrano
f9871103bf Merge pull request #3949 from overleaf/msm-reenable-eslint-const-rule
Reenable eslint `prefer-const` rule

GitOrigin-RevId: 4f3825be8b8dff381095209085a36eaab76260d5
2021-05-06 02:09:14 +00:00
Thomas
72af966c9c Schedule subscription downgrades to occur at the current term end (#3801)
* Schedule subscription downgrades to occur at the current term end.

If the plan is a downgrade, schedule the subscription change for term
end. Use Recurly v3 API subscription change event instead of v2 update
subscription.

* Add ability for user to revert a pending subscription change

In the case where a user has downgraded, but has since decided they'd
rather stay on their current plan, we need a way to let them revert. It
isn't enough to re-use a subscription change, because Recurly sees it as
an attempt to make a change from the current plan to itself.

Instead, we use a new dialog and call a new endpoint that has the
specific intent of reverting the pending plan change, by calling the
removeSubscriptionChange recurly client method.

* Add message prompting users to contact support for immediate changes

We're showing this in the confirmation modal for a plan change that
would occur in the future, and and on the subscription page if a pending
change is due.

Most users shouldn't need this, but it should help them out if they find
an edge case like moving from eg. Student (Annual) to Professional
(Monthly) and were expecting to be "upgraded" immediately.

GitOrigin-RevId: c5be0efbeb8568ed9caa941aadcef6f6db65c420
2021-04-28 02:10:31 +00:00
Alf Eaton
1be43911b4 Merge pull request #3942 from overleaf/prettier-trailing-comma
Set Prettier's "trailingComma" setting to "es5"

GitOrigin-RevId: 9f14150511929a855b27467ad17be6ab262fe5d5
2021-04-28 02:10:01 +00:00
Alf Eaton
1ebc8a79cb Merge pull request #3495 from overleaf/ae-prettier-2
Upgrade Prettier to v2

GitOrigin-RevId: 85aa3fa1acb6332c4f58c46165a43d1a51471f33
2021-04-15 02:05:22 +00:00
Jessica Lawshe
66105d6937 Merge pull request #3782 from overleaf/revert-3773-revert-3718-jel-emailHasLicence
Revert "Revert "Update emailHasLicence for reconfirmation and SAML""

GitOrigin-RevId: 120ee0ca2f59573578e6279477c6e62972b5fb4a
2021-04-09 02:05:17 +00:00
Jakob Ackermann
83a38a9980 Merge pull request #3764 from overleaf/jpa-drop-alternative-plans-page-logic
[SubscriptionController] drop unused handling of alternative plans page

GitOrigin-RevId: 1a4ec8276ac0ea87567cfbad9f8d82544267320c
2021-03-18 03:05:04 +00:00
Thomas
001f7f0cc2 Merge pull request #3773 from overleaf/revert-3718-jel-emailHasLicence
Revert "Update emailHasLicence for reconfirmation and SAML"

GitOrigin-RevId: 637b85d10fc0c79e8d55e51b43952e956d73baa6
2021-03-16 03:04:44 +00:00
Thomas
fee245b570 Merge pull request #3732 from overleaf/tm-recurly-create-admin-link
Create link to Recurly in admin panel

GitOrigin-RevId: 214802e9fbe16954d455ac04eb176ff27890769c
2021-03-16 03:04:40 +00:00
Thomas
1c54a15e42 Merge pull request #3718 from overleaf/jel-emailHasLicence
Update emailHasLicence for reconfirmation and SAML

GitOrigin-RevId: 58daf538d9f0a7db46bb3c1e21f8ca04df095446
2021-03-16 03:04:36 +00:00
Jakob Ackermann
18eea6d024 Merge pull request #3763 from overleaf/jpa-xss-7
[views] mitigate XSS on new subscription page

GitOrigin-RevId: 74baa58527aa9b2f9e434c280885b627f73898b6
2021-03-13 03:05:14 +00:00
Alexandre Bourdin
b8fc4b58ca Merge pull request #3741 from overleaf/ta-refresh-institution-users
Refresh Institution Users Script Changes

GitOrigin-RevId: 917287450ba30a9f8b605a2d38933a0f6e1979e6
2021-03-11 03:05:21 +00:00
Eric Mc Sween
e5c49ea19a Merge pull request #3681 from overleaf/em-group-plans
Configure group plans for additional licenses

GitOrigin-RevId: 57822de9f490505c4b083afa80220e4d5b4c7d23
2021-02-23 03:04:43 +00:00
Jessica Lawshe
195785194d Merge pull request #3684 from overleaf/pr-increase-log-level-payment-form-422s
Increase Recurly 422 log level to error

GitOrigin-RevId: 6ce0bca338d81660b62b74584a851a825114c4f2
2021-02-23 03:04:35 +00:00
Timothée Alby
450d744f9a Merge pull request #3665 from overleaf/cmg-jpa-members-limit-addon
Support membersLimit add on for recurly subscriptions

GitOrigin-RevId: d4256665d703e3c348cdac11af669c70f3c2feb2
2021-02-19 03:04:33 +00:00
Eric Mc Sween
1c0b897835 Merge pull request #3638 from overleaf/em-dropbox-duplicate-projects
Unlink Dropbox when two projects have the same name

GitOrigin-RevId: b16dbeb6841eaebd8553884eebc87e681d17a9c8
2021-02-18 03:05:12 +00:00
Alasdair Smith
7cbf2cdd9e Merge pull request #3496 from overleaf/ae-eslint-dot-notation
Enable the eslint dot-notation rule

GitOrigin-RevId: e11cbad3e8a77a4a60590d3674fbf34feccc5bc9
2020-12-17 03:07:31 +00:00
Alf Eaton
2ff1cf43d6 Merge pull request #3470 from overleaf/eslint
Upgrade and configure ESLint

GitOrigin-RevId: ad5aeaf85e72c847a125ff3a9db99a12855e38aa
2020-12-16 03:08:28 +00:00
Shane Kilkelly
405a221187 Merge pull request #3318 from overleaf/sk-remove-events-module
Re-work unlinking dropbox when subscription ends

GitOrigin-RevId: 92cf5713d57e157cf544d0470d5fdb6e4010d5cd
2020-11-05 03:04:24 +00:00
Jakob Ackermann
87634be542 Merge pull request #3351 from overleaf/revert-3348-revert-3298-jpa-re-land-mongoose-latest
[misc] re-land: remove mongojs and bump mongoose

GitOrigin-RevId: eba9f80fbd58dbb8aed131fead3ec0b928a555aa
2020-11-04 03:04:21 +00:00
Jakob Ackermann
e249a2e5be Merge pull request #3348 from overleaf/revert-3298-jpa-re-land-mongoose-latest
Revert "[misc] re-land: remove mongojs and bump mongoose"

GitOrigin-RevId: 45a284435c88898d96769ab258651fb8d6d20ff5
2020-11-03 03:05:09 +00:00
Jakob Ackermann
28fe397f38 Merge pull request #3298 from overleaf/jpa-re-land-mongoose-latest
[misc] re-land: remove mongojs and bump mongoose

GitOrigin-RevId: 02f78d52ffc2d373c8c0bc4860d3b2326a46f5c9
2020-11-03 03:04:52 +00:00
Hugh O'Brien
8eab5a5f6f Merge pull request #3203 from overleaf/hb-new-personal-plan
New personal plan

GitOrigin-RevId: bd96e86bef35b618f492625c3a9ea41328390374
2020-10-14 02:05:07 +00:00
Simon Detheridge
c257b9695a Merge pull request #3277 from overleaf/revert-3257-jpa-mongoose-latest
Revert "[misc] upgrade mongoose to the latest version"

GitOrigin-RevId: d5957fca68be65a08a687476742ffbb9c3cb86e8
2020-10-13 02:04:31 +00:00
Simon Detheridge
dba5127856 Merge pull request #3257 from overleaf/jpa-mongoose-latest
[misc] upgrade mongoose to the latest version

GitOrigin-RevId: cc612312e1661a92907dd8d42a32aeccb8cdb62d
2020-10-13 02:04:26 +00:00
Jakob Ackermann
e3c6637339 Merge pull request #3187 from overleaf/jpa-mongodb-native
[misc] migrate the app to the native mongo driver

GitOrigin-RevId: 9030b18c4cf62e3a01d3d8f450bf0e02f9f89c22
2020-10-02 02:04:18 +00:00
Simon Detheridge
ec0240395f Merge pull request #3219 from overleaf/spd-jel-v1-logging
Add URL to error log from V1SubscriptionManager

GitOrigin-RevId: de55b3c017aa060a75d81e538be0dec3131b3baf
2020-09-29 02:05:12 +00:00
Jakob Ackermann
018a44eeb5 Merge pull request #3185 from overleaf/jpa-normalize-mongo-imports
[misc] normalize mongo imports

GitOrigin-RevId: ac653d9982e0d36736b90f4c03d4c00be88ea76a
2020-09-25 02:04:20 +00:00
Jakob Ackermann
a22e252666 Merge pull request #3114 from overleaf/msm-remove-logger-warn-controllers
Replaced logger statements with error tagging in Controllers

GitOrigin-RevId: c5231913c82f95a325f4c3ab406d89cb534835a4
2020-08-20 02:06:25 +00:00
Timothée Alby
d932c153c0 Merge pull request #3090 from overleaf/jel-async-setDefaultEmailAddress
Convert setDefaultEmailAddress to async

GitOrigin-RevId: 1f915af03c3dbe54b2cce439ecd55eeb3a3f35d3
2020-08-13 02:06:31 +00:00
Timothée Alby
8cd6e7ccfc Merge pull request #3064 from overleaf/ta-manage-multiple-groups
Allow Users to Manage Multiple Groups

GitOrigin-RevId: c918da0114cdd1d679223f69d81159b4c2608874
2020-08-13 02:06:20 +00:00
Miguel Serrano
2e8f66ac6b Merge pull request #3075 from overleaf/msm-codemod-oerror-v3-logging
Replaced logger.warn statements with OError.tag()

GitOrigin-RevId: 4d821ec48a0006abb1fcffe07dbb5511c88f5b9a
2020-08-12 02:07:03 +00:00
Miguel Serrano
d2845d9a38 Merge pull request #3074 from overleaf/msm-update-oerror-logger-v3
Update o-error to v3 and logger-sharelatex to v3

GitOrigin-RevId: 5e6386f65b7893949336aa4ff021212aebd98f4a
2020-08-12 02:06:58 +00:00
Miguel Serrano
b0dc73a61c Remove HttpErrors.InternalServerError (#3027)
* Added legacyInternal() 500 to HttpErrorHandler
* replaced HttpErrors.InternalServerError being thrown with calls to HttpHandler.legacyInternal()

GitOrigin-RevId: 0b7086a9693b57cdf93976d4221b90315960e8bb
2020-07-23 02:06:50 +00:00
Miguel Serrano
79b6f6e473 Merge pull request #2994 from overleaf/msm-add-user-projection-subscription-handler
Added projection to User.find() queries in SubscriptionHandler

GitOrigin-RevId: f74e3fcd2138306dc35b5c4d0da314046ab48e35
2020-07-17 02:06:36 +00:00
Miguel Serrano
6562f3003d Merge pull request #2985 from overleaf/msm-oerror-remove-unprocessable-entity-error
Replace UnprocessableEntityError with calls to unprocessableEntity() handler

GitOrigin-RevId: 4bba389c8cdf87a40137d49db571fa81aaac4239
2020-07-17 02:06:19 +00:00
Jessica Lawshe
4349e85444 Merge pull request #2813 from overleaf/ns-ta-group-account-admin
Add admin to group account when new group account is created

GitOrigin-RevId: 81c49a0b414896153a85a8ba1afc364164047c1c
2020-05-07 03:28:28 +00:00
Miguel Serrano
0583f7a667 Merge pull request #2746 from overleaf/ew-jpa-fix-deprecated-express-methods
[misc] fix express deprecations

GitOrigin-RevId: 78c730578c6a671f142837c98f98d5fd260332a5
2020-05-07 03:27:56 +00:00
Paulo Jorge Reis
7f13e258bb Merge pull request #2697 from overleaf/pr-add-vat-number
Add VAT number and company name to the payment form

GitOrigin-RevId: 9ba2d7345f6f3cef1f7372e17c04243ab285e0bd
2020-04-30 03:19:59 +00:00
Shane Kilkelly
cc34a1b867 Merge pull request #2715 from overleaf/ta-remove-log
Remove Useless and Broken Logging

GitOrigin-RevId: 9583d7c37df287115da62f7b5090340ce8a01208
2020-04-09 03:20:57 +00:00
nate stemen
344b2b2395 Merge pull request #2702 from overleaf/ta-subscription-links
Fix Language Change Links

GitOrigin-RevId: e47f59dfd53102d4569c3ffeb950d3259c65215b
2020-03-31 03:18:45 +00:00
nate stemen
6379f15815 Merge pull request #2651 from overleaf/ta-missing-return
Add Missing Return

GitOrigin-RevId: aeb622a6745678eb687217beeb49b5d023168052
2020-03-06 04:13:42 +00:00
Timothée Alby
42aa999af6 Merge pull request #2638 from overleaf/ta-subscription-change-admin-fix
Change Manager When Changing Admin of Individual Subscriptions

GitOrigin-RevId: 3da53789f4331c4eb8d0a458650ea41f8b2b4f97
2020-02-29 04:17:31 +00:00
Timothée Alby
f5e2983a6b Merge pull request #2609 from overleaf/ta-cmg-recurly-email-update
Add UI to Update Recurly Email

GitOrigin-RevId: 920a741fd9b4312f031bdd40e3d6bec48f1bd579
2020-02-21 04:21:12 +00:00
Timothée Alby
98f031e9aa Merge pull request #2619 from overleaf/ta-licence-attribute-fix
Read Licence Attribute from Affiliation Instead of Institution

GitOrigin-RevId: 2294222e2bd0da473a303d3ffdc5ddb7d856f7f7
2020-02-21 04:20:59 +00:00
Jessica Lawshe
f2636e0555 Merge pull request #2572 from overleaf/ta-personal-plan-test
Personal Plan Filter Test

GitOrigin-RevId: e0e75bdd43b27cda787d039f9cfaad64e96afa67
2020-02-06 04:20:09 +00:00
nate stemen
60554cb634 Merge pull request #2543 from overleaf/hb-remove-unused-v1-endpoints
Remove unused v1 endpoints

GitOrigin-RevId: b7d629b42f10074cf17dfb1d851316f970584a81
2020-02-04 04:19:13 +00:00
nate stemen
aa48d639a0 Merge pull request #2560 from overleaf/ta-group-admin-no-features
Don't Give Features To Group Admins

GitOrigin-RevId: 3588aff773bdc4cf18d18ce52f2c1b73462d806e
2020-02-04 04:18:55 +00:00
Simon Detheridge
34d3671640 Merge pull request #2533 from overleaf/revert-2460-hb-remove-personal-plan-code
Add back specific logic for old default personal plan code

GitOrigin-RevId: 36aa2ab2be06c27faa6ffca7f2dacdf8aef9322f
2020-01-28 04:18:53 +00:00
Timothée Alby
850d5f957c Merge pull request #2480 from overleaf/ta-refresh-features-script-improve
Refresh Features Script Improvements

GitOrigin-RevId: 1cd0fc3b689cf85760d9a22804bf9cab19e22409
2020-01-08 04:17:47 +00:00
Eric Mc Sween
a7db312404 Merge pull request #2460 from overleaf/hb-remove-personal-plan-code
remove specific logic for old default personal plan code

GitOrigin-RevId: fd4ef1949f337f6c09ea963473e3aeb8eff5c62f
2020-01-07 04:21:31 +00:00
Eric Mc Sween
096576538a Merge pull request #2479 from overleaf/jel-optimize-plans
Add Google Optimize to plans payment page

GitOrigin-RevId: 4c710fa1c904eed244c9fda5653a880e5dfab3cc
2020-01-07 04:21:23 +00:00
nate stemen
38e240ebb6 Merge pull request #2463 from overleaf/hb-group-error-messages
Display error messages for group adding errors

GitOrigin-RevId: 4ee59319e03480829b8d8d588c0a2a896ac5a6ea
2020-01-03 04:22:04 +00:00
Timothée Alby
30b9ba4ac7 Merge pull request #2452 from overleaf/ta-refresh-features-script-extra
Improve Script To Refresh All Users' Features

GitOrigin-RevId: f13fe0b01a7c26eca950ff8a008c937232769417
2019-12-17 04:22:37 +00:00
Timothée Alby
390c8641da Merge pull request #2454 from overleaf/ta-recurly-address-check
Check Country Presence when Creating New Subscription

GitOrigin-RevId: a92266cf2a304e3649ff3b02f9b47e76ae0f8523
2019-12-17 04:22:22 +00:00
Timothée Alby
a5757b447c Merge pull request #2434 from overleaf/ta-team-invite-email-fix
Fix Spam Safe Inviter Name for Group Invites

GitOrigin-RevId: e5e01afd53d22cd53016352c32ad1de28137ea17
2019-12-06 04:19:21 +00:00
Timothée Alby
5783f99fbd Merge pull request #2439 from overleaf/ta-refresh-features-script
Add Script To Refresh All Users' Features

GitOrigin-RevId: 3ec107d170af7d65b7fe5bf90598e18d738bfad5
2019-12-06 04:19:12 +00:00
Jessica Lawshe
cbe22f5cc7 Add Google Optimize
GitOrigin-RevId: 4c485be83456bf632d1b5f6790f2757d2b3aad54
2019-12-03 14:20:41 +00:00
Eric Mc Sween
a493ec94b2 Merge pull request #2414 from overleaf/ta-features-overrides
Persistent Features Override

GitOrigin-RevId: 9bb389458a4fde3cc36dbc5b8c3f7185b7e4e9bf
2019-12-02 14:09:53 +00:00
Timothée Alby
508556c835 Merge pull request #2409 from overleaf/ta-recurly-collection-script-fix
Recurly Collection Script Fix

GitOrigin-RevId: 3012d06a9122636ca1997e2e66899a36b386e5be
2019-11-27 13:21:27 +00:00
Ersun Warncke
2c335802ca remove excessive logging
GitOrigin-RevId: 62024bbe0415a4fdae66eb1b9c6707e5faec7cd1
2019-11-27 12:17:32 +00:00
Jessica Lawshe
1a456da017 Merge pull request #2387 from overleaf/jel-async-login
Convert V1LoginController._login to async

GitOrigin-RevId: 2e51533126919f5a4ce71ca5d403a24773375333
2019-11-25 13:49:37 +00:00
Timothée Alby
e000fd4615 Merge pull request #2343 from overleaf/ta-invoice-attempt-callback
Collect Past Due Invoices on Paypal Billing Info Updates

GitOrigin-RevId: 6a0d298db8589ae6ba7cb62e4dfd562a1f292db0
2019-11-12 09:14:58 +00:00
Alasdair Smith
ed2b572fe7 Merge pull request #2321 from overleaf/jel-tidy-portals
Tidy portals backend

GitOrigin-RevId: 927e7e32b3b648f6fef98c5bb39d2f53a6c57a22
2019-11-05 14:23:09 +00:00
Simon Detheridge
4b6f038a82 Merge pull request #2307 from overleaf/spd-project-page-without-v1
Add additional error handling to enable /projects to load without V1

GitOrigin-RevId: 710ab2f07f191aa60ffdd71e2f54bc7c5db0c430
2019-10-30 15:59:04 +00:00
Jessica Lawshe
4f637f14b5 Merge pull request #2299 from overleaf/as-cleanup-express-locals
Clean up express locals

GitOrigin-RevId: f57e7c57913cbf894a365c5ae9dd2810245a01ae
2019-10-29 15:58:53 +00:00
Timothée Alby
4d564d5cf1 Merge pull request #2258 from overleaf/ta-recurly-custom-fields
Recurly Custom Fields Tracking

GitOrigin-RevId: f29f56cf7d0dfa91a8f4152897ba6bd897cb6238
2019-10-25 08:38:57 +00:00
Timothée Alby
de4205d6a0 Merge pull request #2273 from overleaf/ta-recurly-get-accounts
Add Script to Print CSV of all Paypal Customers

GitOrigin-RevId: 3aab5a29508a6848934a2858e0ce0edb9c7d6e71
2019-10-21 14:08:03 +00:00
Eric Mc Sween
2603597150 Merge pull request #2221 from overleaf/em-ownership-transfer-emails
Project ownership transfer emails

GitOrigin-RevId: 3d33147c18e2d652976b3dac7453c0407c81314e
2019-10-15 13:30:10 +00:00
Eric Mc Sween
cc1de97df8 Merge pull request #2235 from overleaf/ta-recurly-subscription-callbacks
Sync Recurly Subscriptions on New and Updated Events

GitOrigin-RevId: 597a7cb529d8c872693aae20cdb81a8edb1b7778
2019-10-15 13:29:53 +00:00
Ersun Warncke
849f21fde3 add saml acceptance tests. get/set entitlement.
GitOrigin-RevId: 65721aadb91678eafaf5a214a2921fe3dd276efa
2019-10-08 13:29:32 +00:00
Timothée Alby
5f107374a6 Merge pull request #2195 from overleaf/em-collab-permissions
Move collaborators code to async/await

GitOrigin-RevId: 55b5dd8154d024e2cee738208c45a8139870b92b
2019-10-07 08:46:36 +00:00
Simon Detheridge
2eb1f510c1 Merge pull request #2182 from overleaf/ta-remove-user-stubs
Remove Usages of UserStub

GitOrigin-RevId: 6896d0d3594d12ffa06211838ae2274661c77f4f
2019-10-01 12:09:49 +00:00
Timothée Alby
0c9bf05a0a Merge pull request #2139 from overleaf/ta-subscription-restore-misc
Restore Deleted Subscriptions Extra

GitOrigin-RevId: 6fceb1142af8ba510dc266ef31acc86ddca69f0e
2019-09-10 14:44:18 +00:00
Timothée Alby
71060e8d57 Merge pull request #2123 from overleaf/ta-subscription-restore
Restore Deleted Subscriptions

GitOrigin-RevId: 4df1d2116e5502235e06f47d7317d97ad458b75b
2019-09-10 14:28:55 +00:00
Eric Mc Sween
d0fc8d90e5 Merge pull request #2119 from overleaf/ta-subscription-deletion
Store Deleted Subscriptions

GitOrigin-RevId: c7004f1807dee6b6ec82eeb2a8fe939801ce3e8b
2019-09-09 12:05:23 +00:00
Eric Mc Sween
869fcf7952 Merge pull request #2089 from overleaf/em-mailchimp-unsubscribe
Handle error on Mailchimp unsubscribe when deleting users

GitOrigin-RevId: 8923480e6d50de45003fd7741610f995753a412b
2019-09-03 15:25:01 +00:00
Timothée Alby
03460ba229 Merge pull request #2020 from overleaf/ta-recurly-sca
SCA Integration

GitOrigin-RevId: d7935584f87ec7c7339d050430efc87420a39de1
2019-08-22 12:10:46 +00:00
Eric Mc Sween
358cd22f54 Merge pull request #2087 from overleaf/subscription-invoices-link
Add Link to Invoices for Recurly Subscriptions

GitOrigin-RevId: dd3aa999c26988f2bd42b0db83dbfb0ce586a0a7
2019-08-20 12:59:58 +00:00
Timothée Alby
b9ab0edf69 Merge pull request #2015 from overleaf/ta-recurly-upgrade
Upgrade Recurly

GitOrigin-RevId: 9a7c4804d2fafa31ea634498359dbfd95416b2ae
2019-07-31 08:33:31 +00:00
Timothée Alby
109585d20c Merge pull request #1947 from overleaf/ta-cleanup-guard-1
Remove __guard__ Function Used to Access Settings

GitOrigin-RevId: 15e3749990a9fc68f8d344390b1bf0d09d839106
2019-07-15 13:23:38 +00:00
Timothée Alby
b1e8cb9cf0 Merge pull request #1924 from overleaf/ta-full-error
Don't Callback with String

GitOrigin-RevId: 82e3efb055ef197d95ff9c8a876bee0d6a0327a3
2019-07-01 14:06:54 +00:00
Timothée Alby
e73a5d9103 Merge pull request #1923 from overleaf/ta-error-log-level
Reduce Log Level

GitOrigin-RevId: 63a8859e6b78cb0774a28069089f4bce73eb91ec
2019-07-01 14:06:36 +00:00
Simon Detheridge
d189dad162 Merge pull request #1865 from overleaf/ta-group-invite-self-view
Return User Data when Inviting Self in Group

GitOrigin-RevId: 5aeb9f0b21b84184a612ed730ac08dcb1c434f6e
2019-06-17 15:14:11 +00:00
Timothée Alby
e659703745 Merge pull request #1842 from overleaf/ta-remove-v1-sync
Remove v1 Sync on Features Refresh

GitOrigin-RevId: a99e0a74c4fc503bf81d0b847b3f331b3228e24f
2019-06-11 13:34:11 +00:00
Timothée Alby
8caea13193 Merge pull request #1845 from overleaf/ta-invite-self
Don't Send Invite when Group Manager Invite Self

GitOrigin-RevId: 35d7aecc82cf1124fbdac7fe986081b9556c23f9
2019-06-11 13:34:00 +00:00
Eric Mc Sween
5d2d7b894a Merge pull request #1833 from overleaf/em-edit-subscription-admin
Change admin button in subscription admin page

GitOrigin-RevId: d446f54299578c3806ef7146d2163ec24e831b6d
2019-06-05 16:19:26 +00:00
Timothée Alby
14cbeef31d Merge pull request #1806 from overleaf/ta-use-billing-name
Use Billing Name when Creating Subscription

GitOrigin-RevId: 66744faa7edde241340016bbb6c1bbc5fb53ede2
2019-06-04 11:23:55 +00:00
Timothée Alby
2deac5f3a1 Merge pull request #1805 from overleaf/csh-issue-1457-recurly-xml-builder
Don't Build Recurly XML Requests Manually

GitOrigin-RevId: bebe7f747715a33e681dc58fb89b529411a13860
2019-06-04 11:23:49 +00:00
Alasdair Smith
0ca81de78c Merge pull request #1717 from overleaf/as-decaffeinate-backend
Decaffeinate backend

GitOrigin-RevId: 4ca9f94fc809cab6f47cec8254cacaf1bb3806fa
2019-05-29 09:32:21 +00:00