Quincy Larson 7e9d65675a Merge branch 'master' into remove-angular ... Conflicts: bower.json client/main.js server/views/coursewares/showZiplineOrBasejump.jade server/views/partials/scripts.jade		2015-12-04 18:49:38 -06:00
..
challenge.json	Feature in dev mode always pull from disk	2015-11-09 17:27:56 -08:00
job.json	Add company specific promocodes	2015-11-23 15:38:05 -08:00
nonprofit.json	properly define id fields for basic models	2015-08-11 14:49:57 -07:00
pledge.json	Add logic to load nonprofit on query	2015-10-06 19:51:19 -07:00
promo.js	Send down correct discount name	2015-11-23 15:51:42 -08:00
promo.json	Add promo model	2015-10-29 17:10:29 -07:00
story.json	remove email address from stories	2015-09-23 15:20:45 -07:00
User-Credential.json	Adding passport config stuff	2015-06-04 10:52:12 -07:00
User-Identity.js	fix profile linking	2015-08-21 16:09:07 -07:00
User-Identity.json	Add read access to all models	2015-06-24 08:23:49 -07:00
user.js	Merge branch 'master' into remove-angular	2015-12-04 18:49:38 -06:00
user.json	Add logic to load nonprofit on query	2015-10-06 19:51:19 -07:00