10929 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Matt Lott	b9622d54a3	Merge pull request #2835 from Mihbo/patch-3 ... Update names.coffee	2015-06-18 18:05:35 -07:00
Matt Lott	35e9c60b8b	Merge branch 'master' into production	2015-06-18 15:35:19 -07:00
Matt Lott	b12b7e8ca4	Add user deletion date ... Fixes #2734	2015-06-18 15:17:56 -07:00
Matt Lott	72e458cc80	Unsubscribe deleted users ... Fixes #2733	2015-06-18 15:02:19 -07:00
Matt Lott	d4d4d7bb25	🐛Fix sub handler error typo	2015-06-18 15:02:19 -07:00
flowabuse	5facc41f82	Update ro.coffee ... Forgot a " on line 10.	2015-06-18 18:38:31 +03:00
Nick Winter	bc8e0945a1	Merge branch 'master' into production	2015-06-17 18:17:22 -07:00
Nick Winter	6a4efa9a21	Switching to Boom and Bust as first level of the forest.	2015-06-17 18:17:14 -07:00
Matt Lott	5fb8b18a31	🐛Fix managed subs next payment UI	2015-06-17 16:35:30 -07:00
Matt Lott	5c240d89cd	Cancel recipient subscriptions immediately	2015-06-17 16:35:30 -07:00
flowabuse	1b1482f118	Update ro.coffee ... It had to be done! Sorry it took so long... Life happend...	2015-06-17 03:27:34 +03:00
Nick Winter	593f7a9dd7	Some improvements for handling new art.	2015-06-16 13:50:33 -07:00
Matt Lott	624dabd55a	Level completion counts script	2015-06-16 11:12:23 -07:00
Imperadeiro98	a8c06652ec	Merge pull request #2839 from Mihbo/patch-4 ... Update uk.coffee	2015-06-16 10:01:50 +01:00
Imperadeiro98	88e3d9df1f	Merge pull request #2837 from Ikuyadeu/patch-1 ... Update ja.coffee	2015-06-16 09:58:47 +01:00
Mihbo	ce73d87f92	Update uk.coffee ... some more strings translated	2015-06-16 10:27:32 +03:00
Ikuyadeu	e8a862b2ce	Update ja.coffee	2015-06-16 11:05:18 +09:00
Matt Lott	8df49b036b	Merge pull request #2831 from trotod/fix-achievement-dates ... Show correct achievement earned dates on user page - fixes #2524	2015-06-15 13:21:23 -07:00
Matt Lott	535ca8d2ac	Merge pull request #2834 from laituan245/master ... Add Contact section to About page #2822	2015-06-15 11:11:58 -07:00
Mihbo	50bcbd97be	Update names.coffee ... added some more names	2015-06-15 16:57:31 +03:00
Imperadeiro98	c35c9eadf1	Merge pull request #2833 from Ikuyadeu/patch-1 ... Update ja.coffee	2015-06-15 11:30:57 +01:00
Imperadeiro98	20d7c82d0e	Merge pull request #2832 from Mihbo/patch-2 ... Update uk.coffee	2015-06-15 11:30:30 +01:00
Lai Tuan	aabae7082e	Add Contact section to About page #2822	2015-06-15 19:11:48 +09:00
Ikuyadeu	fa8d317745	Update ja.coffee	2015-06-15 18:48:04 +09:00
Mihbo	fd5a99b9d0	Update uk.coffee ... translated some more strings	2015-06-15 10:02:24 +03:00
David Liu	1c633a8ee4	Show correct achievement earned dates on user page ... fixes #2524	2015-06-14 15:40:14 -07:00
Arthur Neves	6cb673e228	i18N press enter on spell view	2015-06-14 23:20:49 +02:00
Nick Winter	f7eaf91bae	Hopefully making Systems editable by Artisans.	2015-06-14 12:49:45 -07:00
Nick Winter	7d637a0a27	Added a couple levels' next-campaign links.	2015-06-14 11:07:21 -07:00
Nick Winter	b1680f500b	Merge branch 'master' of https://github.com/codecombat/codecombat	2015-06-14 11:06:48 -07:00
Nick Winter	1b38ffcd4c	Merge branch 'Kavignon-SpanishTranslation'	2015-06-14 11:06:34 -07:00
Nick Winter	ac2039c81a	Merged fr.coffee.	2015-06-14 11:06:15 -07:00
Imperadeiro98	e91526d692	Merge pull request #2825 from Ikuyadeu/patch-1 ... Update ja.coffee	2015-06-14 19:04:48 +01:00
Ikuyadeu	3f3f44038e	Update ja.coffee	2015-06-14 17:11:26 +09:00
Kevin Avignon	e263866a3a	Made some update within the spanish file	2015-06-13 23:33:48 -04:00
Kevin Avignon	c806b8865e	Made some changes into the french file	2015-06-13 11:39:25 -04:00
Matt Lott	fdf500cac1	Average level playtimes script	2015-06-11 14:32:14 -07:00
Imperadeiro98	2f9e9b1b67	Merge pull request #2818 from Zleep-Dogg/da-translation ... A bit of Danish translation pt. 2	2015-06-11 11:24:26 +01:00
Esben Madsen	db25007765	A bit of Danish translation pt. 2	2015-06-11 00:35:56 +02:00
Nick Winter	0b125c48ca	Merge branch 'master' into production	2015-06-10 15:20:02 -07:00
Nick Winter	a85d52ebe2	Made a tabbed interface for Programmaticon V's Vector and standard library documentation.	2015-06-10 15:18:37 -07:00
Imperadeiro98	28b7820149	Merge pull request #2814 from Zleep-Dogg/da-translation ... A bit of Danish translation	2015-06-10 10:58:28 +01:00
Esben Madsen	8293c717a1	A bit of Danish translation	2015-06-10 01:05:12 +02:00
Imperadeiro98	1383d4c9b7	Merge pull request #2813 from Danylo-Dubinin/patch-3 ... translate few strings	2015-06-09 19:44:56 +01:00
Nick Winter	906ef88115	Merge branch 'master' into production	2015-06-09 11:23:35 -07:00
Nick Winter	bb417e9a97	Tweaked glacier terrain generation to work similarly to dungeon (still needs flare) for #2812.	2015-06-09 11:23:05 -07:00
Nick Winter	4329861bc4	Merge pull request #2812 from nemoyatpeace/patch-6 ... Added Ice Level to terrain generator	2015-06-09 11:13:48 -07:00
Danylo Dubinin	c0f05e7c86	translate few strings	2015-06-09 18:42:20 +03:00
nemoyatpeace	e0e62271b4	Added Ice Level to terrain generator	2015-06-09 18:30:40 +08:00
Imperadeiro98	66c126a8df	Update pt-PT.coffee	2015-06-08 23:39:34 +01:00