Nick Winter 141e11f918 Merge branch 'master' of git://github.com/rmarren1/codecombat into rmarren1-master		2015-02-16 17:13:24 -08:00
..
account	Added a "god mode" button to the local dev environment #2164	2015-02-14 01:46:04 +09:00
admin	Update campaign editor analytics	2015-01-26 13:19:10 -08:00
common	Fixed floor y scaling. Fixed issues with client-side disabling of new model / fork / revert population actions without permissions. Ameliorated some ensure_comprehensions warnings.	2014-12-20 16:02:41 -08:00
contribute	Update ambassador.jade	2015-01-07 21:45:36 +00:00
core	Update subscribe-modal.jade	2015-02-05 18:44:07 +00:00
editor	added achievement editor for #2304	2015-02-16 17:12:05 -05:00
i18n	Update i18n-edit-model-view.jade	2014-12-12 22:35:16 +00:00
modal	Deleted WizardSettingsView.	2014-12-06 10:23:26 -08:00
play	Add type (warrior/ranger/wizard) to hero selector modal (Issue #2307)	2015-02-17 00:50:01 +09:00
user	Wabam. Refactored a bunch of stuff into 'core' folders so that it's clearer which files are being loaded first thing, and which are not. Also reworked a bunch of the anymatch things in config.coffee, cause there were better ways.	2014-11-28 17:49:41 -08:00
about.jade	Update about.jade	2015-01-31 21:43:43 +00:00
admin.jade	Admin growth view	2014-11-04 22:17:49 -08:00
base.jade	Update base.jade	2015-02-05 20:00:02 +01:00
cla.jade	Fixed #1820.	2014-12-01 08:18:38 -08:00
community-view.jade	Fixed links	2014-12-20 09:32:59 +00:00
demo.jade	Initial work on a demo view. But brunch won't build demo-app.js for some reason.	2014-06-16 11:40:08 -07:00
employers.jade	Reordered i18n in rough order of section importance. Deprecated employer/candidate pages for now and turned off candidate emails.	2014-10-02 12:10:24 -07:00
error.jade	Move error_view's dom to template file.	2014-03-28 23:51:15 -04:00
home-view.jade	IE8 unsupported message	2014-12-07 18:56:59 -08:00
legal.jade	Update legal.jade	2015-01-31 12:42:57 +00:00
recruitment_base.jade	Made new recruitment base layout	2014-07-02 11:43:26 -07:00
teachers.jade	Revert "Remove Hour of Code References from teachers.jade"	2015-02-10 21:14:34 +00:00
test-view.jade	Fixed Karma client test runner.	2014-12-12 13:12:35 -08:00