LumenTeun
13a8a728e2
'Slack' to 'Gitter or Slack'
2015-06-24 10:29:52 -07:00
LumenTeun
6b423dfcb1
'Slack' to 'Gitter'
2015-06-24 10:29:52 -07:00
Natasha Haggard
6de5a6fb11
Issue 1094 - Field Guide Error
...
"Contact Jason Ruekert - he's @jsonify in Slack."
Since freecodecamp is now using Gitter again, changed it to say "Contact Jason Ruekert - he's @jsonify in Gitter."
2015-06-23 22:46:28 -05:00
rcw271828
14225ec4bd
Update field-guides.json
...
Fixed a typo in languages section of field guides.
2015-06-18 20:36:33 -04:00
Quincy Larson
d4fe751baa
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
...
Conflicts:
seed/field-guides.json
2015-06-12 12:40:26 -07:00
terakilobyte
794c036fd3
Update field guides to display properly. Correct models on user object.
2015-06-11 16:19:44 -04:00
Quincy Larson
fc7ac3b3ca
Merge branch 'master' of github.com:FreeCodeCamp/freecodecamp into staging
2015-06-11 11:16:31 -07:00
Quincy Larson
3b861a5a7f
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
323ec3d587
change _id to id everywhere that seems relevant to loopback
2015-06-04 13:20:42 -07:00
Berkeley Martinez
9032880e27
Update seed directory to use loopback
2015-06-02 20:32:10 -07:00