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
James Allen
22f5c5dcb9
Keep spacing consistent
2014-11-03 14:25:53 +00:00
James Allen
1d6647e67d
Add in github to plans page
2014-11-03 14:23:12 +00:00
Henry Oswald
8097e6ad71
made 7 day free trial the default
2014-10-21 13:48:46 +01:00
Henry Oswald
750b050358
added ab test in for multi currency
2014-10-15 16:21:45 +01:00
Henry Oswald
e443809206
free trial length is show correctly at bottom of plans page
2014-10-15 11:49:20 +01:00
James Allen
fd8991f62e
Sort out responsive flow
2014-10-15 10:23:08 +01:00
James Allen
64fe2a2404
Improve CSS and layout of feature list on new subscription page
2014-10-15 10:22:03 +01:00
James Allen
b32375530c
Refactor card css for use in new subscription page
2014-10-14 15:46:44 +01:00
Henry Oswald
b2b13ef9a7
pass plan to payment page to get the number of collaborators
2014-10-14 12:14:24 +01:00
Henry Oswald
3382c5bb17
added blurb to payment page
2014-10-13 17:51:59 +01:00
Henry Oswald
5a0d74753f
plans page will auto redirect to best guess currency
2014-10-13 17:39:44 +01:00
Henry Oswald
52c54e7300
added ability to change currency on payment page
2014-10-13 17:28:00 +01:00
Henry Oswald
58f6ae323b
fix which plan is "your plan" on dashboard
2014-10-13 16:33:01 +01:00
Henry Oswald
2bbdea3433
renamed change currency function and sorted out recommended currency
2014-10-13 16:27:27 +01:00
Henry Oswald
36264706f6
hooked the plans page up to the geo ip lookup
2014-10-13 14:10:15 +01:00
Henry Oswald
b90003b11e
added custom user dashboard page
2014-10-10 15:44:53 +01:00
Henry Oswald
21f46da08a
changed ab test from 30 -> 14 to 14 -> 7
2014-09-26 10:56:45 +01:00
Henry Oswald
bed78665f5
hide the currency dropdown for the moment
2014-09-10 08:17:22 +01:00
Henry Oswald
f1372fc449
moved button, not that pretty
2014-09-05 16:11:19 +01:00
Henry Oswald
ff0365c157
change plan has multi currency view
2014-09-05 15:47:08 +01:00
Henry Oswald
08cebe369d
close dropdown on click
2014-09-05 12:16:02 +01:00
Henry Oswald
eeb27062a0
added currency query string param to subscribe button
2014-09-05 11:40:14 +01:00
Henry Oswald
13a667f47a
v1 of multi currency
2014-09-04 19:03:04 +01:00
Henry Oswald
54b9cdc3e4
new ab framework up and running
2014-09-01 17:48:09 +01:00
Henry Oswald
cffcdbae18
fixed formatting $ and %
2014-08-29 13:49:37 +01:00
Henry Oswald
ce3db55624
improved annual plans view
2014-08-29 13:40:35 +01:00
Henry Oswald
e67d3889f9
got better logic and copy for upgrade annual plans, needs i18n next
2014-08-29 12:36:36 +01:00
Henry Oswald
50890af0cf
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
2014-08-29 12:35:37 +01:00
James Allen
d7e2b19852
Remove your card will charged message since it doesn't apply to free trials
2014-08-29 10:23:11 +01:00
Henry Oswald
350b95a0a5
annual upgrade page works, needs a bit of copy love now
2014-08-28 18:14:31 +01:00
Henry Oswald
f5618e9d9c
added confirm you want to change plan modal
...
added page and corisponding endpoint to migrate to annual plan
2014-08-27 17:51:10 +01:00
Henry Oswald
d0d08824da
modal asking users to confirm a change of plan
2014-08-27 13:21:39 +01:00
Henry Oswald
b99e933266
fixed jade formating prob causing console error
2014-08-27 11:09:22 +01:00
Henry Oswald
67fdd73472
fixed template problem with next billing details
2014-08-26 20:18:56 +01:00
Henry Oswald
6c131b1084
- removed free trial on annual accounts
...
- added setting val for google analytics experiments to be added in head
- added 14 day free trial variation to plans page
2014-08-22 14:20:39 +01:00
Henry Oswald
8e4974d559
fix more escaping html
2014-08-20 12:45:29 +01:00
James Allen
b367c4a968
Show group subscription status on subscription dashboard page
...
Conflicts:
app/views/subscriptions/dashboard.jade
2014-08-07 15:51:43 +01:00
Henry Oswald
fdc5a5154a
added a load more pages
2014-08-01 12:34:53 +01:00
Henry Oswald
43750e9cb6
converted plans page
2014-07-31 13:38:24 +01:00
James Allen
9aa8682082
Add group plan enquiry form
2014-07-25 12:32:26 +01:00
James Allen
cb5206a49e
Convert plans page to use free trials
2014-07-25 12:10:56 +01:00
Henry Oswald
57ad5e4182
- migrated event tracking to new pages/angular
...
- hooked up the search field on projects to search on keypress
2014-07-21 11:35:05 +01:00
James Allen
f6c2feff2d
Improve styling of project list with long titles and labels
2014-07-09 11:51:21 +01:00
James Allen
8525bf4a72
Get group admin page working with angular and new style
2014-07-07 18:06:12 +01:00
James Allen
452098ca68
Redirect to register if not registered on plans page
2014-07-07 14:05:07 +01:00
James Allen
5f48105b04
Style subscription management pages
2014-07-07 13:43:36 +01:00
James Allen
7947eb28ad
Remove ab test from plans page
2014-07-07 12:30:19 +01:00
James Allen
b3bfa2dc26
Add plans page
2014-07-07 12:27:58 +01:00
Henry Oswald
2a6ff8cc5d
changed team@sharelatex.com to support@sharelatex.com
2014-06-18 14:47:29 +01:00
James Allen
31f39dada1
Allow multi select of users in group page
2014-03-28 12:07:30 +00:00
Henry Oswald
4988fc4136
setup second plans page with free trial using google analytics experiements
2014-03-21 17:49:20 +00:00
Henry Oswald
77aadf1845
plans.css trying to fingerprint wrong file
2014-03-12 21:33:15 +00:00
Henry Oswald
e364fd9c5f
moved id for cancel selector to correct button
2014-03-11 11:47:24 +00:00
Henry Oswald
260c5210a6
changed ga tracking created -> subscribed, fixed indentation on cancel sub events
2014-03-11 11:22:03 +00:00
Henry Oswald
21ec74e51c
hooked up the recurly config to recurly.js correctly
2014-03-09 10:23:37 +00:00
Henry Oswald
3d0bd34b50
added event tracking to subscription cretion/cancelation
2014-03-09 09:56:58 +00:00
Henry Oswald
f2069c6208
converted all analytics to use new google analytics, removing mixpanel
...
and heap. Not tracking subscriptions or cancelations yet.
2014-03-08 19:00:26 +00:00
Henry Oswald
a0805f97e0
added bulk removing of users to group admin panel
2014-03-03 17:48:48 +00:00
Henry Oswald
c991625a27
added uni message to plans page back in
2014-03-03 16:41:59 +00:00
James Allen
128c982ba2
Add open source banner to footer
2014-02-22 11:26:36 +00:00
James Allen
4ec7deb7d6
Move plans.css to brand folder
2014-02-14 11:36:06 +00:00
James Allen
8715690ce9
Intial open source comment
2014-02-12 10:23:40 +00:00