6fb6119ca8
Merge remote-tracking branch 'origin' into afc-email-tokens
2018-06-05 15:42:17 +01:00
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
d262de14d6
Use team invites to join domain licensed teams
2018-05-31 16:15:47 +01:00
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
11edfde153
Accept & revoke team invites
2018-05-31 11:54:50 +01:00
9aa95cb0d5
Show team invites
2018-05-30 13:06:27 +01:00
7e09c0e0b1
First stab at email token invites (WIP)
2018-05-30 11:29:21 +01:00
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
c6f4df4f77
Merge pull request #498 from sharelatex/ho-recurly-v4
...
Payment page improvments
2018-04-24 09:01:34 +01:00
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
5d266c7f04
Show export user CSV even if the group has reached max capacity
2018-04-17 16:12:33 +01:00
b5e6181c49
added .capitalised style
2018-04-17 11:26:02 +01:00
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
e64c398352
capitalise month and year on payment page
2018-04-16 15:11:31 +01:00
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
086f080ee4
add !isFormValid(simpleCCForm) back in, was used during debugging
2018-04-16 11:01:14 +01:00
c3eeefdc5b
only use recurly.js from our public libs folder
2018-04-16 10:52:33 +01:00
7940b60144
make a seperate external error class which is used on entire payment form
2018-04-16 10:35:12 +01:00
06fb31533f
add highlight for bad card/cvv/mmyy number in.
2018-04-16 10:26:39 +01:00
a1be0e95b4
remove the dead validation
2018-04-16 10:10:25 +01:00
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
ccef0760ae
remove the form control, it just breaks the iframe styling
2018-04-13 16:51:55 +01:00
ae3858bcd0
can subscribe using new form. terrible styling
2018-04-13 16:35:32 +01:00
7e8b59cbb3
wip form loads as ifram
2018-04-13 16:01:41 +01:00
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
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
5683f48d97
Fix conditional
2018-04-12 10:18:15 -05:00
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
89cfd98af3
Add details to analytics label
2018-03-20 08:31:35 -05:00
8b9f3268b1
Make plans page consistent with others, fixing header issues.
2018-01-03 13:54:33 +00:00
ec41f984e6
Merge branch 'ho-remove-groove'
2017-12-20 13:37:15 +00:00
cc9986cefd
Remove the obsolete update-billing-details page
2017-11-28 11:52:14 +00:00
22c163c60a
Move the recurly-billing-details link up to main subscription page
2017-11-28 11:40:48 +00:00
7ce56aa3b6
add http catch onto form
2017-11-28 10:13:54 +00:00
b16862fa31
add error handling for form
2017-11-27 18:03:42 +00:00
7eb2f0d917
move generic sales modal to use new support endpoint
2017-11-27 12:49:12 +00:00
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
085cc7a0b2
json stringify and trim recommended currency
2017-03-14 17:53:48 +00:00
58c7dda945
fix couple of bad translations
2017-02-17 11:05:32 +00:00
b0dd7475b0
fix pug syntax
2017-01-31 14:57:22 +00:00
57cd54bf55
WIP: migrate from jade to pug
2017-01-20 12:03:02 +00:00
acce8853ba
Remove redundant baseUrl from plans page.
2016-11-25 15:24:50 +00:00
11a097c9a6
remove some old sixpack tests
2016-11-02 10:09:12 +00:00
a63f7685b8
Move the planCode logic for Collaborator into a helper function.
2016-11-02 09:56:33 +00:00
e268275e77
Fix participate/convert flow for plan tests
2016-10-25 10:47:14 +01:00
667c7ce520
Show correct number of collaborators for plans
2016-10-24 11:47:01 +01:00
c051b56abf
Cloak plans until they have loaded
2016-10-24 11:24:28 +01:00
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
3ec0e65ae1
Merge branch 'master' into sk-end-subform-test
2016-10-12 14:34:55 +01:00
380487abf0
use separate jade template block for requirejs
...
removes the need to suppressDefaultJs
2016-10-11 14:31:04 +01:00
Alberto Fernández Capel