Quincy Larson ce0731df5f Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging ...

Conflicts:
	server/boot/randomAPIs.js
	server/views/coursewares/showBonfire.jade
	server/views/partials/navbar.jade

2015-06-21 15:53:16 -07:00

..

boot

Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging

2015-06-21 15:53:16 -07:00

utils

fix add server/utils/rx to commit

2015-06-20 19:55:22 -07:00

views

Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging

2015-06-21 15:53:16 -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

remove forceDomain

2015-06-18 19:56:21 -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