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 |
terakilobyte
|
6b6de50ad4
|
Update story query for loopback.
|
2015-06-05 15:00:54 -04:00 |
|
terakilobyte
|
21b9405f06
|
Update links for new api model in views for stories.
|
2015-06-05 14:58:42 -04:00 |
|
terakilobyte
|
4f9061bffb
|
Sort out story model.
|
2015-06-05 14:53:12 -04:00 |
|
terakilobyte
|
8b7bfb23ab
|
Update story api to use stories instead of news
|
2015-06-05 09:07:46 -04:00 |
|
Quincy Larson
|
3654bb7e6f
|
change _id to id everywhere that seems relevant to loopback
|
2015-06-04 13:20:42 -07:00 |
|
Quincy Larson
|
b2aafd89e7
|
flatten user object references throughout controllers and views
|
2015-06-04 12:54:41 -07:00 |
Berkeley Martinez
|
075d851374
|
refactor resources to utils
|
2015-06-03 17:14:45 -07:00 |
|
Berkeley Martinez
|
bfd33d8b40
|
fix use app.use(router) to add sub router
|
2015-06-03 16:31:42 -07:00 |
|
Berkeley Martinez
|
8165105b29
|
refactor all boot to export func and use loopback
|
2015-06-03 16:19:23 -07:00 |
|
Berkeley Martinez
|
279f953628
|
Move models to common/models
closes #795
|
2015-06-02 15:05:26 -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 |