Quincy Larson
|
1df962bb07
|
Merge branch 'master' into staging
Conflicts:
controllers/resources.js
public/js/main_0.0.2.js
seed/challenges/advanced-bonfires.json
seed/challenges/basic-bonfires.json
seed/challenges/get-set-for-free-code-camp.json
server/views/partials/navbar.jade
|
2015-06-24 07:19:54 -07:00 |
|
Quincy Larson
|
dd3d445054
|
add new chat challenge
|
2015-06-20 18:12:12 -07:00 |
|
Quincy Larson
|
88286d366f
|
fix a bunch of github issues regarding waypoints
|
2015-06-19 18:31:21 -07:00 |
|
Quincy Larson
|
2b7177e856
|
add dashedName attributes to JSON
|
2015-06-14 00:55:27 -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
|
618cedddb0
|
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
|
2015-06-04 12:24:30 -07:00 |
Berkeley Martinez
|
272d9b4ad5
|
Update seed directory to use loopback
|
2015-06-02 20:32:10 -07:00 |