github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-21 20:47:08 -05:00
Code Issues Projects Releases Packages Wiki Activity
21562 commits 3 branches 7 tags 206 MiB
Commit graph

512 commits

Author SHA1 Message Date
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
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
James Allen
ed5bc70350 Tweak front-end layout 2018-06-11 14:20:46 +01:00
Alberto Fernández Capel
c4250e601e Minor copy change Registered -> Accepted invite 2018-06-07 16:53:19 +01:00
Alberto Fernández Capel
5e70825c94 Rename view variable to invite 
Makes the meaning more explicit
 2018-06-07 16:12:02 +01:00
Alberto Fernández Capel
6639f61a43 Remove extra space between rows 2018-06-07 14:05:10 +01:00
Alberto Fernández Capel
4885b70016 Better translation key 2018-06-06 16:33:01 +01:00
Alberto Fernández Capel
06efe1910b Replace hardcoded string 2018-06-06 15:36:53 +01:00
Alberto Fernández Capel
b308dcef63 Clean up markup 
- Avoid nested rows without cols in them
- Use .row-spaced instead of empty rows to space content
 2018-06-06 15:36:53 +01:00
Jessica Lawshe
679d91c4d2 Update default plans view conditional 
Fixes a flash of unwanted content on Firefox
 2018-06-05 12:58:18 -05:00
Alberto Fernández Capel
6fb6119ca8 Merge remote-tracking branch 'origin' into afc-email-tokens 2018-06-05 15:42:17 +01:00
Jessica Lawshe
10cf5825a5 Add plans variant 
Also, fix for multiple quotes. Without a closing quote subsequent quotes are considered nested, and
will use a ‘ instead of “

Also, move repeated elements to partials
 2018-06-04 14:42:26 -05:00
Alberto Fernández Capel
d262de14d6 Use team invites to join domain licensed teams 2018-05-31 16:15:47 +01:00
Alberto Fernández Capel
39c8595c27 Split SubscriptionGroupInvites and rename to DomainSubscriptionJoin 
To not cause confusion with team invites.
They are not really an invite because they are user initiated, but
more of a user choosing to join a team.
 2018-05-31 14:25:47 +01:00
Alberto Fernández Capel
11edfde153 Accept & revoke team invites 2018-05-31 11:54:50 +01:00
Alberto Fernández Capel
9aa95cb0d5 Show team invites 2018-05-30 13:06:27 +01:00
Alberto Fernández Capel
7e09c0e0b1 First stab at email token invites (WIP) 2018-05-30 11:29:21 +01:00
James Allen
d2e54c5e0c Merge pull request #504 from sharelatex/afc-show-group-export-csv 
Show export user CSV even if the group has reached max capacity
 2018-05-01 08:50:04 +01:00
Henry Oswald
c6f4df4f77 Merge pull request #498 from sharelatex/ho-recurly-v4 
Payment page improvments
 2018-04-24 09:01:34 +01:00
Jessica Lawshe
5d5edb7808 Button text for annual plan 
Annual plan users are charged right away but `upgrade_cc_btn`
translates to `Upgrade now, pay after 7 days`.

Update the button for annual plans to use `upgrade_now`, which
translates to `Upgrade Now`
 2018-04-23 11:34:34 -05:00
Alberto Fernández Capel
5d266c7f04 Show export user CSV even if the group has reached max capacity 2018-04-17 16:12:33 +01:00
Henry Oswald
b5e6181c49 added .capitalised style 2018-04-17 11:26:02 +01:00
Henry Oswald
45f51c9a27 change country select to proper angular setup so pre population works 
it may have been broken from an angular upgrade or similar.
 2018-04-16 15:12:03 +01:00
Henry Oswald
e64c398352 capitalise month and year on payment page 2018-04-16 15:11:31 +01:00
Henry Oswald
39e41681a0 change to plans[currencyCode]['symbol'] from price.currency.symbol 
price.currency.symbol returns bad chars. '£12.00' and '€14.40' for
eur
 2018-04-16 12:19:55 +01:00
