Quincy Larson b6fc2551d9 Merge branch 'interview' into staging ...

Conflicts:
	app.js
	controllers/challenge.js
	seed/future-jquery-ajax-json.json

2015-06-14 01:02:39 -07:00

..

challenges

Merge branch 'interview' into staging

2015-06-14 01:02:39 -07:00

bonfireMDNlinks.js

Update seed directory to use loopback

2015-06-02 20:32:10 -07:00

challenge-migration.js

change _id to id everywhere that seems relevant to loopback

2015-06-04 13:20:42 -07:00

challengeMapping.json

Update seed directory to use loopback

2015-06-02 20:32:10 -07:00

field-guides.json

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

2015-06-12 12:40:26 -07:00

flattenUser.js

Take id property of username, remove wasteful save on profile lookup.

2015-06-12 19:16:10 -04:00

future-jquery-ajax-json.json

Merge branch 'interview' into staging

2015-06-14 01:02:39 -07:00

get-emails.js

move get emails script to seed

2015-06-09 16:49:03 -07:00

index.js

Update seed directory to use loopback

2015-06-02 20:32:10 -07:00

jobs.json

Update seed directory to use loopback

2015-06-02 20:32:10 -07:00

nonprofits.json

fix conflicting id

2015-06-11 10:36:47 -07:00

storyCleanup.js

Update seed directory to use loopback

2015-06-02 20:32:10 -07:00

userMigration.js

change _id to id everywhere that seems relevant to loopback

2015-06-04 13:20:42 -07:00