Commit graph

2754 commits

Author SHA1 Message Date
Ting-Kuan
e076440d1b Move Noty to vendor folder. 2014-04-01 02:41:04 -04:00
Ting-Kuan
085d181ed3 Use Noty to produce warning message while adding component with not added system. 2014-04-01 00:47:50 -04:00
Michael Schmatz
f084588adf Merge pull request #758 from dkundel/master
update de.coffee
2014-03-31 16:06:38 -07:00
Nick Winter
0bd8321345 Updated Mondo Bizarro i18n comma. 2014-03-31 16:02:56 -07:00
Dominik Kundel
a9b225ec03 fixed indentation de.coffee 2014-04-01 00:55:45 +02:00
Nick Winter
8c013c1192 Fixed 101: added level completion status to /play. 2014-03-31 15:48:22 -07:00
Michael Schmatz
19896dd2e1 Merge pull request #756 from dpen2000/SmallSetupFix
Fix Syntax error in ruby.py
2014-03-31 15:36:29 -07:00
Dominik Kundel
069a7a41e4 update de.coffee 2014-04-01 00:34:51 +02:00
Michael Schmatz
6a86d82fba Merge pull request #757 from codecombat/pr/755
Pr/755
2014-03-31 15:34:34 -07:00
Glen De Cauwsemaecker
b0403cf1cd Merge branch 'feature-win-setup' 2014-04-01 01:07:27 +02:00
Glen De Cauwsemaecker
be8d6800e3 v 1.0 of the installer 2014-04-01 01:01:06 +02:00
Michael Schmatz
b021b65ee1 Copied new i18n tags to all languages 2014-03-31 15:31:38 -07:00
dpen2000
08d7d2cc87 Fix error "SyntaxError: EOL while scanning string literal" when running setup.py script 2014-03-31 23:15:18 +01:00
Alexei Nikitin
0473ce2df1 Update ru.coffee 2014-03-31 15:11:56 -07:00
Alexei Nikitin
6ff8d0fbe3 Update en.coffee 2014-03-31 15:10:51 -07:00
Nick Winter
dc0b9e04b0 Merge pull request #753 from Jazzis18/patch-1
Update ru.coffee
2014-03-31 15:03:13 -07:00
Bia41
898018ac91 Updated pt-PT locale
Added some translations for European Portuguese.
2014-03-31 22:53:08 +01:00
Jazzis18
c3e4b4d279 Update ru.coffee
Добавил пробел в начало строки переменной join_desc_3, а то в тексте получалось слитно всё.
2014-04-01 03:34:45 +06:00
Nick Winter
a319e183b6 Fixed a little mistake with user signup. 2014-03-31 14:02:15 -07:00
Nick Winter
382422829e Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-31 13:56:17 -07:00
Nick Winter
389323953b Fixed #180. 2014-03-31 13:56:13 -07:00
Nick Winter
3555a697cc Merge pull request #752 from M-r-A/patch-1
Missing l10n
2014-03-31 13:37:41 -07:00
Alexei Nikitin
4c3e8671a3 Update ru.coffee 2014-03-31 13:33:22 -07:00
Alexei Nikitin
9e1e59bb3f Update en.coffee 2014-03-31 13:32:11 -07:00
Nick Winter
d8a194f895 Actually using loading screen template. 2014-03-31 13:21:08 -07:00
Nick Winter
0af05176f6 Re-added a minor fix that got lost. 2014-03-31 13:00:40 -07:00
Nick Winter
a9a0a55331 Merge branch 'master' of git://github.com/dkundel/codecombat into dkundel-master 2014-03-31 12:42:53 -07:00
Dominik Kundel
62b6387090 updated aether dependency to support coffeescript 2014-03-31 20:53:28 +02:00
Dominik Kundel
725a8bc2d9 updated locales 2014-03-31 20:48:07 +02:00
Dominik Kundel
1c6aea9c1c Merge remote-tracking branch 'upstream/master' 2014-03-31 20:35:32 +02:00
Alexei Nikitin
1719358856 Update ru.coffee 2014-03-31 11:32:01 -07:00
Alexei Nikitin
aeddb64f90 Update base.jade 2014-03-31 11:09:44 -07:00
tmrdja
dfe6bce351 Added contextmenu
Added contextmenu
2014-03-31 18:33:14 +02:00
Bia41
167ee90a70 #673 Replaced .once with @listenToOnce
Replaced .once with @listenToOnce on CocoModel, as requested on Issue #673
2014-03-31 05:02:13 +01:00
Nick Winter
01bc34d3ef Merge branch 'master' into production 2014-03-30 17:25:11 -07:00
Nick Winter
cb27124285 Fixed #135. 2014-03-30 17:24:07 -07:00
Nick Winter
8df80ad1bc Merged AKeeper's ru.coffee additions, taking into account M-r-A's suggestions. 2014-03-30 13:33:21 -07:00
Nick Winter
b0a4a97ff1 Merged 2014-03-30 12:54:48 -07:00
Bia
53c20d3b9d Added Thang names 2014-03-30 20:43:48 +01:00
Nick Winter
b2420a738f Merge branch 'master' into production 2014-03-30 11:00:56 -07:00
tmrdja
f8de6162d1 Added contextmenu
Added contextmenu with Delete and Duplicate button
2014-03-30 19:38:54 +02:00
tmrdja
470a79e6b0 Added contextmenu 2014-03-30 19:33:21 +02:00
Nick Winter
6bff295d2e Linking up Prabh's Coin Mania level. 2014-03-29 18:04:29 -07:00
Nick Winter
1b92654a44 Merged. 2014-03-29 17:45:01 -07:00
Nick Winter
54f4e8d1e9 Merge branch 'dev/error_message_for_editor' of git://github.com/gintau/codecombat into gintau-dev/error_message_for_editor 2014-03-29 17:38:14 -07:00
Nick Winter
a610f66cbe Merge pull request #733 from smasher816/master
Installer Changes
2014-03-29 17:32:20 -07:00
Nick Winter
a79fe37ca1 Merged; made a couple tweaks. 2014-03-29 17:30:12 -07:00
Alexei Nikitin
ee5ee4bc88 Update ru.coffee 2014-03-29 17:28:44 -07:00
Nick Winter
05acfcfb1b Merge branch 'master' of git://github.com/domenukk/codecombat into domenukk-master 2014-03-29 17:06:44 -07:00
Rowan Decker
cad1448b9f Add Help Message
Not everyone runs Ubuntu/Debian and is using apt-get, so add a friendly reminder to check with your distro's documentation for help.
2014-03-29 18:59:10 -05:00