github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-09-16 02:52:31 -04:00
Code Issues Projects Releases Packages Wiki Activity
10215 commits 3 branches 7 tags 221 MiB
Commit graph

355 commits

Author SHA1 Message Date
Alexandre Bourdin
3d5687a1f4 Merge pull request #4171 from overleaf/ta-remove-payment-page-form-fill 
Remove payment-page-form-fill Event

GitOrigin-RevId: 4befa04b9dd11906c93dd42693e08373f14b8cf0
 2021-06-11 02:06:09 +00:00
Alexandre Bourdin
551e2bfb5c Merge pull request #4084 from overleaf/ab-subscription-flow-events 
Subscription flow analytics events

GitOrigin-RevId: c74121031ba8623244657c607a76a513380e96f5
 2021-05-27 02:06:07 +00:00
Timothée Alby
88d00424cc Merge pull request #4002 from overleaf/cmg-subscriptions-new-validation 
Add missing validation messages on subscriptions new

GitOrigin-RevId: 451b75d4adb0d92911579f0ea728625c561b767f
 2021-05-20 02:05:11 +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
Thomas
682abe9ca5 Merge pull request #3980 from overleaf/tm-show-error-if-plan-change-fails 
Show error in plan change modal if plan change fails

GitOrigin-RevId: 698aab43feacdb5ced41f239167c5d132f7ca8de
 2021-05-18 02:08:20 +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
Thomas
d2dad0d802 Merge pull request #4011 from overleaf/tm-fix-group-plan-educational-discount-text 
Lowercase 'educational' for consistency in group plan modal text

GitOrigin-RevId: 139549dc96e71295f1eb5949fad66af1b4df4e16
 2021-05-08 02:10:15 +00:00
Miguel Serrano
a5e905f730 Merge pull request #3975 from overleaf/tm-change-default-group-subscription 
Make Enterprise the default group pricing and clarify related text

GitOrigin-RevId: c723c87fa97ca0f8e9a03039f05cb397e1213de3
 2021-05-06 02:09:32 +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
Jakob Ackermann
d2e6449e79 Merge pull request #3897 from overleaf/tm-meta-tags-billing 
[views] migrate subscription templates to meta tags, re-issue

GitOrigin-RevId: c18bb7c96186cc8c34344ecf7cee35f9da19698e
 2021-04-16 02:05:27 +00:00
Shane Kilkelly
16d02c9d8b Merge pull request #3882 from overleaf/ab-wfh-ga-events 
Add new GA events to WFH2021 links

GitOrigin-RevId: 939f589c359a97b794eceb8e493cccd95ec1913a
 2021-04-10 02:05:09 +00:00
Jessica Lawshe
2fca78eaf0 Merge pull request #3896 from overleaf/revert-3834-tm-meta-tags-billing 
Revert "[views] migrate subscription templates to meta tags"

GitOrigin-RevId: 8ab3dae6e3aa359b6d7aa69df70a1b1eb2405dfd
 2021-04-09 02:05:33 +00:00
Jessica Lawshe
e697064f16 Merge pull request #3834 from overleaf/tm-meta-tags-billing 
[views] migrate subscription templates to meta tags

GitOrigin-RevId: 4e81e81380048436a011467c230cc54c02e0c423
 2021-04-09 02:05:29 +00:00
Eric Mc Sween
5587de9cf5 Merge pull request #3833 from overleaf/em-meta-tags 
Pass values to JS through meta tags

GitOrigin-RevId: f663a1b7fef4544b560574d21f59fdabaf617830
 2021-04-01 02:05:44 +00:00
Simon Detheridge
3d48e1e027 Merge pull request #3799 from overleaf/tm-past-due-invoice-warning 
Show warning if users Recurly account has past due invoices.

GitOrigin-RevId: 8c501e7e561b201a3a184923c0681d67049464a9
 2021-03-31 02:05:33 +00:00
