codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-11-30 19:06:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
11372 commits 27 branches 0 tags 134 MiB
Commit graph

594 commits

Author SHA1 Message Date
Nick Winter
20f2abfb37 Propagate i18n 2015-10-28 06:26:01 -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
Nick Winter
d5288a254b Remove Ace of Coders tournament blurb from home page 2015-10-16 14:55:58 -07:00
Imperadeiro98
9184566d67 Update pt-PT and standardize new tip 2015-10-13 21:07:21 +01:00
Nick Winter
8209c4a0c7 Propagate i18n 2015-10-13 12:32:51 -07:00
Nick Winter
537ede7740 Merge pull request #3108 from Imperadeiro98/i18n-and-cleanups 
Added i18n to some strings
 2015-10-13 12:27:58 -07:00
Nick Winter
0c7169f5c0 Merge pull request #3088 from javatlacati/patch-1 
Update level_loading.jade
 2015-10-13 12:21:19 -07:00
Imperadeiro98
20371fa146 Indentation re-fix 2015-10-13 16:14:43 +01:00
Imperadeiro98
2b8856aead Fixed indentation 2015-10-13 16:08:20 +01:00
Imperadeiro98
fbfb80d4bf Added i18n to some strings 2015-10-13 16:05:47 +01:00
Matt Lott
708f78153b Route /hoc to courses 
When in HoC mode:
Students have an option to play through as a single player, in addition
to entering a code to join an existing class.
Teachers get the normal course enrollment flow, without a sales blurb
on /courses.
 2015-10-12 16:25:23 -07:00
Imperadeiro98
a74a09a532 Added change to a string 2015-10-09 16:37:19 +01:00
Nick Winter
5dde55c1f3 Add premium server recognition for Brazil 2015-10-09 08:05:34 -07:00
RUSLAN LÓPEZ CARRO
dcab1eecc0 Update en.coffee 2015-10-09 09:39:15 -05:00
Nick Winter
a34e4b3afd Merge pull request #3084 from Imperadeiro98/clean-up 
Cleaned up a couple of files
 2015-10-08 16:25:50 -07:00
Scott Erickson
3a90356f59 Add class invite system 2015-10-05 16:01:32 -07:00
Imperadeiro98
7949e4fbab Cleaned up a couple of files 
Removed some unused strings, an unnecessary style and an event
 2015-10-05 22:30:02 +01:00
Imperadeiro98
446b193f8c Added i18n to courses 2015-09-25 20:51:51 +01:00
Matt Lott
928f72e2cf Merge branch 'prepaid-v2' into master 2015-09-25 10:28:27 -07:00
Imperadeiro98
7b183e3ae5 Removed some old 'changed' from en.coffee 2015-09-21 21:03:55 +01:00
Nick Winter
c2c3ae4c4c Add /careers and Ace of Coders links to home page 2015-09-21 12:40:33 -07:00
Nicholas Winter
5151ab9091 Describe Ace of Coders tournament 2015-09-15 16:36:50 -07:00
Matt Lott
9041646ecc Update teacher copy 2015-09-09 13:20:23 -07:00
Nick Winter
d92ca389d6 Switched ladder views to display red/blue team instead of humans/ogres. 2015-09-03 15:46:56 -07:00
Nick Winter
98b0bcfc75 Fixed playback victory message for spectate mode. Spectate mode now opens in new tabs. 2015-09-03 15:05:10 -07:00
Nick Winter
02676dc59f Fixed #2988. 2015-09-03 05:10:06 -07:00
Nick Winter
dcfa65213e Propagated i18n. 2015-09-03 04:47:48 -07:00
Nick Winter
1a6c3ad8c0 Updated level counts in en.coffee. 2015-09-03 04:27:36 -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
Imperadeiro98
78b136d69c Fixed {changed} in english file 2015-08-27 10:41:13 +01: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
Imperadeiro98
cf720ce270 Fixed 'changed' in english file 2015-08-21 21:42:02 +01: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
Nick Winter
f4d796a717 More ladder page support for leagues. Linking to clan league pages from clans pages. 2015-08-19 15:30:37 -07:00
Nick Winter
49dc71a157 Added a Bloc coupon code after A Mayhem of Munchkins. 2015-08-12 10:25:56 -07:00
Cat Sync
37fbb07211 Added continue_statements, graphics, and parameters to concepts list 2015-08-10 10:56:21 -04:00
Nick Winter
79ea3258f1 Added GitHub link to community page. 2015-08-08 10:26:13 -07:00
Nick Winter
3f323d27d0 Removed achievement and rewards from course-type level victory screens. Added victory text, return-to-course-button, and level feedback and reviews to course-type levels. 2015-08-04 11:35:10 -07:00
gnerkus
835074e5e6 chore (coding tips): Add more quotes for #710 2015-07-31 21:58:10 +01:00
Sean P. Kane
d5f81b8f51 Move tip into correct language file 2015-07-25 19:29:13 -07:00
Nick Winter
15ecc92abc Adding 'course' type levels. Removing 'campaign' type levels. 2015-07-24 17:37:42 -07:00
Imperadeiro98
a8e59c5302 Updated 'Generate Terrain' strings 2015-07-08 23:20:32 +01:00
Nick Winter
be19edb7a1 Merge pull request #2881 from Vikasgupta09/master 
fix #2867 added i18n to some words of lvl save form
 2015-07-07 16:09:53 -07:00
