github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-10-24 21:12:38 -04:00
Code Issues Projects Releases Packages Wiki Activity
10041 commits 3 branches 7 tags 197 MiB
Commit graph

88 commits

Author SHA1 Message Date
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