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
..
job_profile_view.coffee	Fix: Some level systems load forever.	2014-04-19 12:08:40 -04:00
profile_view.coffee	Two tiny profile improvements.	2014-04-23 11:26:20 -07:00
settings_view.coffee	Migrated to the new email system, along with a setting for recruit notifications.	2014-04-21 16:15:23 -07:00
unsubscribe_view.coffee	Fixed modal switchout and palette property interpolation. Refactored all use of .hide to .secret so we can use jQuery to show/hide things again.	2014-02-13 09:26:21 -08:00
wizard_settings_view.coffee	Migrate from .on, .once to .listenTo, .listenToOnce	2014-03-26 03:25:11 +05:30