Nick Winter
51c08eff3b Propagated i18n. 2015-07-07 11:45:41 -07:00
Nick Winter
07f81755b0 Added deprecation message to old arenas, highlighting new hero arenas instead. 2015-07-07 11:43:38 -07:00
Cat Sync
5ab7fd7840 Added 'arguments' to the concepts list, and renamed while loops to just 'Loops', for now 2015-07-06 15:46:18 -04:00
Matt Lott
0c427ff440 Update teachers and sales copy with latest level and hour counts 2015-07-03 13:07:25 -07:00
Matt Lott
8d258c6943 Update private clans preview image and copy 2015-07-02 18:44:13 -07:00
Vikas Gupta
4776ff8325 fix #2867 added i18n to some words of lvl save form 2015-07-02 11:40:37 +05:30
Nick Winter
1c5f176c3c Added recursion to concepts list. 2015-06-30 20:52:10 -07:00
Imperadeiro98
90e02cba48 Updated i18n 2015-06-30 20:33:05 +01:00
Nick Winter
4742b23854 Propagated i18n. 2015-06-30 11:29:18 -07:00
Nick Winter
b0c7b50761 Added programming concept tags to campaign and level editor. 2015-06-30 11:27:58 -07:00
Imperadeiro98
d4f1fcaaed Added i18n 2015-06-28 11:43:56 +01:00
Imperadeiro98
5eed3361f3 Updated i18n 2015-06-27 12:40:48 +01:00
Nikita Gryzlov
8c5b67d826 Update en.coffee. {change} added. 2015-06-23 10:59:14 +03:00
Nick Winter
aa1150768f Propagated i18n. 2015-06-22 11:59:28 -07:00
Imperadeiro98
80bb030951 Removed unnecessary i18n 2015-06-22 19:18:47 +01:00
Lai Tuan
39fc882303 Require user password for deleting accounts #2842 2015-06-20 23:12:26 +09:00
Nick Winter
8ef4a9ddde Merge pull request #2830 from arthurnn/master 
i18N press enter on spell view
 2015-06-18 18:37:24 -07:00
Lai Tuan
aabae7082e Add Contact section to About page #2822 2015-06-15 19:11:48 +09:00
Arthur Neves
6cb673e228
i18N press enter on spell view 2015-06-14 23:20:49 +02:00
Matt Lott
021ff541e4 Add separate school field for teacher survey 2015-06-08 06:39:30 -07:00
Imperadeiro98
a9f8a7b1be Fixed some typos 2015-06-08 14:32:55 +01:00
Matt Lott
78004a0a94 Trial requests localization typo 
Adding missing period at end of approved sentence.
 2015-06-08 06:27:40 -07:00
