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 |
Berkeley Martinez
|
7643f1cabe
|
fix FCC running using router syntax
|
2015-06-01 17:01:54 -07:00 |
Berkeley Martinez
|
7bb11e9fbe
|
fix linting errors in server/boot/utilities
|
2015-06-01 16:48:16 -07:00 |
Berkeley Martinez
|
d67f7c666d
|
refactor challenge controller to router syntax
|
2015-06-01 16:45:21 -07:00 |
Berkeley Martinez
|
28f0320f18
|
refactor fieldGuide controller to router
|
2015-06-01 16:32:54 -07:00 |
Berkeley Martinez
|
7c2f171d31
|
fix all the linting errors in boot
|
2015-06-01 16:23:53 -07:00 |
terakilobyte
|
d9c3251f94
|
Begin shaping codebase for loopback migration.
|
2015-06-01 18:30:43 -04:00 |