Henry Oswald
086f080ee4 add !isFormValid(simpleCCForm) back in, was used during debugging 2018-04-16 11:01:14 +01:00
Henry Oswald
c3eeefdc5b only use recurly.js from our public libs folder 2018-04-16 10:52:33 +01:00
Henry Oswald
7940b60144 make a seperate external error class which is used on entire payment form 2018-04-16 10:35:12 +01:00
Henry Oswald
06fb31533f add highlight for bad card/cvv/mmyy number in. 2018-04-16 10:26:39 +01:00
Henry Oswald
a1be0e95b4 remove the dead validation 2018-04-16 10:10:25 +01:00
Henry Oswald
c050791905 change ng to use show/hide 
ng-if doesn't render html until evaulated to true, need the form
to be there at time of recurly.configure
 2018-04-13 16:57:33 +01:00
Henry Oswald
ccef0760ae remove the form control, it just breaks the iframe styling 2018-04-13 16:51:55 +01:00
Henry Oswald
ae3858bcd0 can subscribe using new form. terrible styling 2018-04-13 16:35:32 +01:00
Henry Oswald
7e8b59cbb3 wip form loads as ifram 2018-04-13 16:01:41 +01:00
Jessica Lawshe
18c6802b84 Revert "Revert "Merge pull request #480 from sharelatex/jel-remove-old-exp"" 
This reverts commit 5c3f391041303456aeb800522c0fdcfe900625ac.
 2018-04-12 13:53:26 -05:00
Jessica Lawshe
5290c29ce1 Revert "Merge pull request #480 from sharelatex/jel-remove-old-exp" 
This reverts commit c5919be6d2e880ac4d3f5820c38211b1c88812ff, reversing
changes made to 3c8772cf020738c767b6f7a956bd002b47988932.
 2018-04-12 13:25:42 -05:00
Jessica Lawshe
5683f48d97 Fix conditional 2018-04-12 10:18:15 -05:00
Jessica Lawshe
f44ddcb928 Remove "plans-1610" experiment 
There is 1 place that the variants appear still,
`/web/public/coffee/main/subscription-dashboard.coffee`. This should
remain for users that bought these plans.
 2018-04-12 10:18:15 -05:00
Jessica Lawshe
89cfd98af3 Add details to analytics label 2018-03-20 08:31:35 -05:00
Paulo Reis
8b9f3268b1 Make plans page consistent with others, fixing header issues. 2018-01-03 13:54:33 +00:00
Henry Oswald
ec41f984e6 Merge branch 'ho-remove-groove' 2017-12-20 13:37:15 +00:00
Shane Kilkelly
cc9986cefd Remove the obsolete update-billing-details page 2017-11-28 11:52:14 +00:00
Shane Kilkelly
22c163c60a Move the recurly-billing-details link up to main subscription page 2017-11-28 11:40:48 +00:00
Henry Oswald
7ce56aa3b6 add http catch onto form 2017-11-28 10:13:54 +00:00
Henry Oswald
b16862fa31 add error handling for form 2017-11-27 18:03:42 +00:00
Henry Oswald
7eb2f0d917 move generic sales modal to use new support endpoint 2017-11-27 12:49:12 +00:00
Shane Kilkelly
caa65dddc1 Send user to hosted recurly billing-details page. 
And remove our update-billing-details form, the APIs for which will be
deprecated soon.
 2017-11-23 16:16:13 +00:00
