Commit graph

173 commits

Author SHA1 Message Date
Matt Lott
d2921f66cb Add approved teacher trials to mail news group 2016-01-17 07:39:30 -08:00
Imperadeiro98
b7ba677b00 Use view in template 2015-12-26 14:21:06 +00:00
Scott Erickson
079109145f Cull recruiting views and translations 2015-12-18 10:34:21 -08:00
Scott Erickson
ef3f847932 Remove SubscriptionSaleView 2015-12-16 16:39:44 -08:00
Scott Erickson
59fcb22d01 Deprecate managed subscriptions, disallowing new ones 2015-12-16 16:39:43 -08:00
Scott Erickson
7c516c4d9f Move product information to the db 2015-12-14 11:10:50 -08:00
Barry
3db216a341 Fetched from master repo 2015-12-10 19:25:42 -05:00
Barry
3ef2be1a42 0px bottom margin on panel 2015-12-06 18:36:54 -05:00
Barry
74f692072e Started repositioning buttons.Can't remove box-shadow from panel 2015-12-06 18:07:41 -05:00
Nick Winter
ecfd982847 Note PayPal payment method. End limited-time year sale. 2015-11-30 10:50:34 -08:00
Nick Winter
31e7b36310 Add link to /acccount/subscription from /account/settings 2015-11-30 09:19:53 -08:00
Matt Lott
bc454191ec Update accounts prepaid list
Needed clearer total and remaining columns.
2015-11-17 16:21:08 -08:00
Nick Winter
9e61928080 Add reset progress feature in account settings 2015-11-12 15:27:28 -08:00
Imperadeiro98
8e8a3103d5 Refactor to use view in template for issue #3138
This removes getRenderData from: CareersView, SaveCampaignModal,
InfiniteLoopModal, SpellListEntryThangsView, SaveLoadView,
PlaySettingsModal and JobProfileCodeModal.
2015-11-09 21:29:27 +00:00
Scott Erickson
669ab416e5 Fix SubscriptionView to keep emails when emails are erroneous 2015-11-04 10:52:47 -08:00
Scott Erickson
05bd12e8cc Merge branch 'email-validation' of https://github.com/JordanLittell/codecombat into JordanLittell-email-validation
# Conflicts:
#	app/views/account/SubscriptionView.coffee
2015-11-04 10:47:39 -08:00
Imperadeiro98
f2ca1dbd63 Updates to i18n 2015-10-29 15:57:22 +00:00
Nick Winter
a970f322f9 Merge pull request #3132 from Imperadeiro98/i18n-updates
Updated i18n across some files
2015-10-28 06:41:35 -07:00
Imperadeiro98
e1b10183eb Some cleanups to subscription-view.jade 2015-10-27 21:57:49 +00:00
Scott Erickson
66afb10f91 Fix a useful trailing whitespace that was removed
My work machine editor's settings were changed, but not my home editor.
Both have now been fixed. I reviewed the template and this was the only significant
whitespace that was removed, I believe.
2015-10-27 12:29:32 -07:00
Scott Erickson
2e666073f1 Refactor SubscriptionView to use view in template 2015-10-27 12:07:16 -07:00
Matt Lott
48786372d8 🐛Prevent parallel managed sub unsubscribes
Our unsubscribe API does not support this.  Removing option from
subscription UI.

Fixes #2976
2015-10-26 13:45:38 -07:00
Imperadeiro98
09422910f7 Updated i18n 2015-10-23 16:49:05 +01:00
Scott Erickson
b475815e41 Refactor InvoicesView to use view in template 2015-10-22 15:26:52 -07:00
Scott Erickson
ddf351aac7 Refactor PaymentsView to use view in template 2015-10-21 17:18:38 -07:00
Scott Erickson
680eb04285 Refactor AccountSettingsView to use view in template 2015-10-21 17:18:38 -07:00
Scott Erickson
452e6467b4 Refactor PrepaidView to use new event callback naming guideline
See: https://github.com/codecombat/codecombat/wiki/Events,-subscriptions,-shortcuts#events
2015-10-21 14:16:44 -07:00
Scott Erickson
cef4fc0794 Refactor AccountSettingsView to use new event callback naming guideline
See: https://github.com/codecombat/codecombat/wiki/Events,-subscriptions,-shortcuts#events
2015-10-21 14:02:04 -07:00
Jlit1001
a788533d13 1. simplify regex for email testing
2. keep valid emails in text area
2015-10-14 22:29:15 -07:00
Scott Erickson
844bc942b3 Fix #2785 2015-10-14 16:01:09 -07:00
Imperadeiro98
fbfb80d4bf Added i18n to some strings 2015-10-13 16:05:47 +01:00
Jlit1001
e0be8e94ea 1. email validation when subscribing other users 2015-10-08 21:59:12 -07:00
Matt Lott
5095eac4ac Purchase prepaid on course instance creation
Updating purchase prepaid API to support courses.
Refactoring the prepaid server code.

Completes #54270567235517
2015-10-01 15:23:20 -07:00
Matt Lott
5eadd926b3 Move redeem prepaid code UI out of modal 2015-09-25 15:21:51 -07:00
Matt Lott
928f72e2cf Merge branch 'prepaid-v2' into master 2015-09-25 10:28:27 -07:00
Matt Lott
9041646ecc Update teacher copy 2015-09-09 13:20:23 -07:00
Matt Lott
24fb52a8d9 Update year sub sale copy 2015-08-27 10:54:52 -07:00
Matt Lott
5faeb82d17 Extend terminal sub with year sub purchase 2015-08-27 09:45:10 -07:00
Matt Lott
b6ddb41df6 Add sale end date to year sub page 2015-08-26 15:22:56 -07:00
Matt Lott
ea6bc6faf3 Add new heroes to year sub sale page 2015-08-26 14:49:35 -07:00
Matt Lott
66c864bca5 Add feature list to year sub sale landing page 2015-08-26 11:16:25 -07:00
Matt Lott
4392da1c20 Redirect to world selector after year sub purchase 2015-08-25 10:59:06 -07:00
Matt Lott
c601652d0b Add teacher banner image to year sub sale page
Also updating sale copy.
2015-08-25 10:38:12 -07:00
Matt Lott
58ff820d7d Prompt for login on year subscription sale page 2015-08-25 10:12:11 -07:00
Matt Lott
9e222d0873 Add subscription sale
Give a discount for purchasing a year
New sale button on subscribe modal
New subscription sale landing page
2015-08-21 11:19:39 -07:00
Imperadeiro98
e1e1328906 Updated i18n in account-settings-root-view.jade 2015-06-29 20:26:45 +01:00
Nick Winter
aa1150768f Propagated i18n. 2015-06-22 11:59:28 -07:00
Lai Tuan
39fc882303 Require user password for deleting accounts #2842 2015-06-20 23:12:26 +09:00
Matt Lott
901c0ed085 Update managed subscriptions copy
Add blurb about recipients needing to be existing CodeCombat users
2015-05-05 15:18:35 -07:00
Matt Lott
fec3ac38e9 Prepaid subscriptions
Admins can generate a prepaid code, which a user can use to subscribe
for free via the account/subscription page.
The subscription will be identical to the normal monthly subscription
(e.g. 3500 gems per month), except they won’t be charged.
Does not require the recipient to enter billing information.
Can be applied to an existing subscription, which will be converted to
free.
Prepaid code can only be used once.
Prepaid subscription cannot be unsubscribed via the UI.
2015-03-19 15:04:15 -07:00