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
..
contact.jade	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
diplomat_suggestion.jade	Finished most of basic features for job profiles.	2014-04-07 17:58:02 -07:00
employer_signup_modal.jade	Finished most of basic features for job profiles.	2014-04-07 17:58:02 -07:00
error.jade	Fixed #278	2014-01-27 16:59:34 -08:00
job_profile_contact.jade	Added some i18n and improved employer page.	2014-04-11 12:49:44 -07:00
login.jade	Minor corrections in format	2014-04-10 01:07:48 +05:30
modal_base.jade	Integrated nanoscroller.	2014-04-03 03:10:06 +05:30
recover.jade	Upgrade from Bootstrap 2 to Bootstrap 3	2014-01-23 21:49:29 -05:00
revert.jade	Work on revert, save modal	2014-04-08 01:38:46 +04:00
save_version.jade	Merge branch 'master' into feature/jsondiffpatch	2014-04-11 22:52:05 -07:00
signup.jade	Added i18n for #809.	2014-04-11 13:37:39 -07:00
versions.jade	Got rid of CRLF line endings	2014-03-12 16:03:36 +01:00
wizard_settings.jade	Added an async name checker for the wizard settings modal.	2014-02-27 14:42:11 -08:00