Henry Oswald
085cc7a0b2 json stringify and trim recommended currency 2017-03-14 17:53:48 +00:00
Henry Oswald
58c7dda945 fix couple of bad translations 2017-02-17 11:05:32 +00:00
Shane Kilkelly
b0dd7475b0 fix pug syntax 2017-01-31 14:57:22 +00:00
Shane Kilkelly
57cd54bf55 WIP: migrate from jade to pug 2017-01-20 12:03:02 +00:00
Shane Kilkelly
acce8853ba Remove redundant baseUrl from plans page. 2016-11-25 15:24:50 +00:00
Henry Oswald
11a097c9a6 remove some old sixpack tests 2016-11-02 10:09:12 +00:00
Shane Kilkelly
a63f7685b8 Move the planCode logic for Collaborator into a helper function. 2016-11-02 09:56:33 +00:00
Shane Kilkelly
e268275e77 Fix participate/convert flow for plan tests 2016-10-25 10:47:14 +01:00
Shane Kilkelly
667c7ce520 Show correct number of collaborators for plans 2016-10-24 11:47:01 +01:00
Shane Kilkelly
c051b56abf Cloak plans until they have loaded 2016-10-24 11:24:28 +01:00
Shane Kilkelly
d5a7514923 Add AB test for plans (+15 squashed commits) 
Squashed commits:
[45c2237] Add a `subscription-form-switch-to-student` event
[1ad9b8f] change experiment name, and re-enable switch-to-student workflow
[f7cdb78] Remove debug
[4b9778a] Incorporate collaborator alternative plans
[701e80b] Add collaborator plans for heron and ibis
[287aa0f] AB test plans from editor page
[c74052e] Fix change-plan view for default plans
[1a947d6] Use correct plan codes
[1eecda7] Adjust prices
[69c4c7b] Introduce two plans
[8b8d5f8] Rename sixpack experiment
[c332002] Fix up the change-plan page
[c7af52d] Overhaul change-plan page, show only plans from current generation
[33d86bf] update plan
[5bbd946] Add a basic plans AB test
 2016-10-21 16:17:37 +01:00
Shane Kilkelly
3ec0e65ae1 Merge branch 'master' into sk-end-subform-test 2016-10-12 14:34:55 +01:00
Brian Gough
380487abf0 use separate jade template block for requirejs 
removes the need to suppressDefaultJs
 2016-10-11 14:31:04 +01:00
Shane Kilkelly
e2cf40ff33 Remove old default subscription form, replace with 'simple' form 2016-10-11 14:07:31 +01:00
Brian Gough
0f2959eb3b use suppressDefaultJs instead of suppressFooter 2016-10-11 13:04:10 +01:00
Henry Oswald
3141f91b59 Merge pull request #322 from sharelatex/ho-password-limits 
Ho password limits
 2016-10-05 10:03:54 +01:00
Henry Oswald
0d0f0e8604 wip 2016-09-23 16:38:46 +01:00
Henry Oswald
67f8ec756c Revert "wip" 
This reverts commit a6c0b3e2bf9fd747cfce785a023e5f56614a8ca2.
 2016-09-23 16:19:11 +01:00
Henry Oswald
7c0e338352 fix bug where users are always shown downgrade option when not required 2016-09-23 16:18:22 +01:00
Henry Oswald
0802ab6ddc wip 2016-09-23 15:44:47 +01:00
Paulo Reis
bba39cc902 Also hide button, when viewing student plans. 2016-08-31 11:40:27 +01:00
Paulo Reis
09c188030c Hide sign up button via visibility, to keep the layout fixed. 2016-08-30 17:42:23 +01:00
Paulo Reis
c82ab65077 Bind to an object to avoid writing in different . 2016-08-24 11:02:53 +01:00
Paulo Jorge Reis
f4aab93dfa Merge pull request #303 from sharelatex/pr-ab-subscription-form 
PR AB Subscription form
 2016-08-24 09:45:36 +01:00