Imperadeiro98
b9b36d5fea Update en.coffee 2015-06-07 22:54:39 +01:00
Nikita Gryzlov
730a0f5e36 Propageted i18n 2015-06-07 23:09:03 +03:00
Imperadeiro98
3f23598c60 Update teacher trial copy 2015-06-05 23:44:31 +01:00
Imperadeiro98
7b92bf8c84 Updated i18n in en.coffee 2015-06-05 20:49:08 +01:00
Matt Lott
d7cddcb136 Teacher trial subscription form 
Add a teacher survey form for applying for a free trial subscription
for evaluation purposes.
Add an admin trial requests review page, where admins can approve/deny
requests.
 2015-06-05 06:48:19 -07:00
Matt Lott
ad1cf1cd15 Update /teachers copy 2015-06-02 07:25:55 -07:00
Marco Fras
0f0143925d Update en.coffee 
I added "use" because it seems more suitable than "click".
 2015-05-21 21:38:15 +02:00
Marco Fras
a3e3bdc125 Fixed a missing "to" in a string 2015-05-21 10:36:25 +02:00
Imperadeiro98
a56807bcac Updated i18n (part 3) 2015-05-16 19:32:00 +01:00
Imperadeiro98
323d5c5c2d Updated i18n (part 2) 2015-05-16 19:25:07 +01:00
Imperadeiro98
e88aff1339 Updated i18n (part 1) 2015-05-16 14:46:00 +01:00
Imperadeiro98
7a87b59988 Removed blank line 2015-05-14 20:07:07 +01:00
Lokendra Sharma
4abfc088bf added more quotes for #710 2015-05-14 15:56:59 +05:30
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
Nicolas Kaiser
4416332938 Fix typos in en.coffee 2015-04-26 20:16:25 +02:00
Imperadeiro98
85047ba2e8 Reordered a string 2015-04-26 14:27:12 +01:00
Nick Winter
80af32180c Fixed #1638: detect and automatically report unrecoverable world loading errors, plus adding better instructions for checking dev console. We can't recover yet, but having eyes on it will hopefully give us better visibility on this kind of error. 2015-04-25 17:29:02 -07:00
Nick Winter
1c85759df8 Propagated i18n. 2015-04-24 13:50:30 -07:00
Nick Winter
cd837156d4 Now that we're at 146 levels, and each level is much longer, we're just going to do 'some' new levels every week instead of five. 2015-04-24 13:48:19 -07:00
Matt Lott
92332c37f3 Update /teachers copy 2015-04-23 13:34:43 -07:00
Matt Lott
5eb65e49fe Add private clans to /teachers copy 2015-04-21 11:41:48 -07:00
Matt Lott
b918408061 Add private clans to subscribe modal 2015-04-21 11:14:49 -07:00
Nick Winter
63596aa6b5 Fixed #2450: added i18n for new items in the victory modal. 2015-04-18 21:10:35 -07:00
Nick Winter
7471b14c4d Fixed #2013: removed autorun code. Fixed preloading to actually happen, but only on short solutions without a ton of statement execution. 2015-04-18 15:52:24 -07:00
Nick Winter
1952a8ea23 Fixed #2305: removed CSS initial keyword usage. 2015-04-17 11:42:38 -07:00
Nick Winter
2eb95c32df Propagated i18n. 2015-04-16 18:35:40 -07:00
Nick Winter
a7bb97e5f2 Fixed #2649: made leaderboard buttons more obvious. 2015-04-13 16:26:58 -07:00
Nick Winter
e85c53ea42 Programming is good for your childrens's careerses, O dear parents. 2015-04-10 14:35:13 -07:00
Nick Winter
3b224db839 Propagated i18n. 2015-04-09 11:51:01 -07:00
Matt Lott
adea59054b Remove bitcoins from sub payments blurb 2015-04-09 09:42:44 -07:00
Nick Winter
2eec3e7831 Simplified share progress email to just share with parents, not friends. 2015-04-08 18:31:13 -07:00
Imperadeiro98
e923f7a4fc Moved a string to its correct place 2015-04-08 19:25:59 +01:00
Matt Lott
51e25d8a9c Update /teachers level counts 2015-04-08 09:42:39 -07:00
Matt Lott
f3c973b945 Add payment methods to subscribe dialog 
And update level counts in subscription breakdown.
 2015-04-07 15:54:59 -07:00
Nick Winter
b388d25435 Hooked up Viking Code School offer for players who beat Lost Viking. 2015-04-07 11:19:22 -07:00
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