Ting-Kuan de9337820b Merge branch 'master' of https://github.com/codecombat/codecombat ... Conflicts: app/assets/main.html scripts/windows/coco-dev-setup/batch/config/finished_header.coco scripts/windows/coco-dev-setup/batch/config/github_header.coco scripts/windows/coco-dev-setup/batch/config/install_header.coco scripts/windows/coco-dev-setup/batch/config/npm_and_brunch_header.coco scripts/windows/coco-dev-setup/batch/config/readme.coco scripts/windows/coco-dev-setup/batch/localisation/de.coco 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-HANS.coco scripts/windows/coco-dev-setup/batch/localisation/zh-HANT.coco scripts/windows/coco-dev-setup/batch/localisation/zh.coco scripts/windows/coco-dev-setup/batch/scripts/ask_question.bat 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_array.bat scripts/windows/coco-dev-setup/batch/scripts/get_config.bat scripts/windows/coco-dev-setup/batch/scripts/get_download.bat scripts/windows/coco-dev-setup/batch/scripts/get_extension.bat scripts/windows/coco-dev-setup/batch/scripts/get_extension.ps1 scripts/windows/coco-dev-setup/batch/scripts/get_language.bat scripts/windows/coco-dev-setup/batch/scripts/get_local_text.bat scripts/windows/coco-dev-setup/batch/scripts/get_path_safe.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/get_var.ps1 scripts/windows/coco-dev-setup/batch/scripts/get_variables.bat scripts/windows/coco-dev-setup/batch/scripts/get_variables.ps1 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/open_readme.bat scripts/windows/coco-dev-setup/batch/scripts/open_text_file.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_file.bat scripts/windows/coco-dev-setup/batch/scripts/print_finished_header.bat scripts/windows/coco-dev-setup/batch/scripts/print_github_header.bat scripts/windows/coco-dev-setup/batch/scripts/print_header.bat scripts/windows/coco-dev-setup/batch/scripts/print_info.bat scripts/windows/coco-dev-setup/batch/scripts/print_install_header.bat scripts/windows/coco-dev-setup/batch/scripts/print_license.bat scripts/windows/coco-dev-setup/batch/scripts/print_npm_and_brunch_header.bat scripts/windows/coco-dev-setup/batch/scripts/print_seperator.bat scripts/windows/coco-dev-setup/batch/scripts/print_tips.bat scripts/windows/coco-dev-setup/batch/scripts/run_script.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		2014-04-04 14:32:42 -04:00
..
account	Merge branch 'master' of https://github.com/swapkh91/codecombat into swapkh91-master	2014-03-26 14:29:16 -07:00
admin	More migrations	2014-03-24 22:28:34 +05:30
contribute	Moved Glen from Archmages to About.	2014-03-13 18:27:08 -07:00
editor	Pull from upsatream.	2014-04-04 12:52:22 -04:00
kinds	Pull from upsatream.	2014-04-04 12:52:22 -04:00
modal	Pull from upsatream.	2014-04-04 12:52:22 -04:00
play	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-04-04 14:32:42 -04:00
about_view.coffee	Ready for action, sir!	2014-01-03 10:32:13 -08:00
admin_view.coffee	Added a line for coding convention	2014-03-15 08:30:37 -07:00
cla_view.coffee	Updated some $attr, $val, and $prop calls.	2014-01-04 15:49:13 -08:00
contribute_view.coffee	Merged and cleaned up #79.	2014-01-06 15:18:40 -08:00
editor_view.coffee	Improved the navbars in the level editor.	2014-01-30 11:37:40 -08:00
employers_view.coffee	Updated i18n, added /employers.	2014-01-13 22:29:58 -08:00
error_view.coffee	Move error_view's dom to template file.	2014-03-28 23:51:15 -04:00
home_view.coffee	For #648: Keeping localStorage fallback for played levels temporarily until most have migrated to user property. Fixed #627.	2014-03-21 17:42:13 -07:00
legal_view.coffee	Ready for action, sir!	2014-01-03 10:32:13 -08:00
multiplayer_view.coffee	Fixed issue with video on multiplayer page modal	2014-03-17 19:52:03 +05:30
not_found.coffee	Ready for action, sir!	2014-01-03 10:32:13 -08:00
play_view.coffee	Pull from upsatream.	2014-04-04 12:52:22 -04:00
sprite_parser_test_view.coffee	Ready for action, sir!	2014-01-03 10:32:13 -08:00
teachers_view.coffee	Ready for action, sir!	2014-01-03 10:32:13 -08:00