Paulo Reis
ba71ed2a3d Merge branch 'master' into pr-ab-subscription-form 2016-08-23 14:10:19 +01:00
Paulo Reis
8abf839d55 Add country to the paypal form. 2016-08-23 13:36:54 +01:00
Paulo Reis
bc16999a4e Validate on blur; reset validation on focus. 2016-08-23 11:55:23 +01:00
Paulo Reis
f79bee7893 Loading indicator when submitting. 2016-08-23 11:27:09 +01:00
James Allen
bcc8bfbe6c Redirect to working update billing details end point that shows a nice message 2016-08-22 17:36:33 +01:00
Paulo Reis
23ed1e2aa3 Add form validation. 2016-08-22 17:03:29 +01:00
Shane Kilkelly
03aa9b87f1 Add debug query string origin to invocations of the updateSubscription endpoint. 2016-08-22 10:09:54 +01:00
Paulo Reis
f4b8cc7fc8 Use first and last name instead of full name as input. 2016-08-19 16:46:44 +01:00
Paulo Reis
53c6e48da9 Remove left-hand panel experiment. 2016-08-19 16:03:15 +01:00
Paulo Reis
6a1f0de912 Add i18n keys. 2016-08-19 15:12:05 +01:00
Paulo Reis
452abe94be Add coupon code, VAT and pricing breakdown. Styling adjustments. 2016-08-19 14:51:07 +01:00
Paulo Reis
26e21732f8 Added validations + minor fixes. 2016-08-18 17:41:55 +01:00
Paulo Reis
43b832965f Layout and styling for simple subscription form. 2016-08-18 16:56:23 +01:00
Paulo Reis
4814fc2606 Simple layout for subscription form. 2016-08-17 17:34:17 +01:00
Paulo Reis
672d4f8767 Setup AB test (alternative is still empty). 2016-08-17 12:11:17 +01:00
Henry Oswald
a2a8b7123b created buildCssPath img and js path funcs 2016-07-18 17:18:51 +01:00
Henry Oswald
c21549220c mvp for cdn 2016-07-18 14:05:07 +01:00
Henry Oswald
101e98ed83 simpliyfied dashboard & fixed error with leave group shown to group owner 
- always show the manage button if you are the group owne
- only show the recurly subscription part if you are the subscription owner
- always try and loop through groups you can leave
 2016-06-16 09:17:43 +01:00
Henry Oswald
cb3eb88af2 Merge branch 'subscriptionimprovements' 2016-03-31 11:58:56 +01:00
Henry Oswald
db8fb63bb5 fixed change payment details page 
also increased size of year field for firefox users
and removed unnded options in new plan page
 2016-03-31 11:54:52 +01:00
