Quincy Larson 378f6da221 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging ... Conflicts: public/js/main_0.0.3.js seed/challenges/get-set-for-free-code-camp.json seed/field-guides.json		2015-06-26 01:08:40 -07:00
..
boot	Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging	2015-06-26 01:08:40 -07:00
utils	Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging	2015-06-26 01:08:40 -07:00
views	Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging	2015-06-26 01:08:40 -07:00
config.development.js	Adding passport config stuff	2015-06-04 10:52:12 -07:00
config.json	Set up production variables	2015-06-15 18:24:26 -04:00
config.local.js	fix use secrets.db instead of process.env.MONGOHQ in datasource.local.js	2015-06-20 20:43:36 -07:00
config.production.js	Set up production variables	2015-06-15 18:24:26 -04:00
datasources.json	add acl controls to models	2015-06-10 23:59:42 -07:00
datasources.local.js	fix use secrets.db instead of process.env.MONGOHQ in datasource.local.js	2015-06-20 20:43:36 -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 try using oath instead of oauth2 for google	2015-06-18 12:28:16 -07:00
server.js	add total time to start to logs during waitFordb	2015-06-21 19:11:42 -07:00
ssl-config.js	Remove toString() on certificate reads as per http://stackoverflow.com/questions/20893025/cant-start-nodejs-https-server-v0-10-23	2015-06-16 15:04:20 -04:00