github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-07 20:31:06 -05:00
Code Issues Projects Releases Packages Wiki Activity
18973 commits 3 branches 7 tags 201 MiB
Commit graph

416 commits

Author SHA1 Message Date
Hugh O'Brien
7d932f0b92 Merge pull request #5722 from overleaf/hb-improve-group-buy-ux 
Update the UX for the group subscription modal

GitOrigin-RevId: 6700a5c4907e0c966ee3b2954b6417ccf9edf37e
 2021-11-17 09:04:06 +00:00
Alexandre Bourdin
c881909258 Merge pull request #5716 from overleaf/ab-tear-down-de-ng-plans-page-test 
Tear down de-ng split test and cleanup old version

GitOrigin-RevId: 02438bbb2e530dfe72f046dd91c547d97c39c96e
 2021-11-09 09:04:51 +00:00
Thomas
ffdafb9700 Show prices including VAT in the upgrade to group subscription modal (#5463) 
* Add VAT calculation (with details) to the group upgrade modal

* Move 'per year' to seperate line to prevent text overflow

* Rename taxAmmount to taxAmount

GitOrigin-RevId: 37b7d471a704192d9cc4b96765f7449e747b2add
 2021-10-29 08:04:01 +00:00
Jakob Ackermann
59d83c4b88 Merge pull request #5117 from overleaf/jpa-plans-de-ng 
[web] de-ng plans page

GitOrigin-RevId: b902b10b45ab3fd46e71545c94f65e8f079c4564
 2021-09-23 08:03:23 +00:00
Thomas
895f52d41a Let users upgrade to group plans via subscription dashboard (#5100) 
* Let users upgrade to group plans via subscription dashboard

Users on an individual plan don't have a way to upgrade to a group
subscription without contacting support. As a temporary measure, we're
adding a way to do this by re-using the existing group plan modal from
the plans pages, to allow users to configure and upgrade to a group plan
directly.

This is currently only available for USD, EUR, and GBP - since although
we now support other currencies in Recurly, the group plans modal does
not yet support them. The user however can not change currency here,
their group subscription will be in the same currency as their current
individual subscription.

The group plan modal has been duplicated rather than extended, to keep
this code seperate as it is potentially only a stopgap measure - and we
don't want to be untangling the additional logic from the existing
modal/template later down the line.

GitOrigin-RevId: 10664bd19af2c3870dfe7e19fd0f9c5b7c877cc6
 2021-09-15 08:04:00 +00:00
Thomas
8ec01f59da Revert "Let users upgrade to group plans via subscription dashboard (#4704)" (#5047) 
This reverts commit f310eb10ef00d43076981589ee45893e7d9ab881.

GitOrigin-RevId: 63d884d60d63b9ad47ffc15f688dc81fc7c3d77a
 2021-09-10 08:04:24 +00:00
Thomas
5f550b0a11 Let users upgrade to group plans via subscription dashboard (#4704) 
Users on an individual plan don't have a way to upgrade to a group
subscription without contacting support. As a temporary measure, we're
adding a way to do this by re-using the existing group plan modal from
the plans pages, to allow users to configure and upgrade to a group plan
directly.

This is currently only available for USD, EUR, and GBP - since although
we now support other currencies in Recurly, the group plans modal does
not yet support them. The user however can not change currency here,
their group subscription will be in the same currency as their current
individual subscription.

The group plan modal has been duplicated rather than extended, to keep
this code seperate as it is potentially only a stopgap measure - and we
don't want to be untangling the additional logic from the existing
modal/template later down the line.

GitOrigin-RevId: f310eb10ef00d43076981589ee45893e7d9ab881
 2021-09-10 08:04:18 +00:00
Alexandre Bourdin
ffb30435d8 Merge pull request #4825 from overleaf/ab-cleanup-sub-page-split-test 
Cleanup subscription page split test and set variant as new copy

GitOrigin-RevId: b7a19cf5f744d9181b71200351dc5a92db939e92
 2021-09-01 08:03:01 +00:00
Jessica Lawshe
379d9ac41c Merge pull request #4659 from overleaf/jel-em-duplicate-subscription-message 
One Pro message per current commons institutions

GitOrigin-RevId: 21b74af8b9da1b6647a0384115f5d268b80e4bdf
 2021-08-17 08:03:44 +00:00
Jessica Lawshe
bb882c697c Merge pull request #4288 from overleaf/jel-skip-to-content 
Add "Skip to content" to improve accessibility

GitOrigin-RevId: 43368a65057656bdea10b6be3c598d68bd8e2d40
 2021-07-28 02:06:54 +00:00
Jakob Ackermann
41471ec60f Merge pull request #4292 from overleaf/tm-handle-recurly-pricing-errors 
Handle Recurly pricing API errors and add coupon code error display

GitOrigin-RevId: b86a42a059984a7efa596db85bbcedb93c0e7376
 2021-07-28 02:05:54 +00:00
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
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
Alasdair Smith
9cf73f965c Merge pull request #1440 from overleaf/as-amd-webpack 
Bundle all frontend code with webpack

GitOrigin-RevId: 1bd93dad516c456fe1649193868e841e20459b0b
 2019-10-16 10:36:21 +00:00
Simon Detheridge
c1f43ad60e Merge pull request #2183 from overleaf/em-plans-faq 
Allow linking inside plans FAQ invoice answer

GitOrigin-RevId: 20fb07f0f8fafee65efaa1f4467013cccc7a154d
 2019-10-01 12:10:06 +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
Eric Mc Sween
1fc64fc4e2 Merge pull request #2084 from overleaf/ta-new-subscription-country 
Fix Country Auto-Selection on New Subscription Form

GitOrigin-RevId: fdf7b197017ee9ce527dd7737240756ff16d206a
 2019-08-20 12:59:47 +00:00
Timothée Alby
7785c7b59e Merge pull request #2029 from overleaf/ta-build-main-recurly-3 
Load Recurly JS Separately

GitOrigin-RevId: 8baa2be76fa9d8a47676bc0bd0a80f4c05cc1600
 2019-07-31 15:44:44 +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
Simon Detheridge
82672269c4 Merge pull request #1862 from overleaf/em-json-stringify 
Globally apply StringHelper.stringifyJsonForScript()

GitOrigin-RevId: 82dc812a43a1e6f389471380a6a430c0a18dcec2
 2019-06-17 15:14:25 +00:00
Simon Detheridge
3990a5d736 Merge pull request #1724 from sharelatex/ta-subscription-canceled-page 
Add Subscription Canceled Page

GitOrigin-RevId: b490ff008dd888911e8168606d90ae92662c0745
 2019-04-25 14:37:15 +00:00
Timothée Alby
85e7f688d5 Display Pricing Exceptions on Subscription Dashboard (#1720) 
Display Pricing Exceptions on Subscription Dashboard

GitOrigin-RevId: 31de89824db70b7af1f8704e6da592064ce44bfd
 2019-04-23 14:35:21 +00:00
Timothée Alby
44ba16bb7c Fix Wording in Subscription Cancellation Flow (#1723) 
Fix Wording in Subscription Cancellation Flow

GitOrigin-RevId: 27b89982d0ac9d4bc9e9b985df2dd515253a1368
 2019-04-23 14:35:14 +00:00
Alasdair Smith
41f75b5936 Merge pull request #1543 from sharelatex/as-fix-potential-angular-xss 
Fix potential Angular XSS issues

GitOrigin-RevId: a18a609a25b29e910cb78e28a37398417cfe4842
 2019-03-18 10:37:15 +00:00
Timothée Alby
72ae3f3aa5 Merge pull request #1601 from sharelatex/hb-metrics-email-bugfixes 
Fixes for unsubscribing from metrics email

GitOrigin-RevId: 7d7ae79275d6216ef2b44d2e75c51fabf460ef65
 2019-03-11 11:07:20 +00:00
Douglas Lovell
24da4799ed Merge remote-tracking branch 'origin/jel-payment-countries' 
GitOrigin-RevId: 412422397ad36408566899b7b2bcbbaabf88138b
 2019-03-11 11:05:58 +00:00
Douglas Lovell
44dd7c1c75 Merge remote-tracking branch 'origin/as-fix-email-address' 
GitOrigin-RevId: 5fa0d5b540f0d7b79a1dab0c6dc345bcb06d04e2
 2019-03-11 11:05:36 +00:00
Simon Detheridge
96759a90f4 Merge pull request #1578 from sharelatex/jel-student-disclaimer 
Show disclaimer on student subscription trials

GitOrigin-RevId: dfac98e74b3bc34742a179193cc8ce92deb14229
 2019-03-11 11:04:46 +00:00
Hugh O'Brien
491c29bad1 Merge pull request #1569 from sharelatex/hb-v2-metrics-email-opt-out 
v2 metrics email opt out and last sent tracking

GitOrigin-RevId: d45ac653c26e780dc380883c0ac1da7436bf8c2b
 2019-03-11 11:03:39 +00:00
Simon Detheridge
6e960492ff Merge pull request #1550 from sharelatex/spd-fix-broken-team-invite-accept 
Fix broken accept-team-invite page

GitOrigin-RevId: 0ba3c906548358931902beb48812257da16fc5db
 2019-03-11 11:01:10 +00:00
Simon Detheridge
5d8b8ff012 Merge pull request #1530 from sharelatex/spd-dont-cancel-groups-on-invite 
Only prompt for group cancellation if group is personal when accepting invite

GitOrigin-RevId: 921807b25d64f037859d303e28c40cdc12eb7685
 2019-03-11 11:00:48 +00:00
Chrystal Maria Griffiths
9abea8ae5f Merge pull request #1516 from sharelatex/as-sanitize-team-notice 
Show sanitized HTML for team notice on subscription page

GitOrigin-RevId: 20256eed298a709d663bdfd0057e0d8462722a0c
 2019-02-15 13:33:28 +00:00
Simon Detheridge
255981bdc2 Merge pull request #1486 from sharelatex/ta-subscription-dash-fix 
Fix Subscirption Dashboard Messaging

GitOrigin-RevId: 601b0df74c6f9f6bcc1c3ba6ecbf64721bc6fb99
 2019-02-11 11:42:34 +00:00
Chrystal Maria Griffiths
2463fef390 Merge pull request #1454 from sharelatex/hb-subscriptions-page-messaging 
Subscription page messaging updates

GitOrigin-RevId: c29999d22636dfe11c55b3f6110a38992645fad3
 2019-02-04 16:24:35 +00:00
Timothée Alby
9a0dd31d8c Merge pull request #1061 from sharelatex/ja-remove-domain-license-code 
Remove deprecated domain license code

GitOrigin-RevId: c9eebe1a657b07b69d618cdb5e73b64782109714
 2019-01-29 12:08:29 +00:00
Timothée Alby
300e7d2f12 Merge pull request #1449 from sharelatex/ta-subscription-page-fix 
Fix Subscription Page for Users with Free Affiliation

GitOrigin-RevId: 3b3b2649c4ade40c7dc04e7c090748408de1fb6e
 2019-01-28 14:38:16 +00:00
Timothée Alby
6985f7d1a3 Merge pull request #1443 from sharelatex/jel-vat-plans-page 
Add VAT text to plans page

GitOrigin-RevId: a0693737cbf57bbb094e9ee77273bab1b687e619
 2019-01-28 14:38:08 +00:00
Timothée Alby
837302327e Merge pull request #1407 from sharelatex/ta-team-status-free 
Hide Free v1 Teams on Subscription Dashboard

GitOrigin-RevId: ba805e77eb1f994158d3ceaa42be23943fca0f1f
 2019-01-17 15:15:44 +00:00
Timothée Alby
5169b4a73f Merge pull request #1415 from sharelatex/ta-trial-fix 
Check if Trial is Current in Subscription Page

GitOrigin-RevId: 7a7f562d321bc0f3a952c37f799760a7d42b7ba1
 2019-01-17 15:15:33 +00:00
Shane Kilkelly
97e357f772 Merge pull request #1260 from sharelatex/ja-remove-deprecated-v1-team-status 
Remove deprecated display of v1 team data in v2

GitOrigin-RevId: d0198e5ed325ff689f5381a0be05493af35e5f8d
 2018-12-20 10:55:52 +00:00
Douglas Lovell
740dce07a9 Merge remote-tracking branch 'origin/hb-publisher-management' 
GitOrigin-RevId: 746cb15097cdc7c4f4cbd9f029d5e456c9bfe3ad
 2018-12-18 13:42:56 +00:00
Douglas Lovell
aae0484458 Merge branch 'master' into dcl-i1207 
GitOrigin-RevId: c947041ca99860d4afb62ecfd28ba6fe1c717bfc
 2018-11-30 13:24:27 +00:00
Douglas Lovell
ed3147a58f Allow open from template button when lacking source 
GitOrigin-RevId: 8fd49bff6cc0f66d041bb70f9345b2744978be3a
 2018-11-30 13:24:23 +00:00
James Allen
ee800f7448 Merge pull request #1176 from sharelatex/ja-manage-v1-subs 
Manage v1 subscriptions from v2

GitOrigin-RevId: 1fd63b3630f781e8b4cc3dc1413966540e8d0076
 2018-11-30 10:43:37 +00:00
Timothée Alby
701ba90c7b Merge pull request #1182 from sharelatex/ja-dashboard-metrics-links 
Add links to metrics and hubs for groups and institutions

GitOrigin-RevId: ca83108e1d1541fdc805218ea12847b0d7a97cf8
 2018-11-26 13:43:05 +00:00
James Allen
49e19cad64 Merge pull request #1162 from sharelatex/ja-show-group-management 
Add group and institution membership and management info to subscription dashboard

GitOrigin-RevId: 1aba5d5a20cd00ff5090811d0f66dc9c4944dd60
 2018-11-20 11:03:56 +00:00
James Allen
0f1c732d15 Merge pull request #1130 from sharelatex/ja-subscription-dashboard 
Refactor subscription dashboard

GitOrigin-RevId: 3573822b8b48c7181c661b2c253d7713f4a4328c
 2018-11-19 16:01:59 +00:00
Brian Gough
8bf9d79d2f Merge pull request #1157 from sharelatex/jel-aria-hidden-fix 
Add value to aria-hidden attribute

GitOrigin-RevId: 09b17a269b8d91c5f4b4e231877db0431b0308a9
 2018-11-19 09:57:35 +00:00
Jessica Lawshe
d97fe4e39d Merge pull request #1142 from sharelatex/jel-img-alt-and-icon-alt-a11y 
Image alt tags and accessible icons

GitOrigin-RevId: 58f0609682c0dbeec95cad4e234e3f94b7b3c004
 2018-11-15 17:41:22 +00:00
James Allen
140f97eb20 Merge pull request #1107 from sharelatex/ja-purchase-groups 
Purchase group/team accounts directly via app

GitOrigin-RevId: 1a502878753de77758fb431f45a6366f199f1cb0
 2018-11-13 13:50:46 +00:00