Commit graph

10086 commits

Author SHA1 Message Date
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
Imperadeiro98
ee612daaa6 Merge pull request #3025 from javatlacati/patch-1
Update es-419.coffee
2015-09-13 21:14:16 +01:00
Imperadeiro98
76a92069e5 Merge pull request #3024 from Ikuyadeu/patch-1
Update ja.coffee
2015-09-13 21:13:14 +01:00
RUSLAN LÓPEZ CARRO
3ce32837ce Update es-419.coffee
Finished! :D
2015-09-13 12:46:39 -05:00
Ikuyadeu
14f9ac4d71 Update ja.coffee 2015-09-13 17:11:39 +09:00
Matt Lott
b68e5e209b Update course details page 2015-09-12 22:02:03 -07:00
Matt Lott
921fe7f807 Add .vscode/ to .gitignore 2015-09-12 22:02:03 -07:00
AkaKaras
b60f9f1bde Merge remote-tracking branch 'codecombat/master' into translation 2015-09-12 18:30:38 -04:00
Imperadeiro98
bdc1dea168 Merge pull request #3019 from javatlacati/patch-1
Update es-419.coffee
2015-09-12 21:07:59 +01:00
Imperadeiro98
a52ff3a94c Merge pull request #3014 from AkaKaras/translation
new translation
2015-09-12 20:58:22 +01:00
RUSLAN LÓPEZ CARRO
ecd7c24014 Update es-419.coffee
Changed to formal language for teachers survey.
$120 dollars? D: OMG perhaps a little expensive for third worlders like me.
Is it finally done? :D
2015-09-12 13:56:13 -05:00
Nicholas Winter
3cba4b23eb Merge branch 'master' into production 2015-09-12 06:55:30 -07:00
Nicholas Winter
a4c1a599da Merge branch 'master' of https://github.com/codecombat/codecombat 2015-09-12 06:54:32 -07:00
Nicholas Winter
3eeb9a6a26 Reset some stuff for Ace of Coders and Robot Ragnarok. Put multiplayer link back now that we have two good mirror match levels and aren't listing the old arenas. 2015-09-12 06:54:14 -07:00
AkaKaras
c04e347543 add new translation
same reason as zh-HANS
2015-09-11 18:25:09 -04:00
AkaKaras
672bfa1417 added new translation
added new translation that i found from en
2015-09-11 18:23:16 -04:00
AkaKaras
467dd4079b Merge remote-tracking branch 'codecombat/master' into translation 2015-09-11 17:56:21 -04:00
Imperadeiro98
31587b9aa7 Uncommented some translations 2015-09-11 19:51:02 +01:00
Imperadeiro98
1ccbce0937 Merge pull request #3013 from albenarammou/patch-3
Update bg.coffee
2015-09-11 19:42:48 +01:00
albenarammou
7be5dd0d14 Update bg.coffee 2015-09-11 19:31:47 +03:00
Imperadeiro98
a9e1ad34d5 Merge pull request #3012 from javatlacati/patch-1
Update es-419.coffee
2015-09-11 13:23:09 +01:00
RUSLAN LÓPEZ CARRO
45cd6f5411 Update es-419.coffee
Addeded spanish slang for Thang.
Amigos hispanohablantes, favor de opinar. ( A los mexicanos seguros nos encantará )
2015-09-10 19:15:13 -05:00
Imperadeiro98
bad15ddcdc Uncommented an header 2015-09-10 22:18:24 +01:00
Imperadeiro98
9ffe8b7a48 Merge pull request #3011 from javatlacati/patch-1
Update es-419.coffee
2015-09-10 22:17:45 +01:00
RUSLAN LÓPEZ CARRO
b819a3f166 Update es-419.coffee
Thangs is the slang for Things?
2015-09-10 15:57:45 -05:00
Matt Lott
b888e9f97a Read concepts from campaign in course data update script 2015-09-10 10:56:01 -07:00
Matt Lott
a2577cc521 Update courses landing page 2015-09-10 10:39:21 -07:00
Nick Winter
8f22ede9ad Merge branch 'master' into production 2015-09-09 21:55:04 -07:00