terakilobyte
|
5b2b7e23ae
|
Take id property of username, remove wasteful save on profile lookup.
|
2015-06-12 19:16:10 -04:00 |
|
terakilobyte
|
d07e5351ea
|
Comment out blacklist
|
2015-06-12 18:55:47 -04:00 |
Berkeley Martinez
|
90b2f99a70
|
add create identities on flatten users
|
2015-06-12 15:27:51 -07:00 |
greasan
|
f2ff5236eb
|
Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into greasan-translateDE
|
2015-06-12 22:19:10 +02:00 |
Quincy Larson
|
173d46ae01
|
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
Conflicts:
seed/field-guides.json
|
2015-06-12 12:40:26 -07:00 |
|
greasan
|
d9e64f842f
|
Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into greasan-translateDE
|
2015-06-12 14:08:44 +02:00 |
|
terakilobyte
|
f7bb14803e
|
Update field guides to display properly. Correct models on user object.
|
2015-06-11 16:19:44 -04:00 |
|
Quincy Larson
|
5fb89cb091
|
Merge branch 'master' of github.com:FreeCodeCamp/freecodecamp into staging
|
2015-06-11 11:16:31 -07:00 |
|
Quincy Larson
|
4d8ab0a915
|
fix conflicting id
|
2015-06-11 10:36:47 -07:00 |
|
greasan
|
701241aac8
|
Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into greasan-translateDE
|
2015-06-10 07:16:02 +02:00 |
|
Berkeley Martinez
|
c5d3b4a041
|
move get emails script to seed
|
2015-06-09 16:49:03 -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 |
|
greasan
|
ab9fcc6f29
|
Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into greasan-translateDE
|
2015-06-08 07:25:05 +02:00 |
|
Berkeley Martinez
|
28f273e7ee
|
save users into new `user` collection
|
2015-06-07 22:06:57 -07:00 |
|
Berkeley Martinez
|
0c6c170754
|
initial script to flatten user object
|
2015-06-07 17:15:53 -07:00 |
|
greasan
|
8b8dab2970
|
Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into greasan-translateDE
|
2015-06-05 15:48:38 +02:00 |
|
Berkeley Martinez
|
b6a0edc964
|
fix nonprofit ids should be unique
|
2015-06-04 14:32:16 -07:00 |
|
Quincy Larson
|
3654bb7e6f
|
change _id to id everywhere that seems relevant to loopback
|
2015-06-04 13:20:42 -07:00 |
|
Berkeley Martinez
|
02b195511e
|
fix challengeSeeds should be arrays
|
2015-06-04 12:31:33 -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 |