Commit graph

3677 commits

Author SHA1 Message Date
GlenDC
ad7ae2236f Merge branch 'patch-2' of https://github.com/ser-storchak/codecombat 2014-01-19 04:03:36 +01:00
GlenDC
ab4e7204ad Merge branch 'master' of https://github.com/rezahb/codecombat 2014-01-19 03:59:01 +01:00
Rehb
65c734be76 Update fa.coffee 2014-01-19 01:49:15 +03:30
Fab
ea4cc848f2 German translation
Partly translate some parts of the game
2014-01-18 22:47:17 +01:00
ser-storchak
c9ea0540ef Update ru.coffee 2014-01-18 12:08:35 -08:00
Nick Winter
b06426c85b Merge pull request #245 from MartinDelille/translation2
Adding more translation fixes
2014-01-18 11:45:44 -08:00
Nick Winter
907c84c80c Merge pull request #246 from guricchi/patch-14
Updated sr.coffee
2014-01-18 11:45:00 -08:00
guricchi
f0f871d8a5 Updated sr.coffee 2014-01-18 11:27:31 -08:00
Martin Delille
54234f0c9e better description for nick 2014-01-18 19:31:27 +01:00
Martin Delille
0efd7f4066 dix conjugaison 2014-01-18 19:30:54 +01:00
Martin Delille
90edce1db4 fix accent 2014-01-18 19:30:41 +01:00
Michael Schmatz
169d5a887a Merge pull request #244 from codecombat/master
Merge production into master for deploy
2014-01-18 10:21:59 -08:00
Michael Schmatz
5bc2814342 Fixed CLA signing bug
Fat arrows to the rescue!
2014-01-18 10:16:58 -08:00
Nick Winter
ea44047c04 Merge pull request #225 from ser-storchak/patch-2
Update ru.coffee
2014-01-18 10:14:08 -08:00
Nick Winter
15717847cd Merge pull request #243 from MartinDelille/mdTranslation
fix french translation
2014-01-18 10:13:38 -08:00
Nick Winter
b9ff09b709 Merged meself up some hu and tr. 2014-01-18 10:09:59 -08:00
Martin Delille
8a9859c3f5 more translation 2014-01-18 18:45:29 +01:00
Nick Winter
99a43b97e8 Merge pull request #242 from flauta/patch-1
Update it.coffee
2014-01-18 09:39:01 -08:00
Nick Winter
19267505e1 Merge pull request #240 from guricchi/patch-13
Updated el.coffee
2014-01-18 09:38:17 -08:00
Nick Winter
11c80f36f4 Merge pull request #239 from guricchi/patch-12
Updated da.coffee
2014-01-18 09:38:05 -08:00
Nick Winter
cd605b857b Merge pull request #238 from guricchi/patch-11
Updated hu.coffee
2014-01-18 09:37:41 -08:00
Nick Winter
f30340cfda Merge pull request #237 from guricchi/patch-10
updated pl.coffee
2014-01-18 09:37:11 -08:00
Nick Winter
1fca0322f3 Merge pull request #236 from cobaimelan/master
new translate
2014-01-18 09:36:54 -08:00
Nick Winter
b23609a97b Merge pull request #235 from guricchi/patch-9
Updated tr.coffee
2014-01-18 09:36:25 -08:00
Martin Delille
f267971207 fix french translation 2014-01-18 18:35:53 +01:00
Nick Winter
c83708526a Merge pull request #233 from guricchi/patch-7
Updated zh-HANT.coffee
2014-01-18 09:35:27 -08:00
Nick Winter
6b6c51ce06 Merge pull request #232 from guricchi/patch-6
Updated zh-HANS.coffee
2014-01-18 09:35:08 -08:00
Nick Winter
4654bd5a27 Merge pull request #231 from guricchi/patch-5
Updated ja.coffee
2014-01-18 09:34:17 -08:00
flauta
63f712aa8c Update it.coffee 2014-01-18 10:48:26 +01:00
csuvsaregal
c89a88848b Update hu.coffee
I've made some corrections. Later I'll do some new translations. 

csuvasregal - Sárosi Gergely
2014-01-18 01:07:19 +01:00
guricchi
c6629e4e48 Updated el.coffee 2014-01-17 12:32:22 -08:00
guricchi
b71c5cd1ef Updated da.coffee 2014-01-17 12:09:23 -08:00
guricchi
7d8d6ed24f Updated hu.coffee 2014-01-17 11:55:14 -08:00
guricchi
c97d67515b updated pl.coffee 2014-01-17 11:45:40 -08:00
cobaimelan
93fc7be44d new translate 2014-01-17 21:42:51 +02:00
guricchi
9bf08b9d20 Updated tr.coffee 2014-01-17 11:08:35 -08:00
guricchi
1c018b0cac Updated zh-HANT.coffee 2014-01-17 11:01:17 -08:00
guricchi
70a3503097 Updated zh-HANS.coffee 2014-01-17 10:51:18 -08:00
Scott Erickson
8b0a0c4e51 Added unsubscribe view. 2014-01-17 10:47:42 -08:00
Scott Erickson
104ea27dc0 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-17 10:37:39 -08:00
guricchi
4cbfd846f4 Updated ja.coffee 2014-01-17 10:37:04 -08:00
Scott Erickson
9ba8fe451c Fixed errors to run 'res.end()' 2014-01-17 10:30:47 -08:00
Michael Schmatz
91c1b62375 Merge pull request #229 from guricchi/patch-3
Updated es-ES.coffee
2014-01-17 10:28:12 -08:00
Michael Schmatz
db96bbaf9a Merge pull request #228 from guricchi/patch-2
Updated es-419.coffee
2014-01-17 10:27:57 -08:00
Michael Schmatz
5b42b4b7f5 Merge pull request #227 from guricchi/patch-1
Updated pt-PT.coffee
2014-01-17 10:27:17 -08:00
guricchi
3e040d9d30 Updated es-ES.coffee 2014-01-17 10:21:33 -08:00
guricchi
d4fec100de Updated es-419.coffee 2014-01-17 10:17:23 -08:00
guricchi
f898c8d57c Updated pt-PT.coffee 2014-01-17 10:07:38 -08:00
Scott Erickson
6e47a6b8fd Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-17 09:53:40 -08:00
Scott Erickson
3caf16ae0c Set up sendwithus.
Created a 'notification' email subscription.
2014-01-17 09:53:17 -08:00