10763 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
AkaKaras	99d3b6a762	Merge remote-tracking branch 'origin/translation' into translation	2015-09-23 00:37:57 -04:00
Nick Winter	b76df77178	Merge branch 'rohmunhoz-patch-1'	2015-09-22 13:13:23 -07:00
Nick Winter	3dd36ebe6e	Fixed merge conflicts.	2015-09-22 13:13:12 -07:00
mads232	ca629e383f	Update da.coffee	2015-09-22 17:16:45 +02:00
Nick Winter	ad00c5688c	Merge branch 'master' into production	2015-09-21 14:16:31 -07:00
Nick Winter	144d6cfb32	Further disable social services in ladder	2015-09-21 14:16:23 -07:00
Nick Winter	49279367d1	Fix facebook.coffee linting issue	2015-09-21 14:16:08 -07:00
Imperadeiro98	8cee4d8baf	Update pt-PT.coffee	2015-09-21 21:30:59 +01:00
Imperadeiro98	7b183e3ae5	Removed some old 'changed' from en.coffee	2015-09-21 21:03:55 +01:00
Nick Winter	b06b7b779c	Merge branch 'master' into production	2015-09-21 12:41:24 -07:00
Nick Winter	3ac8a32be8	Propagate i18n	2015-09-21 12:41:16 -07:00
Nick Winter	c2c3ae4c4c	Add /careers and Ace of Coders links to home page	2015-09-21 12:40:33 -07:00
Imperadeiro98	83f6f8f5d4	Uncommented headers from last merge	2015-09-21 16:36:06 +01:00
Imperadeiro98	d0ba986ba4	Merge pull request #3037 from Mephisto07/patch-1 ... Labels translated to portuguese	2015-09-21 16:33:52 +01:00
Nick Winter	f1add14a27	Fix #2946 (one channel audio)	2015-09-20 16:23:47 -07:00
Imperadeiro98	30c54639a0	Merge pull request #3043 from giaba90/patch-1 ... Update it.coffee	2015-09-19 22:23:36 +01:00
Imperadeiro98	6863e77c42	Merge pull request #3040 from AkaKaras/translation ... update the tournament translation	2015-09-19 22:20:16 +01:00
giaba90	03da5d06f4	Update it.coffee ... i have translated some string	2015-09-19 12:01:11 +02:00
Nick Winter	b4f500333f	Assign pt-BR or zh-HANS for those domains	2015-09-18 08:38:12 -07:00
Nick Winter	1819911551	A/B/C test the first subscription prompt level	2015-09-18 08:28:04 -07:00
Nick Winter	dc10dc3b61	Add skip button to Bloc offer	2015-09-18 08:27:37 -07:00
Tuomas Tanner	c5ac99f4c9	A few tip translations	2015-09-18 17:16:47 +03:00
Nick Winter	cae95f5952	Tweak /careers copy	2015-09-18 05:31:03 -07:00
Nick Winter	b3f2b6d38a	Add a few analytics scripts.	2015-09-18 05:02:18 -07:00
AkaKaras	c667ecef7b	eh just find some typos	2015-09-17 21:25:41 -04:00
AkaKaras	cd4230002b	add the new translations ... add the tournament translation	2015-09-17 21:22:47 -04:00
AkaKaras	f2e1da53ac	Update zh-HANT.coffee	2015-09-17 21:20:07 -04:00
AkaKaras	b271fd60ee	new zh-hans translation ... add the the tournament translation	2015-09-17 21:18:41 -04:00
Nick Winter	c29812bc80	Merge branch 'master' into production	2015-09-17 14:42:49 -07:00
Nick Winter	7a56ecfe4d	Disabled auto-submit for Ace of Coders ranking.	2015-09-17 14:42:13 -07:00
Nicolas Segeti	03af6bee8e	Labels translated to portuguese ... I added some translated texts to the project.	2015-09-17 15:32:58 -03:00
AkaKaras	10c394ce9c	Merge remote-tracking branch 'codecombat/master' into translation	2015-09-16 23:06:48 -04:00
Imperadeiro98	6506b95bad	Merge pull request #3033 from kerradus/ru-translation ... RU translation	2015-09-16 19:50:22 +01:00
Imperadeiro98	8d4af16e2d	Fixed indentation	2015-09-16 19:43:15 +01:00
Imperadeiro98	979d9d35fc	Merge pull request #3036 from javatlacati/patch-2 ... Update es-419.coffee	2015-09-16 19:41:47 +01:00
Imperadeiro98	1621872d8b	Merge pull request #3035 from javatlacati/patch-1 ... Update es-ES.coffee	2015-09-16 19:41:33 +01:00
RUSLAN LÓPEZ CARRO	e8b137398f	Update es-419.coffee ... Some word mispell and auto-translated fixing.	2015-09-16 13:31:50 -05:00
RUSLAN LÓPEZ CARRO	810cbb954e	Update es-ES.coffee	2015-09-16 13:11:40 -05:00
Dmitry Suprun	222878454a	add ru translation	2015-09-16 19:27:48 +03:00
Matt Lott	3cdec9c922	Merge pull request #3031 from The-Alchemist/patch-1 ... fixed wiki URLs	2015-09-16 08:07:50 -07:00
Nicholas Winter	32909aff69	Merge branch 'master' into production	2015-09-15 16:50:51 -07:00
Nicholas Winter	5151ab9091	Describe Ace of Coders tournament	2015-09-15 16:36:50 -07:00
The Alchemist	8f790a3306	fixed wiki URLs ... - Mac dev URL was bad - added Vagrant URL	2015-09-15 13:12:40 -04:00
Imperadeiro98	f59c404a14	Merge pull request #3029 from Ikuyadeu/patch-1 ... Update ja.coffee	2015-09-15 11:46:54 +01:00
Ikuyadeu	d791736420	Update ja.coffee	2015-09-15 15:46:29 +09:00
Matt Lott	3ad13c9a0d	Add /careers page	2015-09-14 17:38:18 -07:00
Nicholas Winter	bce3b94a85	Fix #2970: Turn admin off by default on localhost	2015-09-14 09:39:48 -07:00
Imperadeiro98	3268440b9d	Fixed last merge	2015-09-14 12:23:46 +01:00
Imperadeiro98	54d1a55bb3	Merge pull request #3028 from Fokusnica/locales ... add ru and uk locales	2015-09-14 12:20:33 +01:00
Liubov Derevianko	f5642f3f08	add ru and uk locales	2015-09-14 11:01:02 +03:00