Henry Oswald
c554b0630d if user has subscription before joining group is given option to cancel personal one 2016-03-22 16:59:47 +00:00
Henry Oswald
85a8bc97ed add leave group button for group subscriptions 2016-02-19 12:27:32 +00:00
Henry Oswald
8af9aa6396 move wufoo form on plans page to groovehq 2016-02-03 16:50:34 +00:00
Henry Oswald
1f6b43e1b1 added universties site angular controler 2016-02-01 14:33:50 +00:00
Henry Oswald
d202538504 added ng-cloak to successful subscription page 2016-01-04 12:22:31 +00:00
Henry Oswald
5f66dbebf4 2015 -> 2016 2016-01-04 11:12:10 +00:00
Henry Oswald
134e733b01 change succesful subscription message 2015-12-21 10:31:22 +00:00
Henry Oswald
297e33f1a0 remove unneeded hide on cancelation basic 2015-12-09 14:44:26 +00:00
Henry Oswald
d5cf8f6886 simplified cancelation logic 2015-12-09 13:58:26 +00:00
Henry Oswald
7a88afc953 make button for downgrade centered and lower 2015-12-09 12:09:17 +00:00
Henry Oswald
bdc2206ef1 yes_please != yes_please! 2015-12-09 12:03:18 +00:00
Henry Oswald
db8349351d escape html in cancel message 2015-12-09 12:01:55 +00:00
Henry Oswald
e6f92c181f ill_take_it != ill_take_it! 2015-12-09 12:00:31 +00:00
Henry Oswald
56fa51f9b2 got translations done for subscription dashboard 2015-12-09 11:24:14 +00:00
Henry Oswald
aafdeb031e wip - downgrade options it all works, need unit tests & translations 2015-12-08 18:23:28 +00:00
Henry Oswald
8fb1f9e00b wip: downgrade to student if they are a collab monthly 2015-12-08 15:45:52 +00:00
Henry Oswald
89b2cd8477 added secure banner to both payment forms 2015-11-23 17:10:53 +00:00
Henry Oswald
003cdc01fc consolidated 2 options in payment left menu 2015-11-18 15:21:48 +00:00
Henry Oswald
b1c0dfb0e4 show discount rate on pricing page 2015-11-17 12:23:27 +00:00
Henry Oswald
264839e27d don't show tax or subtotal if there is no info on it 2015-11-17 11:44:31 +00:00
Henry Oswald
d959a51f36 show normal price if there is a discount 2015-11-17 11:42:03 +00:00
Henry Oswald
8a6c3b5838 covert payment-left-menu test 2015-11-12 09:57:06 +00:00
Henry Oswald
3a61f48068 added payment page with security seal 2015-11-11 17:59:35 +00:00
Henry Oswald
cf6998cac3 added ab test into payment page left hand feature list 2015-11-11 16:42:04 +00:00
Henry Oswald
453415ff7c fixed tab index on payments page 2015-11-11 16:22:07 +00:00
Henry Oswald
730088b6ab set button colour to red for free trial 2015-10-27 23:35:13 +00:00
James Allen
64ffcde3df Namespace subscription groups as SubscriptionGroup 2015-10-05 16:37:03 +01:00
James Allen
ec5e03bd01 Fix subscription currency dropdowns 2015-08-04 15:58:31 +01:00
James Allen
0eec715bb5 Upgrade to Angular 1.3.15 and latest ui-bootstrap 2015-06-09 14:59:12 +01:00
Henry Oswald
aaa902cca9 fixed bug with subscriptions where if an old user had a subscription and was in a group they would get a confusing page 2015-06-01 14:38:09 +01:00
Henry Oswald
33aa5c732f if a domain licence link has expired render a nice message explaining they need to retry 2015-06-01 12:43:42 +01:00
Henry Oswald
cb48242b74 changed email expire to 1 day for verifying account 2015-06-01 12:22:46 +01:00
Henry Oswald
d3f6c0c614 Merge branch 'user-csv' of git://github.com/heukirne/web-sharelatex into heukirne-user-csv 2015-05-29 12:17:54 +01:00
Henry Oswald
702fdc1480 improved views for domain licence invites 2015-05-29 12:09:28 +01:00
Henrique Dias
f50eb0398f add export csv group feature 2015-05-28 16:54:41 -03:00
Henry Oswald
ca28d8ee70 changed views to use translations 2015-05-27 22:15:46 +01:00
Henry Oswald
b657c5207e cleaned up the views a bit 2015-05-27 21:45:29 +01:00
Henry Oswald
481bd67fbd changed paths to use hyphens and add succesfull join page 2015-05-26 15:26:45 +01:00
Henry Oswald
cad8d8a23b v1 basic invite works, not pretty or tested 2015-05-22 13:57:15 +01:00
Henry Oswald
97f0fad525 add vat number option to payment form 2015-03-04 18:08:06 +00:00
Henry Oswald
216c9cefe3 don't error on subscription dashboard page if there is no subscription.taxRate 2015-02-12 09:21:45 +00:00
Henry Oswald
1d6c928c81 fix bug which showed all plans as monthly in payment form. 
Also use translations for string of month/year
 2015-02-10 18:05:39 +00:00
Henry Oswald
7030d5f822 change plan shows price including tax 2015-02-06 16:19:52 +00:00
Henry Oswald
993c5bcee7 dont show generic error message on subscriptions if they are part of a group 2015-02-04 20:56:50 +00:00
James Allen
860de1528f Load default coupon code if provided in query string 2015-02-02 17:42:27 +00:00
James Allen
48a17729e4 Show change plan list on clicking change plan, not hide 2015-02-02 14:53:45 +00:00
James Allen
3731c62e17 Get validation working with address fields and Angular digest loop 2015-01-29 14:22:57 +00:00
James Allen
2a78a7843a Allow subscriptions with no free plans, and adjust styles 2015-01-29 14:11:25 +00:00
Henry Oswald
90bb12db40 added state to payment form 2015-01-19 20:27:01 +00:00
Henry Oswald
208dfea5c8 pull right the total prices on the payment page 2015-01-19 15:35:05 +00:00
Henry Oswald
7508ba6c47 improved validation so that fields recurly said are wrong get highlighted 2015-01-07 16:43:20 +00:00
Henry Oswald
f6e9c544e6 slightly improved the breakdown form. Still not very pretty. 2015-01-07 14:59:56 +00:00
Henry Oswald
5d6a96ba4f made form thinner 2015-01-07 14:51:54 +00:00
Henry Oswald
f9843b3709 tax auto updates on change of address now. Is also preset based on users ip address 2015-01-07 13:16:19 +00:00
Henry Oswald
d678af4417 only validate credit card an cvv if there is data in them 2014-12-28 22:19:15 +00:00
Henry Oswald
735dd0811c changed credit card/paypal logs from offical ones to font very good ones 
upgraded fontamerican to 4.2
 2014-12-28 22:14:39 +00:00
