Quincy Larson
|
4d620c5796
|
comment out feature map modal and camper news notification
|
2015-06-24 07:06:40 -07: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 |
terakilobyte
|
21b9405f06
|
Update links for new api model in views for stories.
|
2015-06-05 14:58:42 -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 |
|
terakilobyte
|
d9c3251f94
|
Begin shaping codebase for loopback migration.
|
2015-06-01 18:30:43 -04:00 |