greasan
|
dab805174e
|
Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into greasan-translateDE
|
2015-06-12 14:08:44 +02: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
|
585bd40fc3
|
fix conflicting id
|
2015-06-11 10:36:47 -07:00 |
|
greasan
|
b12fcae985
|
Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into greasan-translateDE
|
2015-06-10 07:16:02 +02:00 |
|
Berkeley Martinez
|
9e44deda0c
|
move get emails script to seed
|
2015-06-09 16:49:03 -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 |
|
greasan
|
7957603dc5
|
Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into greasan-translateDE
|
2015-06-08 07:25:05 +02:00 |
|
Berkeley Martinez
|
0e240ba630
|
save users into new user collection
|
2015-06-07 22:06:57 -07:00 |
|
Berkeley Martinez
|
38931dd23d
|
initial script to flatten user object
|
2015-06-07 17:15:53 -07:00 |
|
greasan
|
3c042cba30
|
Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into greasan-translateDE
|
2015-06-05 15:48:38 +02:00 |
|
Berkeley Martinez
|
b2124d7878
|
fix nonprofit ids should be unique
|
2015-06-04 14:32:16 -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 |
|
Quincy Larson
|
67d35540cd
|
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
|
2015-06-04 12:24:30 -07:00 |
|
Berkeley Martinez
|
9032880e27
|
Update seed directory to use loopback
|
2015-06-02 20:32:10 -07:00 |
|