Commit Graph

62 Commits (89c64fb37668fb5a8980bd91cd9c80839d8547f2)

Author SHA1 Message Date
Berkeley Martinez bcdda9c62a fix unexpected syntax error on map 2015-08-14 18:25:34 -07:00
Berkeley Martinez 967f92e6f4 fix challenge naming scheme 2015-08-09 22:46:44 -07:00
Quincy Larson 041abd1065 fix beta warning 2015-08-04 14:58:04 -07:00
Quincy Larson 60f2bdc685 more minor updates 2015-07-23 15:50:47 -07:00
Quincy Larson 4d620c5796 comment out feature map modal and camper news notification 2015-06-24 07:06:40 -07:00
terakilobyte 4fa1f25cc2 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
terakilobyte 40ce1d8162 Refactor to use dashedName for challenges in lookup. 2015-06-15 08:01:43 -04:00
Quincy Larson 43f347bae0 Merge branch 'calculator' into staging
Conflicts:
	app.js
	controllers/resources.js
	seed/field-guides.json
2015-06-14 01:10:48 -07:00
Quincy Larson 61486c2d7c Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
Conflicts:
	app.js
	controllers/fieldGuide.js
	controllers/story.js
	seed/challenges/basic-html5-and-css.json
	seed/challenges/bootstrap.json
	seed/field-guides.json
	server/views/partials/navbar.jade
	views/resources/jobs-form.jade
	views/resources/nonprofits-form.jade
	views/resources/pmi-acp-agile-project-managers-form.jade
2015-06-09 13:48:29 -07:00
Quincy Larson 3654bb7e6f change _id to id everywhere that seems relevant to loopback 2015-06-04 13:20:42 -07:00
Quincy Larson f6596d2654 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
Conflicts:
	app.js
	controllers/challengeMap.js
	controllers/resources.js
	server/views/partials/field-guide.jade
	server/views/partials/github.jade
	server/views/partials/nonprofit-application-progress-bar.jade
	server/views/partials/nonprofits.jade
2015-06-02 13:44:53 -07:00
terakilobyte d9c3251f94 Begin shaping codebase for loopback migration. 2015-06-01 18:30:43 -04:00