Commit graph

285 commits

Author SHA1 Message Date
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
Jessica Lawshe
fceb8e9e66 Merge pull request #1096 from sharelatex/jel-plans-mobile-layout
Plans page mobile layout

GitOrigin-RevId: d650447bd7df4eda17471c2fa7fb2b376fcc0172
2018-11-08 16:11:49 +00:00
Tim Alby
48e5c6b523 add UserMembership logic 2018-10-09 12:09:11 +01:00
Jessica Lawshe
d2af2fb630 Merge pull request #927 from sharelatex/jel-plans-updates
Plans page updates
2018-09-20 09:00:58 -05:00
Jessica Lawshe
4f5c12e9ac More specific group contact controller name and email subject
This form is only used on the group contact modal.
2018-09-17 10:47:57 -05:00
Tim Alby
09c92c0b69 don't encode / 2018-09-14 16:09:24 +01:00
Tim Alby
2e4d3d7aab change links to v1 to sign user in first 2018-09-14 14:26:16 +01:00
Jessica Lawshe
c3c2e524f5 Add quotes 2018-09-05 08:14:32 -05:00
Jessica Lawshe
40a412b6b9 Remove plans message about v2 beta 2018-09-05 08:14:05 -05:00
Jessica Lawshe
65b2715e62 Remove unused layout for v2 plans 2018-09-05 08:14:05 -05:00
Jessica Lawshe
dff29637b7 Move quotes to partial 2018-08-30 09:52:55 -05:00
Jessica Lawshe
eb8e279ac7 Add border styling 2018-08-30 09:52:55 -05:00
Jessica Lawshe
7d249f513b Remove Positive SSL badge for v2 2018-08-30 09:52:55 -05:00
Jessica Lawshe
c1d37a712c Update translations to use appName 2018-08-30 09:52:55 -05:00
Jessica Lawshe
c920dc37d2 Update button classes for v2
Use `.btn-default` instead of `.btn-info`
2018-08-30 09:52:55 -05:00
Jessica Lawshe
26f2ff3d6f Unlink instapages for v2 FAQ and add group contact modal
group contact link: v2 opens contact portal and SL opens instapage
2018-08-30 09:52:50 -05:00
Jessica Lawshe
e1fbef6910 Move style from winning test variant to main class
`.more-details` contained style for the winning variant. Move these CSS declarations to main class of page, `.plans`.

Also alphabetize CSS classes.

Remove .more-details and extra .container from layout

CSS statements for .more-details were moved to .plans
2018-08-28 12:42:09 -05:00
Jessica Lawshe
ae85bfafef Move FAQ to partial 2018-08-28 12:42:09 -05:00
Jessica Lawshe
e5c3d72e1a Move winning variant layout to main layout 2018-08-28 12:42:09 -05:00
Jessica Lawshe
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
Jessica Lawshe
5b5ece37a5 Handle sixpack timeouts and include variant in metabase segmentation
Render default when sixpack timesout

Only convert when variant exists

Use Angular cookies module to add variant cookie, which is used on the new subscription page.
2018-08-17 10:29:45 -05:00
Alberto Fernández Capel
d76a6ae710 Ensure overleaf settings is defined before linking to the v1 subscription page 2018-06-29 15:33:03 +01:00
James Allen
c004cdb200 Remove hardcoded ShareLaTeX reference in upgrade blurb 2018-06-22 14:24:41 +01:00
Jessica Lawshe
ad50db858e Merge pull request #664 from sharelatex/jel-pricing-plans-event
Plans and Pricing Google Analytics events
2018-06-19 08:48:12 -05:00
James Allen
a3e92a8867 Merge pull request #658 from sharelatex/ja-enable-subscriptions
Add message explaining Collaborator subscription to v1 users
2018-06-19 08:37:50 +01:00
Jessica Lawshe
fe225fbbd3 Include event label when features table viewed 2018-06-15 16:29:42 -05:00
James Allen
eda031023c Update subscription thank you page to remove ShareLaTeX references 2018-06-14 10:15:20 +01:00
James Allen
1e7601d647 Add null check to subscription dash 2018-06-14 09:03:14 +01:00
James Allen
e5bd7ce551 Add message explaining Collaborator subscription to v1 users 2018-06-13 17:22:34 +01:00
James Allen
a417dc8ff4 v1Subscription -> v1Subscriptions 2018-06-12 13:52:47 +01:00
James Allen
9d84263463 Fetch subscription details from v1 and display to user 2018-06-12 13:52:46 +01:00
James Allen
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