Scott Erickson 3dc3f62473 Merge branch 'master' into feature/loading-views ... Conflicts: app/views/editor/components/main.coffee		2014-04-25 14:31:58 -07:00
..
account	Merge branch 'master' into feature/loading-views	2014-04-25 14:31:58 -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	Migrated to the new email system, along with a setting for recruit notifications.	2014-04-21 16:15:23 -07:00
editor	Merge branch 'master' into feature/loading-views	2014-04-25 14:31:58 -07:00
kinds	Merge branch 'master' into feature/loading-views	2014-04-25 14:31:58 -07:00
modal	Migrated to the new email system, along with a setting for recruit notifications.	2014-04-21 16:15:23 -07:00
play	Merge branch 'master' into feature/loading-views	2014-04-25 14:31:58 -07:00
about_view.coffee
admin_view.coffee	Added a line for coding convention	2014-03-15 08:30:37 -07:00
cla_view.coffee
community_view.coffee	styling the community page	2014-04-18 13:02:07 -07:00
contribute_view.coffee
editor_view.coffee	Improved the navbars in the level editor.	2014-01-30 11:37:40 -08:00
employers_view.coffee	Merge branch 'RefactorCocoCollection' of https://github.com/edtrist/codecombat into edtrist-RefactorCocoCollection	2014-04-24 13:31:29 -07:00
error_view.coffee	Move error_view's dom to template file.	2014-03-28 23:51:15 -04:00
home_view.coffee	Fixed browser majorVersion detection for Safari. Adjusted range radius property regexp.	2014-04-14 16:34:11 -07:00
legal_view.coffee
multiplayer_view.coffee	Fixed issue with video on multiplayer page modal	2014-03-17 19:52:03 +05:30
not_found.coffee
play_view.coffee	Merge branch 'RefactorCocoCollection' of https://github.com/edtrist/codecombat into edtrist-RefactorCocoCollection	2014-04-24 13:31:29 -07:00
sprite_parser_test_view.coffee
supermodel.demo.coffee	Refactored SuperModel, CocoModel and LevelLoader.	2014-04-25 14:30:06 -07:00
teachers_view.coffee