Commit graph

388 commits

Author SHA1 Message Date
Nick Winter
3bfc1a88ce Slight copy update. 2015-03-26 22:05:52 -07:00
Nick Winter
ceb81494a0 Preparing for Zero Sum tournament starting tomorrow morning. 2015-03-26 21:05:46 -07:00
Nick Winter
d34577dd38 Propagated i18n. 2015-03-23 15:54:26 -07:00
Nick Winter
b4ea78e5cb Implementing alternative pricing with Alipay in China to support dedicated China server. 2015-03-23 15:26:44 -07:00
Nikita Gryzlov
da47e2cefb Update en.coffee. Add {change} 2015-03-20 23:08:26 +03:00
Matt Lott
fb8e184819 Update teachers page 2015-03-20 09:18:34 -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
Nick Winter
57e77a0cd7 Upcoming ladder level Zero Sum equalizes all players' heroes and equipment. 2015-03-14 09:39:43 -07:00
Matt Lott
af89452b93 Merge branch 'sponsored-subs' 2015-03-13 15:19:20 -07:00
Nick Winter
b0dc743126 Tweaks to #2418. 2015-03-10 14:49:50 -07:00
Nick Winter
f2ab176fd6 Merge pull request #2418 from divyanshu013/master
A small fix for confusing Hero Modal weaopons list for #1774
2015-03-10 14:42:31 -07:00
Nick Winter
e21360127d Polls! 2015-03-08 16:36:17 -07:00
Matt Lott
cd59b90e37 Add custom payments
Example:
https://codecombat.com/account/invoices?a=21600&d=9%20monthly%20subscrip
tions
2015-03-04 15:40:53 -08:00
Nick Winter
e6cf298ed3 Propagated i18n. A couple other misc tweaks. 2015-03-04 09:00:32 -08:00
Nick Winter
2d18bcf9f0 Recording referrer information. Updating parent email prompt to also show after Signs and Portents if that's the fourth level. 2015-03-03 09:04:53 -08:00
Thejdeep
e6c60a8027 Added a quote 2015-03-02 20:54:30 +05:30
divyanshu013
fac48752fa A small fix for confusing Hero Modal weaopons list for #1774 2015-03-01 20:08:14 +05:30
Nick Winter
6789a8d6bc Rearranging tip_open_source_contribute link. 2015-02-28 16:00:04 -08:00
Kojo Idrissa
bad3b48af1 reverted "open_source_1" back to "open_source"; changed "open_source_2" to "open_source_contribute" 2015-02-28 15:47:43 -06:00
Kojo Idrissa
39f04f0f8b added new load message to level_loading.jade and the English, Traditional Chinese and Simplified Chinese localization files 2015-02-28 15:03:40 -06:00
Nick Winter
7d2c99acd7 Added attack/health/speed tooltip explanations on hero picker stat comparison bars. 2015-02-26 08:02:22 -08:00
Imperadeiro98
d4c64457b4 Update en.coffee 2015-02-26 14:49:33 +00:00
Nick Winter
b6d8ceafb0 Updating team page and avatars. 2015-02-25 15:40:50 -08:00
Nick Winter
1ab8274c43 Added a clear storage button to the campaign editor. 2015-02-25 11:09:15 -08:00
Imperadeiro98
c174cc35fa Merge pull request #2401 from popey456963/master
Update teacher.jade
2015-02-24 20:49:13 +00:00
Popey456963
e5c71d0c6a Changed aimed to recommended 2015-02-24 20:46:49 +00:00
Popey456963
f79d90b81f Changed requirement to recommended 2015-02-24 20:40:44 +00:00
Popey456963
9419ec1d33 Update EN.coffee
For new Teacher.jade
2015-02-24 20:17:04 +00:00
laituan245
d325623699 Added ability to delete account 2015-02-20 08:19:30 +09:00
laituan245
dfaa29c596 Add type (warrior/ranger/wizard) to hero selector modal (Issue #2307) 2015-02-17 00:50:01 +09:00
Imperadeiro98
8b978c0047 Removed unused string 2015-02-13 20:39:03 +00:00
Nick Winter
574f0b1442 Fixed #2303. Sorry, TBL. 2015-02-13 09:29:18 -08:00
Nick Winter
4fec64c3ca Merge pull request #2313 from laituan245/master
Added a "god mode" button to the local dev environment  (issue #2164)
2015-02-13 09:08:09 -08:00
laituan245
9c754bbd96 Added a "god mode" button to the local dev environment #2164 2015-02-14 01:46:04 +09:00
Imperadeiro98
c54cd428ad Removed unused strings 2015-02-13 14:54:04 +00:00
Popey456963
da64bea348 Revert "Remove Hour of Code References from teachers.jade"
This reverts commit b30c0d059a.
2015-02-10 21:14:34 +00:00
Popey456963
b30c0d059a Remove Hour of Code References from teachers.jade 2015-02-10 21:13:06 +00:00
Anirudh GP
b422508f2d Added some quotes for #710 2015-02-10 14:41:04 +05:30
Imperadeiro98
92531e366b Update en.coffee 2015-02-09 20:01:51 +00:00
Imperadeiro98
8fb8e139b7 Small indentation fix 2015-02-09 19:47:09 +00:00
Nick Winter
61896083a9 Missed my save on that last one. 2015-02-09 08:39:40 -08:00
Nick Winter
1c41c1df91 Merged more tips in en.coffee. 2015-02-09 08:38:29 -08:00
Nick Winter
65c0abd3ab Merged those tips in en.coffee. 2015-02-09 08:35:38 -08:00
TJ Ledwith
a7b7d61c08 Update en.coffee 2015-02-08 14:06:25 -05:00
Imperadeiro98
8b721a7c47 Better indentation 2015-02-07 10:47:31 +00:00
Matt Lott
972c3d0d6f Share progress modal
Shown after forgetful-gemsmith
2015-02-06 14:49:50 -08:00
Nick Winter
1d8f91c42f Added campaign world selector portal screen for half of players. 2015-02-05 15:05:33 -08:00
Imperadeiro98
b92a029a04 Removed unused strings 2015-02-05 18:48:22 +00:00
Imperadeiro98
3bfc7e1a9c Small fix 2015-02-04 23:09:23 +00:00
Matt Lott
c842f45786 Update subscribe modal with parent help button 2015-02-04 13:54:38 -08:00