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 |
|
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 |
|
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 |
|
Michael Schmatz
|
20642de3e2
|
Merge pull request #226 from wakeup/patch-1
Updated Turkish translation
|
2014-01-17 08:29:59 -08:00 |
|
Volkan Gezer
|
f072030198
|
Updated Turkish translation
Updated Turkish translation
|
2014-01-17 17:23:27 +01:00 |
|
Nick Winter
|
d7e2b81909
|
Merge pull request #224 from zachster01/master
corrected sass-brunch release requirement
|
2014-01-16 19:53:22 -08:00 |
|
Zach Martin
|
ec3e835a78
|
changed sass-brunch version requirement in package.json to allow for easier environment installation
|
2014-01-16 21:33:24 -06:00 |
|
Nick Winter
|
053927eaec
|
Fixed home page wizard scale.
|
2014-01-16 16:27:34 -08:00 |
|
Nick Winter
|
5267febd8f
|
Couple fixes for small errors when running with no Programmables.
|
2014-01-16 14:29:57 -08:00 |
|
Michael Schmatz
|
389fa9a30b
|
Merge pull request #220 from Elfisen/patch-2
spelling and grammar mistakes - fr.coffee
|
2014-01-16 14:26:10 -08:00 |
|
Nick Winter
|
43831c27ce
|
Merge pull request #221 from GlenDC/master
Fixed issue #160 and updated my repository
|
2014-01-16 13:58:14 -08:00 |
|
GlenDC
|
553ad833ed
|
Merge https://github.com/codecombat/codecombat
|
2014-01-16 22:27:09 +01:00 |
|
GlenDC
|
5cc24ea1b2
|
Logs now a warning in the console to give user the feedback that there are no programmable thangs which makws the level unplayable.
|
2014-01-16 22:26:34 +01:00 |
|
GlenDC
|
b557c43f60
|
Hotfix for previous commit, forgot to uncommit some stuff
|
2014-01-16 22:22:42 +01:00 |
|
GlenDC
|
926b31f62f
|
Resolved issue #160
|
2014-01-16 22:18:38 +01:00 |
|
Allisson
|
580a439fab
|
spelling and grammar mistakes - fr.coffee
Just a correction of what really hurt the eye
|
2014-01-16 21:15:39 +01:00 |
|
Nick Winter
|
1fb68ae717
|
Fixed bug with team assignments and spell permissions.
|
2014-01-16 11:37:04 -08:00 |
|
Michael Schmatz
|
d0f1510623
|
Merge branch 'pr/197'
Conflicts:
app/locale/fr.coffee
|
2014-01-16 10:46:56 -08:00 |
|
Michael Schmatz
|
6e43daa98a
|
Revert "Merge branch 'pr/190'"
This reverts commit 457accf729 , reversing
changes made to 9df9f75f64 .
|
2014-01-16 10:40:05 -08:00 |
|
Michael Schmatz
|
457accf729
|
Merge branch 'pr/190'
Conflicts:
app/locale/fr.coffee
|
2014-01-16 10:33:00 -08:00 |
|
Michael Schmatz
|
9df9f75f64
|
Merge branch 'pr/200'
Conflicts:
app/locale/fr.coffee
|
2014-01-16 10:24:55 -08:00 |
|
Scott Erickson
|
c5b9b103c5
|
Merge branch 'feature/team-colors'
Conflicts:
app/lib/world/world.coffee
app/models/ThangType.coffee
|
2014-01-16 10:14:21 -08:00 |
|