1372 commits

Author	SHA1	Message	Date
Imperadeiro98	6a6cd83252	Fixed i18n in about page	2015-02-26 14:48:58 +00:00
Imperadeiro98	ed2f498917	Added i18n to subscribe price	2015-02-26 14:41:40 +00:00
Nick Winter	df4b98a9bf	Added a new 'artisan' permission, which can edit most of the things admins can, but with less uncomfortable ultimate power.	2015-02-25 18:41:39 -08:00
Nick Winter	b6d8ceafb0	Updating team page and avatars.	2015-02-25 15:40:50 -08:00
Nick Winter	a2a78286da	Fixed #2407 by implementing styles for new subscribe-in-gem-shop design.	2015-02-25 14:24:32 -08:00
Nick Winter	15ca65f226	Further disabled employer portal for now.	2015-02-25 12:38:51 -08:00
Nick Winter	d58d151b8c	Got rid of debugging code that was making Hour of Code stuff always show up.	2015-02-25 12:32:59 -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	dabf5ce57d	Added minimum age	2015-02-24 20:13:13 +00:00
laituan245	23a9aa5e33	Changed the URL style	2015-02-25 04:53:20 +09:00
Popey456963	ff8e18146e	Edited Teacher.Jade ... Removed HoC references, Added Arrays and Expanded Acronym	2015-02-24 19:31:22 +00:00
laituan245	a78f864607	Add Profile to account page (Issue #2388)	2015-02-25 04:03:46 +09:00
Nick Winter	4cbbcdad6d	Merge pull request #2359 from laituan245/master ... Added ability to delete account	2015-02-24 09:30:22 -08:00
Nick Winter	69959caba5	Using common.play instead of home.play for a more-common use of it.	2015-02-23 15:59:42 -08:00
Nick Winter	88c55fa7fd	Fix for making ja start game text break lines in the right places. #2386	2015-02-23 15:57:43 -08:00
Nick Winter	1314695382	Merge pull request #2385 from nixel2007/master ... Update diplomat.jade	2015-02-23 14:50:04 -08:00
nixel2007	a3afec0989	Update diplomat.jade ... Fix >100% of translation.	2015-02-23 21:18:00 +03:00
Ryan Marren	f850409dbe	made "level" display in other languages	2015-02-21 14:29:40 -05:00
Ryan Marren	a7dadc34aa	Added level indicator	2015-02-20 23:50:42 -05:00
laituan245	d325623699	Added ability to delete account	2015-02-20 08:19:30 +09:00
Nick Winter	8355ba5a6d	Replayable level awards now count up from where they were last time instead of from 0.	2015-02-18 18:01:22 -08:00
Nick Winter	dc703c40b0	Merge pull request #2336 from divyanshu013/master ... Added some Hindi localizations for hi.coffee	2015-02-17 15:26:41 -08:00
divyanshu013	d8716ed40b	Added CodeCombat navigation from /play to / for #2044	2015-02-17 23:49:34 +05:30
Nick Winter	141e11f918	Merge branch 'master' of git://github.com/rmarren1/codecombat into rmarren1-master	2015-02-16 17:13:24 -08:00
Ryan Marren	1a60b004a7	added achievement editor for #2304	2015-02-16 17:12:05 -05:00
laituan245	dfaa29c596	Add type (warrior/ranger/wizard) to hero selector modal (Issue #2307)	2015-02-17 00:50:01 +09:00
Nick Winter	7f2e5c4404	Achievements list now shows proper amount of gems and exp for repeatable achievements.	2015-02-13 18:55:23 -08: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	9ddbf1a102	Fixed i18n in buy-gems-modal.jade	2015-02-13 14:54:19 +00:00
Nick Winter	63fa2f86d4	Tracking who is simulating matches so we can see patterns in ill-reported matches. Rejecting simulations from simulators with old versions of the Simulator code.	2015-02-11 20:24:12 -08:00
Matt Lott	af343bfd82	🐛Fix share progress modal i18n	2015-02-11 10:15:03 -08: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	ada239b50d	Added some quotes for #710	2015-02-10 14:41:03 +05:30
Nick Winter	abbab26d80	Using i18n for achievement descriptions in HeroVictoryModal.	2015-02-09 13:06:00 -08:00
Imperadeiro98	8718cd280f	Added i18n	2015-02-09 20:00:52 +00:00
Imperadeiro98	f062f446d3	Fixed i18n	2015-02-09 19:57:28 +00:00
Nick Winter	7b34f90230	Added rough draft of subscribe button in gem shop.	2015-02-09 09:22:18 -08:00
Nick Winter	c2a4700aa2	Mergy merge merge... moved the latest quote to the .rare, since it doesn't fit too well.	2015-02-09 08:42:24 -08:00
Nick Winter	b2dc80b467	Merged those loading tips.	2015-02-09 08:34:13 -08:00
TJ Ledwith	292e679cc6	Update level_loading.jade	2015-02-09 07:08:33 -05:00
Nick Winter	38c6d6f531	Merge pull request #2263 from divyanshu013/master ... Improved upon the Buy Gems Window for #2238	2015-02-08 21:44:57 -08:00
divyanshu013	4269f6a652	Improved upon the Buy Gems Window for #2238 ... Added the header and close button for the Buy Gems Window.	2015-02-09 02:31:03 +05:30
Imperadeiro98	d876c81c97	Made #back-button a button	2015-02-07 22:33:48 +00:00
Nick Winter	9a29f898a9	Merge branch 'fix-profile-pic-bug' of git://github.com/h3yduck/codecombat into h3yduck-fix-profile-pic-bug	2015-02-06 18:01:25 -08:00