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
