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

..

account

major challenges refactor

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

challengeMap

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

coursewares

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

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

field-guide

Update field guides to display properly. Correct models on user object.

2015-06-11 16:19:44 -04:00

jobs

Merge branch 'master' into staging

2015-06-16 06:08:25 -07:00

nonprofits

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

2015-06-02 13:44:53 -07:00

partials

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

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

resources

finishing touches on calculator

2015-06-19 21:24:04 -07:00

stories

Merge branch 'calculator' into staging

2015-06-14 01:10:48 -07:00

home.jade

Begin shaping codebase for loopback migration.

2015-06-01 18:30:43 -04:00

layout-wide.jade

Begin shaping codebase for loopback migration.

2015-06-01 18:30:43 -04:00

layout.jade

Merge branch 'interview' into staging

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