Michael Schmatz 06f164525f Merge branch 'master' of https://github.com/codecombat/codecombat ... Conflicts: app/views/play/ladder/ladder_tab.coffee		2014-04-04 13:48:39 -07: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	Fixed #418, no more print/save dialogues evaaarr.	2014-04-02 14:42:34 -07:00
kinds	Set up a new loading/progress system for views.	2014-04-03 18:43:29 -07:00
modal	Fixed #180.	2014-03-31 13:56:13 -07:00
play	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-04-04 13:48:39 -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	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	Fixed 101: added level completion status to /play.	2014-03-31 15:48:22 -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