codecombat/app/views
Scott Erickson 53579b2632 Merge branch 'master' into feature/jsondiffpatch
Conflicts:
	app/templates/editor/level/save.jade
	app/templates/editor/thang/edit.jade
2014-04-11 22:52:05 -07:00
..
account Updated to jQuery 2.1. 2014-04-11 10:12:39 -07:00
admin Merge branch 'backbone_mediator' of https://github.com/rubenvereecken/codecombat into feature/jsondiffpatch 2014-04-11 10:32:19 -07:00
contribute Moved Glen from Archmages to About. 2014-03-13 18:27:08 -07:00
editor Added buttons for performing actions on patches. 2014-04-11 22:33:09 -07:00
kinds Merge branch 'master' into feature/jsondiffpatch 2014-04-11 22:52:00 -07:00
modal Merge branch 'master' into feature/jsondiffpatch 2014-04-11 22:52:05 -07:00
play Fixed tutorial modal for nonexistent tutorials 2014-04-10 11:42:22 -07: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 Added some i18n and improved employer page. 2014-04-11 12:49:44 -07:00
error_view.coffee Move error_view's dom to template file. 2014-03-28 23:51:15 -04:00
home_view.coffee use youku for Chinese Version 2014-04-09 13:50:13 +08: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 Merge branch 'doubleScrollbars' of git://github.com/adi2412/codecombat 2014-04-06 14:55:14 -07: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