林鑫
|
2bf654c8fa
|
Translate some items under 'common','versions' and 'editor'.
|
2014-04-14 08:57:04 +08:00 |
|
Nick Winter
|
84884ca7d7
|
Merge pull request #837 from dpen2000/FixesTo831
Additional fix on #831
|
2014-04-13 17:07:37 -07:00 |
|
dpen2000
|
2345a7d8e8
|
Additional fix on #831 - remove additional call to fetch as constructor of SimulatorsLeaderboardData does fetch, remove commented code
|
2014-04-13 19:58:50 -04:00 |
|
Nick Winter
|
8eb1ab115a
|
Merge branch 'master' into production
|
2014-04-13 16:53:04 -07:00 |
|
Nick Winter
|
7fcff825a8
|
Fixed #310 by tweaking the styling to emphasize stroke over fill.
|
2014-04-13 16:42:21 -07:00 |
|
Nick Winter
|
7b14215339
|
Fixed footer background color on LevelView.
|
2014-04-13 16:06:47 -07:00 |
|
Nick Winter
|
ba38509a1d
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-04-13 15:29:22 -07:00 |
|
Nick Winter
|
af0b8aa5e2
|
A few fixes and cleanup for #831.
|
2014-04-13 15:28:16 -07:00 |
|
Nick Winter
|
3d945492b0
|
Merge branch 'SimulatorsLeaderboard2' of git://github.com/dpen2000/codecombat into dpen2000-SimulatorsLeaderboard2
|
2014-04-13 14:48:45 -07:00 |
|
Nick Winter
|
a9725f2dc6
|
A bit of error handling.
|
2014-04-13 14:48:36 -07:00 |
|
Nick Winter
|
fb55eec9bc
|
Merge pull request #830 from gintau/feature/loading-views
Merge master to Feature/loading views
|
2014-04-13 14:42:37 -07:00 |
|
Michael Schmatz
|
1f297d977c
|
Merge pull request #835 from codecombat/master
Master into production
|
2014-04-13 14:06:57 -07:00 |
|
Michael Schmatz
|
e32524536e
|
Quick fix for crashing server
Undo when investigating which schema does this
|
2014-04-13 14:06:29 -07:00 |
|
Ting-Kuan
|
8e19d8b71f
|
Change some resource loading logic to fit new SuperModel.
|
2014-04-13 13:29:43 -04:00 |
|
Aditya Raisinghani
|
abb402c68a
|
Changes to fix infinite posting.
|
2014-04-13 21:41:53 +05:30 |
|
Inez KEMENES
|
094704f0c5
|
Update hu.coffee
|
2014-04-13 17:29:29 +02:00 |
|
Ting-Kuan
|
573a4ae847
|
Merge branch 'feature/loading-views' into feature/revise-supermodel-based-on-#815
Conflicts:
app/models/SuperModel.coffee
app/views/editor/thang/edit.coffee
|
2014-04-13 10:37:35 -04:00 |
|
Ting-Kuan
|
4979344ee5
|
Remove schema loading code.
|
2014-04-13 10:36:09 -04:00 |
|
Jasper D'haene
|
2cde44319c
|
added some app schemas + missing schema stub
|
2014-04-13 16:05:11 +02:00 |
|
Jasper D'haene
|
10a3675fd4
|
Merge branch 'master' of https://github.com/JasperDhaene/codecombat
|
2014-04-13 15:25:13 +02:00 |
|
Jasper D'haene
|
7aa2a5f0c8
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-04-13 15:24:58 +02:00 |
|
Jasper D'haene
|
4157447337
|
completed bus schemas
|
2014-04-13 15:23:24 +02:00 |
|
Aditya Raisinghani
|
ffd057899e
|
Removed anon name collisions and reset anon user name if name is taken in interim.
|
2014-04-13 17:55:49 +05:30 |
|
JasperDhaene
|
59c60472a5
|
added line breaks
|
2014-04-13 14:11:10 +02:00 |
|
Glen De Cauwsemaecker
|
0ce04b147d
|
Merge pull request #824 from julycoolwind/patch-1
Update zh-HANS.coffee
|
2014-04-13 13:49:55 +02:00 |
|
Glen De Cauwsemaecker
|
93cb19681e
|
Merge pull request #827 from M-r-A/i18n-wininstaller
Update RU for windows-script-installer
|
2014-04-13 13:10:28 +02:00 |
|
JasperDhaene
|
3915ebc8b3
|
Updated some Bus schemas.
|
2014-04-13 12:31:12 +02:00 |
|
Jasper D'haene
|
9f1ef2bb8d
|
updated Dutch locale + README
|
2014-04-13 12:05:45 +02:00 |
|
dpen2000
|
ec3c292b72
|
Implement simulators leaderboard
|
2014-04-13 02:35:58 +01:00 |
|
Nick Winter
|
0001bcf2b7
|
Merge branch 'master' into production
|
2014-04-12 15:01:37 -07:00 |
|
Nick Winter
|
9941607bcd
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-04-12 14:53:15 -07:00 |
|
Nick Winter
|
08616def10
|
Refactored contribute views to share some templates and link to users' profile photos and GitHub accounts when available.
|
2014-04-12 14:53:09 -07:00 |
|
Nick Winter
|
95def9f4da
|
Merge pull request #829 from M-r-A/i18n
Update RU.coffee
|
2014-04-12 14:29:19 -07:00 |
|
Ting-Kuan
|
77c4c586dd
|
Merge branch 'feature/loading-views' into feature/revise-supermodel-based-on-#815
Conflicts:
app/locale/en.coffee
|
2014-04-12 17:13:06 -04:00 |
|
Ting-Kuan
|
ee09237fec
|
Merge branch 'feature/loading-views' of https://github.com/gintau/codecombat into feature/loading-views
Conflicts:
app/locale/en.coffee
app/models/SuperModel.coffee
app/views/editor/thang/edit.coffee
app/views/kinds/CocoView.coffee
|
2014-04-12 17:10:49 -04:00 |
|
Ting-Kuan
|
508b570fea
|
Merge branch 'master' into feature/loading-views
Conflicts:
.gitignore
app/locale/en.coffee
app/models/SuperModel.coffee
app/views/editor/thang/edit.coffee
app/views/kinds/CocoView.coffee
|
2014-04-12 17:07:30 -04:00 |
|
Alexei Nikitin
|
9879cffdbc
|
Update RU.coffee
|
2014-04-13 01:06:42 +04:00 |
|
Ting-Kuan
|
3d4c2c7265
|
Merge branch 'master' into feature/loading-views
Conflicts:
.gitignore
app/locale/en.coffee
app/models/SuperModel.coffee
app/views/editor/thang/edit.coffee
app/views/kinds/CocoView.coffee
|
2014-04-12 16:54:23 -04:00 |
|
Ting-Kuan
|
0e08a4106b
|
Merge branch 'master' of https://github.com/codecombat/codecombat
Conflicts:
scripts/windows/coco-dev-setup/batch/localisation/fr.coco
scripts/windows/coco-dev-setup/batch/localisation/languages.coco
scripts/windows/coco-dev-setup/batch/localisation/zh.coco
scripts/windows/coco-dev-setup/batch/localization/de.coco
scripts/windows/coco-dev-setup/batch/localization/zh-HANS.coco
scripts/windows/coco-dev-setup/batch/localization/zh-HANT.coco
scripts/windows/coco-dev-setup/batch/scripts/download_and_install_app.bat
scripts/windows/coco-dev-setup/batch/scripts/download_and_install_applications.bat
scripts/windows/coco-dev-setup/batch/scripts/get_language.bat
scripts/windows/coco-dev-setup/batch/scripts/get_system_information.bat
scripts/windows/coco-dev-setup/batch/scripts/get_text.bat
scripts/windows/coco-dev-setup/batch/scripts/github_setup.bat
scripts/windows/coco-dev-setup/batch/scripts/npm_and_brunch_setup.bat
scripts/windows/coco-dev-setup/batch/scripts/print_dashed_seperator.bat
scripts/windows/coco-dev-setup/batch/scripts/print_exit.bat
scripts/windows/coco-dev-setup/batch/scripts/print_seperator.bat
scripts/windows/coco-dev-setup/batch/scripts/setup.bat
scripts/windows/coco-dev-setup/batch/scripts/sign_license.bat
scripts/windows/coco-dev-setup/batch/setup.bat
scripts/windows/coco-dev-setup/recycle_bin/dev-setup.bat
scripts/windows/coco-dev-setup/recycle_bin/git-test.bat
|
2014-04-12 16:52:14 -04:00 |
|
Ting-Kuan
|
7ae3bd5a60
|
Fix style and supermodel based on #815.
Fix ladder_view and ladder_tab.
Change error handling functions in CocoView.
|
2014-04-12 16:29:49 -04:00 |
|
Alexei Nikitin
|
19932d0051
|
Update RU for windows-script-installer
|
2014-04-13 00:25:52 +04:00 |
|
Nick Winter
|
072729acc3
|
Non-admins can save (but not overwrite) file uploads.
|
2014-04-12 13:03:46 -07:00 |
|
Nick Winter
|
8349578057
|
Fixed #786.
|
2014-04-12 12:35:45 -07:00 |
|
Glen De Cauwsemaecker
|
1f3bf9e8ab
|
Modified seperation scripts to have the correct width
|
2014-04-12 21:16:49 +02:00 |
|
Glen De Cauwsemaecker
|
1efa1a54e1
|
Seperated win7 and win8 to prevent any future awkwardness
|
2014-04-12 21:15:36 +02:00 |
|
Glen De Cauwsemaecker
|
9157a5d3ba
|
Seperation of s3 and s4 tag in the installation process.
|
2014-04-12 21:11:12 +02:00 |
|
Glen De Cauwsemaecker
|
5ef1e0b7ad
|
Merge https://github.com/codecombat/codecombat
|
2014-04-12 20:49:15 +02:00 |
|
Glen De Cauwsemaecker
|
74f8a469a5
|
Exit script is now also localized
|
2014-04-12 20:49:08 +02:00 |
|
Glen De Cauwsemaecker
|
8e8b49708b
|
Readme at end of installation is now also localized
|
2014-04-12 20:38:26 +02:00 |
|
Glen De Cauwsemaecker
|
5c7a255e98
|
License agreement and feedback for that is now also localized
|
2014-04-12 20:34:06 +02:00 |
|