9180 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Imperadeiro98	1a664b519a	Uncommented strings from last merge	2015-10-18 15:39:03 +01:00
Imperadeiro98	a900cc003f	Merge pull request #3120 from artinhuang/master ... Update to zh-HANS.coffee	2015-10-18 15:35:16 +01:00
artinhuang	3c7bb3443c	Modify some description,and add the new translations.	2015-10-18 18:39:49 +08:00
Imperadeiro98	13f30ca16a	Uncommented strings from last merge	2015-10-18 11:23:42 +01:00
Imperadeiro98	947204b10b	Merge pull request #3119 from snarkota/patch-1 ... Update lt.coffee	2015-10-18 11:18:48 +01:00
snarkota	23670b9f25	Update lt.coffee ... First lines of lithuanian translation	2015-10-17 21:09:50 +03:00
Nick Winter	eec818aa40	Merge branch 'master' of https://github.com/codecombat/codecombat	2015-10-16 16:07:04 -07:00
Nick Winter	5f8ab8a212	Added support for test campaigns that don't save their levels/achievements	2015-10-16 16:06:53 -07:00
Matt Lott	6f421b2ccc	Courses v1 beta users script	2015-10-16 15:23:13 -07:00
Nick Winter	d5288a254b	Remove Ace of Coders tournament blurb from home page	2015-10-16 14:55:58 -07:00
Imperadeiro98	3d1e5f1e34	i18n account dropdown 'Prepaid Codes'	2015-10-15 21:41:47 +01:00
Imperadeiro98	44ae60e219	Merge pull request #3117 from javatlacati/patch-1 ... Update es-419.coffee	2015-10-15 21:08:06 +01:00
RUSLAN LÓPEZ CARRO	bf8da65060	Update es-419.coffee	2015-10-15 12:48:53 -05:00
Nick Winter	3446133452	Let's at least see what that test failure error is	2015-10-15 08:44:36 -07:00
Imperadeiro98	63d7df538c	Fixed previous merge	2015-10-15 15:21:10 +01:00
Imperadeiro98	f72f786803	Merge pull request #3116 from Fokusnica/master ... changed and added some ru and uk locales	2015-10-15 15:18:58 +01:00
Derevianko Liubov	58ba08ddb7	changed and added some ru and uk locales	2015-10-15 17:10:12 +03:00
Nick Winter	e15b30893f	Note tournament end, undo tournament simulation bias	2015-10-15 06:32:52 -07:00
Scott Erickson	844bc942b3	Fix #2785	2015-10-14 16:01:09 -07:00
Scott Erickson	cbf6032c68	Merge branch 'origin/spritesheets'	2015-10-14 15:03:34 -07:00
Scott Erickson	1f00f5b4b9	Remove vestigial function argument	2015-10-14 15:00:57 -07:00
Nick Winter	6f09b2814c	Merge pull request #3113 from codecombat/Imperadeiro98-patch-1 ... Added i18n to contributor signup	2015-10-14 14:53:36 -07:00
Scott Erickson	b77626b8ee	Minor fixes ... Making sure LayerAdapter doesn't wait for ThangType to load the image more than once. LayerAdapter skips rendering if there's a prerendered sprite sheet whose image is not loaded.	2015-10-14 14:48:43 -07:00
Scott Erickson	305cffb5ea	Finish hooking up prerendered spritesheets with LayerAdapter	2015-10-14 14:33:26 -07:00
Imperadeiro98	a4d8aec2a7	Added i18n to contributor signup	2015-10-14 21:06:23 +01:00
Scott Erickson	1085731fdd	Fix colorConfig prerendered sprite sheet data, comparison	2015-10-14 10:41:10 -07:00
Imperadeiro98	a032022cca	Merge pull request #3111 from javatlacati/patch-1 ... Update es-419.coffee	2015-10-14 14:12:11 +01:00
Nick Winter	d814ea9e22	Remove erroneous 256 from user handler	2015-10-14 06:02:00 -07:00
Scott Erickson	39bddb889e	Have LayerAdapter use prerendered spritesheets (unfinished)	2015-10-13 16:43:56 -07:00
RUSLAN LÓPEZ CARRO	8e9b46b73c	Update es-419.coffee	2015-10-13 18:08:44 -05:00
Nick Winter	74763f0614	Fix experience/gems not showing in HeroVictoryModal	2015-10-13 13:44:25 -07:00
Imperadeiro98	803fd24f67	Merge pull request #3109 from Imperadeiro98/new-branch ... Update pt-PT and standardize new tip	2015-10-13 21:08:45 +01: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	2336668b09	Actually commit my ru.coffee merge	2015-10-13 12:32:14 -07:00
Scott Erickson	3fc7b71f7a	Remove log	2015-10-13 12:31:28 -07:00
Scott Erickson	74a7b53498	Remove vestigial test code	2015-10-13 12:30:18 -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	28530f44e6	Merge ru.coffee and uk.coffee	2015-10-13 12:26:28 -07:00
Nick Winter	ac750456b7	Merge ru.coffee and uk.coffee	2015-10-13 12:25:23 -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
Scott Erickson	2f9a689106	Fix LayerAdapter test	2015-10-13 10:40:11 -07:00
Nick Winter	7584872c9f	Fix #3106 introduced by b38a6c50	2015-10-13 08:22:13 -07:00
Imperadeiro98	20371fa146	Indentation re-fix	2015-10-13 16:14:43 +01:00
Nick Winter	d776809e1c	Update Hour of Code student flow and tracking, remove signup requirement	2015-10-13 08:12:07 -07: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
Imperadeiro98	c969768800	Merge pull request #3104 from tufik000/patch-2 ... Link to Ace of Coders	2015-10-13 14:58:22 +01:00
Matt Lott	eda10a55ec	Update /courses?_ppc= logged out instructions	2015-10-12 21:13:03 -07:00
Scott Erickson	66650452b2	Merge remote-tracking branch 'origin/master'	2015-10-12 16:47:59 -07:00