codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-11-24 08:08:15 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
codecombat/app
History
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
..
assets Merge branch 'feature/jsondiffpatch' 2014-04-11 22:52:58 -07:00
collections Added a patches view. 2014-04-11 14:19:17 -07:00
lib Merge branch 'feature/jsondiffpatch' 2014-04-11 22:52:58 -07:00
locale Merge branch 'feature/jsondiffpatch' 2014-04-12 08:52:35 -07:00
models Moved the model schemas into a models folder. 2014-04-12 10:51:02 -07:00
schemas Moved the model schemas into a models folder. 2014-04-12 10:51:02 -07:00
styles Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-11 23:08:26 -07:00
templates Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-12 08:52:50 -07:00
views Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-12 16:52:14 -04:00
application.coffee Pull from upsatream. 2014-04-04 12:52:22 -04:00
initialize.coffee Removed an import that no longer exists. 2014-04-11 13:18:05 -07:00
treema-ext.coffee Fixed a couple bugs in custom TreemaNodes. 2014-04-08 17:13:05 -07:00