Quincy Larson 43f347bae0 Merge branch 'calculator' into staging ... Conflicts: app.js controllers/resources.js seed/field-guides.json		2015-06-14 01:10:48 -07:00
..
boot	Merge branch 'calculator' into staging	2015-06-14 01:10:48 -07:00
utils	add blacklist to usernames	2015-06-11 17:04:48 -07:00
views	Merge branch 'calculator' into staging	2015-06-14 01:10:48 -07:00
config.development.js	Adding passport config stuff	2015-06-04 10:52:12 -07:00
config.json	fix make usernames required	2015-06-12 13:14:07 -07:00
config.local.js	Adding passport config stuff	2015-06-04 10:52:12 -07:00
datasources.json	add acl controls to models	2015-06-10 23:59:42 -07:00
datasources.local.js	add user signup through loopback	2015-06-09 16:45:14 -07:00
middleware.json	initial move to loopback server	2015-06-02 17:27:02 -07:00
model-config.json	Move api hooks to user.js	2015-06-11 19:11:07 -04:00
passport-providers.js	fix user local signin	2015-06-09 17:22:14 -07:00
server.js	Remove forcedomain so we can test beta website	2015-06-12 21:09:12 -04:00