Alf Eaton
a5637651b5 Add Content-Security-Policy header (#3783) 
* Add Content-Security-Policy header
* Add nonce attribute to script tags
* Use source-map for webpack devtool
* Add ng-csp attribute when CSP is enabled
* Allow overriding CSP settings with environment variables
* Hook into render and allow routes to disable the CSP header

GitOrigin-RevId: a873736a3514198165f1b2f1e18d002b65f20d30
 2021-03-26 03:04:55 +00:00
Alf Eaton
974fe8fd39 Remove optional hyphens from pug templates (#3788) 
GitOrigin-RevId: 2d31719a6aaefb85bba323d65ed66bdb06ec8928
 2021-03-25 03:05:05 +00:00
Jakob Ackermann
58841ecbe9 Merge pull request #3765 from overleaf/jpa-xss-6 
[views] mitigate Angular XSS in subscription dashboard

GitOrigin-RevId: 4ac0c431d520957aabd53436ae29a30c2aef3870
 2021-03-18 03:04:34 +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
Thomas
2d8167fa0a Merge pull request #3675 from overleaf/tm-main-landmarks-a11y 
Add main landmark roles to multiple templates

GitOrigin-RevId: 80ae851fae015b21a3210d71d04287c0c9a3024d
 2021-03-05 03:05:00 +00:00
Alasdair Smith
dc9841cb69 Merge pull request #3723 from overleaf/as-fix-team-invite-xss 
Prevent stored XSS on team invite page

GitOrigin-RevId: 0f79b96efcb86d121654a95da52da1c40550d3ae
 2021-03-05 03:04:42 +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
Eric Mc Sween
c79d9ce8c5 Merge pull request #3672 from overleaf/em-wfh2021 
Updated notifications for WFH2021

GitOrigin-RevId: cfe50f04f1a837b070fcbf1486071ef1ff490ff0
 2021-02-18 03:05:08 +00:00
Hugh O'Brien
8d88b4ab5f Merge pull request #3574 from overleaf/hb-admin-improvements 
Fix spacing issue on subscriptions page

GitOrigin-RevId: 7f071cb3050d93781c853a175512cd29caf9d594
 2021-02-04 03:04:28 +00:00
Paulo Jorge Reis
a31e8a7525 Add address and postal code to the payment form (#3604) 
* Add address and postal code fields to the payment form

* Add validation styling for address line 2

GitOrigin-RevId: fe5467f1b3de608ccac4d9fa9fae861528b8cb2f
 2021-02-02 03:04:25 +00:00
Simon Detheridge
8e20258786 Merge pull request #3373 from overleaf/jpa-block-recurly-xss 
[views] subscription: block angular template evaluation for emails

GitOrigin-RevId: 081314a387234dfe263b954a4206a0c8bba8b153
 2020-11-10 03:04:14 +00:00
Jakob Ackermann
36f81a93b9 Merge pull request #3265 from overleaf/jpa-i18n-drop-html-from-vars 
[misc] i18n: drop html from vars

GitOrigin-RevId: 3cf2aa5a70cc8710693c24bd4b65bddcd4ba09e8
 2020-10-31 03:05:46 +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
Alasdair Smith
022424601d Merge pull request #3233 from overleaf/as-wfh-oct-update 
Update WFH banners to reflect end of discount offer

GitOrigin-RevId: a43370fd5c6bffd3ef108daf3e66e64765ef5792
 2020-10-02 02:04:13 +00:00
Alasdair Smith
0bf442c114 Merge pull request #3229 from overleaf/as-wfh-sept-update 
Add some copy about offer expiry date on WFH banners

GitOrigin-RevId: b0d6b235ef1fb43122476e266cb9095dc8812be4
 2020-09-27 02:05:22 +00:00
Timothée Alby
25b9243b3f Merge pull request #3115 from overleaf/msm-improve-student-subscription-dialog 
Improve student subscription dialog

GitOrigin-RevId: 902e76612c5a6a419ca305ae37459438ad7f75eb
 2020-08-19 02:06:29 +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
Jessica Lawshe
cc46e33681 Merge pull request #2920 from overleaf/ta-custom-subscription-contact 
Update Custom Subscription Wording

GitOrigin-RevId: a4582aadcae0689022ec0c74d4be4853c8cebf34
 2020-06-19 02:10:27 +00:00
Chrystal Maria Griffiths
d946ac2a99 Merge pull request #2918 from overleaf/cmg-covid-upgrades 
Update copy for WFH notifications for free users

GitOrigin-RevId: 420951266e431d490e05da736f9d167934364df3
 2020-06-19 02:10:10 +00:00
Jessica Lawshe
a64f9304ab Merge pull request #2903 from overleaf/jel-cards-list-location 
Include plans cards list location in itm_content

GitOrigin-RevId: 6919349a7812891e986dbe41af728169c5a36a0a
 2020-06-17 02:10:30 +00:00
Hugh O'Brien
cedb075b34 Merge pull request #2893 from overleaf/jel-plans-test 
Add hidden plans cards at bottom of page for A/B test

GitOrigin-RevId: a44ca8f3ee60a583187126af32dcdfedba4ee41d
 2020-06-10 02:12:41 +00:00
Chrystal Maria Griffiths
1e4b7aeace Merge pull request #2887 from overleaf/cmg-plans-covid-notification 
Add WFH notification to plans page

GitOrigin-RevId: 49597e4fdaa8fb047639105cb83e9aed8c30a260
 2020-06-06 02:09:45 +00:00
Paulo Jorge Reis
f2b9036e34 Merge pull request #2865 from overleaf/pr-handle-single-use-coupons 
Handle single-use coupons

GitOrigin-RevId: 13af3c6a360adf67e5b0bc70764558ddcc3efd9c
 2020-05-29 03:15:48 +00:00
Paulo Reis
d536ea8a24 Remove "Pay by invoice or VAT invoice" option from group account modal 
GitOrigin-RevId: bbcadc98c71a14a97e5c31c3877e83bb8f8bfce2
 2020-05-19 03:20:04 +00:00
Jessica Lawshe
43a88a0939 Merge pull request #2806 from overleaf/jel-add-space-change-plan 
Add a space before "Change plan"

GitOrigin-RevId: 99e39a65c251d5a09964891b3355b919b06df877
 2020-05-07 03:28:23 +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
Miguel Serrano
e2bf647b81 Merge pull request #2763 from overleaf/ta-dot-dot-dot 
Replace Triple-Dots with Ellipsis in Pug Files

GitOrigin-RevId: 408cea0772d8751acd8939e199e49e2cf9685b8f
 2020-04-23 03:29:02 +00:00
Eric Mc Sween
5c6ddfd53a Merge pull request #2744 from overleaf/pr-add-visa-notice-tos 
Add ToS link for new Visa free trial rules in the subscription form.

GitOrigin-RevId: 607f1057cee40b61b7910cb2afc1648dacfe49b6
 2020-04-17 03:23:35 +00:00
Eric Mc Sween
d68ebe7b41 Merge pull request #2684 from overleaf/sk-fix-subscription-track-changes-example 
Fix the "added and removed" part of new-sub page

GitOrigin-RevId: d78c0f913531d521e9538a17b48b409cf0f2cc00
 2020-03-25 04:16:49 +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
nate stemen
dda4ce18d3 Merge pull request #2556 from overleaf/cmg-missing-analytics 
Add missing Google Analytics events

GitOrigin-RevId: 37f8ca52829ea00bd73b2cd1e0045c48839ea970
 2020-02-04 04:18:59 +00:00
Alasdair Smith
f2ad7ebfc3 Merge pull request #2429 from overleaf/as-move-deps-to-bundle 
Move jQuery and Angular dependencies to bundle

GitOrigin-RevId: cee1507044438c8c435d934476f6ea6281215ccd
 2019-12-17 04:22:53 +00:00
Timothée Alby
4f7c2deca5 Merge pull request #2345 from overleaf/ta-itm-campaign-improvements 
ITM Fields Improvements

GitOrigin-RevId: 7e9a46dc2b935e2cad8cb8d2e21dfa3c81291c2d
 2019-11-12 09:15:05 +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