Commit graph

2561 commits

Author SHA1 Message Date
Scott Erickson
0a78368217 Refactored user authentication again. Now the user object is inserted into main.html, which was renamed from index.html so the express static middleware wouldn't serve it. 2014-04-02 13:12:24 -07:00
Inez KEMENES
70d42b6eae Update hu.coffee 2014-04-02 16:00:15 +02:00
Inez KEMENES
9acde85c8c Update hu.coffee 2014-04-02 15:24:26 +02:00
Nick Winter
ddf0636e7e Revert logic for deleting model properties that interfered with signup. 2014-04-01 23:16:50 -07:00
Glen De Cauwsemaecker
381f4e906e More updates. 2014-04-02 04:52:41 +02:00
Glen De Cauwsemaecker
8926429987 Refactoring code to use powershell instead of the C++ utilities. In order to remove the VS2010dll dependancy 2014-04-02 04:31:20 +02:00
Nick Winter
9e947ce7ab Fix for c94a7e for #356 2014-04-01 13:31:59 -07:00
Nick Winter
626a689553 Raised search fetch limit to head off exploding ThangType list. #377 2014-04-01 13:20:15 -07:00
Nick Winter
ae9769e3ce Added read only notification in editors. Fixed #374. 2014-04-01 13:15:30 -07:00
Nick Winter
c94a73e066 Fixed #356. 2014-04-01 12:13:11 -07:00
Nick Winter
ba3c4af536 Fixed last piece of #673. 2014-04-01 10:51:03 -07:00
Nick Winter
7807fdbbc6 Merged pt-PT locale conflicts. 2014-04-01 10:41:40 -07:00
Nick Winter
99c4704e1f Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-01 10:31:42 -07:00
Nick Winter
bfa71d01ff Merged. 2014-04-01 10:31:22 -07:00
Nick Winter
477545d50d Merge pull request #763 from OlenaGapak/patch-1
Update uk.coffee
2014-04-01 10:26:55 -07:00
Nick Winter
b5f69687cf Fixed #488. 2014-04-01 10:23:39 -07:00
Nick Winter
b316a3e078 Merge branch 'dev/Warn_when_a_depended-on_System_is_missing' of git://github.com/gintau/codecombat into gintau-dev/Warn_when_a_depended-on_System_is_missing 2014-04-01 09:44:06 -07:00
Nick Winter
785cb342a2 Merge branch 'master' of git://github.com/tmrdja/codecombat into tmrdja-master 2014-04-01 09:12:48 -07:00
Dominik Kundel
45f1d8d408 added two programming quotes 2014-04-01 17:16:35 +02:00
swapnesh
497563bc0a Added more names for #53 2014-04-01 17:50:33 +05:30
OlenaGapak
1799310261 Update uk.coffee
ukrainian localization
2014-04-01 14:59:46 +03:00
Glen De Cauwsemaecker
3bd2a064c4 Merge pull request #761 from JasperDhaene/master
updated dutch locale
2014-04-01 10:13:31 +02:00
jaudhaen
be9edb74af updated dutch locale 2014-04-01 09:26:42 +02:00
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