Quincy Larson
|
1bb9951d04
|
Merge branch 'master' into staging
Conflicts:
seed/challenges/basic-bonfires.json
|
2015-06-19 17:39:11 -07:00 |
|
Quincy Larson
|
db1233c7d4
|
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
|
2015-06-19 16:18:56 -07:00 |
|
Quincy Larson
|
0e9ab5017b
|
Merge branch 'Lemony-Andrew-master' into staging
Conflicts:
server/views/coursewares/showBonfire.jade
|
2015-06-19 16:17:59 -07:00 |
|
Quincy Larson
|
a516a49e15
|
Merge pull request #939 from LumenTeun/lumenteun-911
Test for almost palindromes in 'Check for Palindromes'
|
2015-06-19 16:06:56 -07:00 |
|
Quincy Larson
|
2cb57d5fcc
|
Merge pull request #936 from LumenTeun/lumenteun-924
More 'Convert HTML Entities' test cases. Fixes #924
|
2015-06-19 16:00:45 -07:00 |
Berkeley Martinez
|
f248b3fb9f
|
fix name and dashed name switched
close #975
|
2015-06-18 20:02:32 -07:00 |
LumenTeun
|
667a37cac7
|
Test for almost palindromes. #911
|
2015-06-15 18:14:55 +02:00 |
|
LumenTeun
|
2911562888
|
More 'Convert HTML Entities' test cases. Fixes #924
|
2015-06-15 17:26:37 +02:00 |
|
Quincy Larson
|
d5b5973326
|
Merge branch 'interview' into staging
Conflicts:
app.js
controllers/challenge.js
seed/future-jquery-ajax-json.json
|
2015-06-14 01:02:39 -07:00 |
|
Quincy Larson
|
9589b6abeb
|
add dashedName attributes to JSON
|
2015-06-14 00:55:27 -07: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
|
87f22a5b7e
|
fix challengeSeeds should be arrays
|
2015-06-04 12:31:33 -07:00 |
|
Berkeley Martinez
|
9032880e27
|
Update seed directory to use loopback
|
2015-06-02 20:32:10 -07:00 |