freeCodeCamp

mirror of https://github.com/freeCodeCamp/freeCodeCamp.git synced 2026-04-07 13:01:03 -04:00

Go to file

Quincy Larson 9442f5f648 Merge branch 'master' into staging

Conflicts:
	controllers/resources.js
	public/js/main_0.0.2.js
	seed/challenges/advanced-bonfires.json
	seed/challenges/basic-bonfires.json
	seed/challenges/get-set-for-free-code-camp.json
	server/views/partials/navbar.jade

2015-06-24 07:19:54 -07:00

challenges

Merge branch 'master' into staging

2015-06-24 07:19:54 -07:00

bonfireMDNlinks.js

Merge branch 'master' into staging

2015-06-19 17:39:11 -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

Update field-guides.json

2015-06-18 20:36:33 -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

Ensure build process is part of npm install

2015-06-15 18:10:48 -04:00

jobs.json

Update seed directory to use loopback

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

loopbackMigration.js

Fix challenge map display for loopback updated models. Update loopback migration script to auto complete and catch all records.

2015-06-15 20:53:43 -04: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