Quincy Larson 37d5efed4e Merge branch 'staging' into js-curriculum ...

Conflicts:
	seed/challenges/basic-javascript.json

2015-07-24 16:08:45 -07:00

..

boot

Get rid of uncompletedChallenges on user object

2015-07-23 16:03:52 -07:00

services

update loading hike directly loads lecture

2015-07-23 16:03:47 -07:00

utils

update split field guide view into categories

2015-07-23 15:50:47 -07:00

views

Merge branch 'staging' into js-curriculum

2015-07-24 16:08:45 -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

debug-entry.js

add entry for use with plain node or node-debug start

2015-07-23 15:49:00 -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 state namespace

2015-07-23 16:03:47 -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