Henry Oswald
1716b16fb0 added placeholder info to address 2014-12-28 22:03:12 +00:00
Henry Oswald
afab06bcac removed safe message from payment form. 2014-12-28 21:56:17 +00:00
Henry Oswald
1a4825a47b pulled total price down a little 2014-12-28 19:08:36 +00:00
Henry Oswald
0efb1bba5b adjusted post code and country field sizes 2014-12-28 19:06:01 +00:00
Henry Oswald
2d03e0532f adjusted style of payment options 2014-12-28 19:04:47 +00:00
Henry Oswald
40aeed74ce added little ssl secure message 2014-12-28 18:55:29 +00:00
Henry Oswald
bd52594f23 added new official paypal logo from https://www.paypal.com/uk/webapps/mpp/logo-center 2014-12-28 18:43:53 +00:00
Henry Oswald
673140b620 got new credit card logos from https://www.mastercardbrandcenter.com/us/getourbrand/index.shtml?pageId=dl_0340&expertVisible=false 2014-12-28 18:35:44 +00:00
Henry Oswald
9d57288809 centered the billing forms 2014-12-28 18:23:08 +00:00
Henry Oswald
236d4d7ab3 made the fields smaller and pushed plan name to header 2014-12-28 18:16:55 +00:00
Henry Oswald
137b9c1077 removed some labels and added paypal/credit card logos 2014-12-28 17:59:29 +00:00
Henry Oswald
baa0a42825 coupon field is shown if query string scf is shown 2014-12-28 17:51:36 +00:00
Henry Oswald
7f979e77db - fixed new payment page so it uses correct plan and currency 
- submit button is disabled while processing
- removed test data
 2014-12-28 17:16:21 +00:00
Henry Oswald
ecb71d5bbf pull recurely pub api key from settings file 2014-12-23 12:08:01 +00:00
Henry Oswald
12a28d91f2 removed month names 2014-12-23 12:00:41 +00:00
Henry Oswald
74347611e9 don't show the form until we have some data from recurly 2014-12-23 11:44:42 +00:00
Henry Oswald
03311311dd added translations in 2014-12-23 11:42:56 +00:00
Henry Oswald
e2819c3bc6 added generic error handling to recurly processing and required fields 2014-12-23 11:04:54 +00:00
Henry Oswald
d0c9783718 added paypal option in, not tested as we don't have paypal in stag 2014-12-22 15:51:50 +00:00
Henry Oswald
fb0a083b36 added address 2 2014-12-22 15:19:40 +00:00
Henry Oswald
6cedfb19d9 cleaned up form and added basic validation 2014-12-22 15:07:55 +00:00
Henry Oswald
fa1ec44e22 coupons work 2014-12-22 14:06:39 +00:00
Henry Oswald
a47b25d4b2 works with multi plan and currency, auto updates view on change 2014-12-22 12:55:29 +00:00
Henry Oswald
5305cbfd3e got more correct details making it to recurly and improved form. 2014-12-19 11:17:35 +00:00
Henry Oswald
cc545db17b can add account just about into recurly 2014-12-18 18:59:29 +00:00
Henry Oswald
47fb2a0878 basic angular form which has data bound to it 2014-12-18 17:48:23 +00:00
Henry Oswald
02ef07dca4 broken free trial func into own file. added ab test on upgrade button colour 2014-11-24 23:59:55 +00:00
Henry Oswald
6c0f03e9c7 added ab test to show collar plan to people in editor 2014-11-24 16:21:03 +00:00