gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging

Browse Source
This commit is contained in:
Quincy Larson
2015-08-12 21:25:11 -07:00
parent 024cf33f34 30070c4f74
commit 19fbd00ed8
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
challenges/angularjs.json
View File

@ -32,7 +32,7 @@
"difficulty": 0.35, "difficulty": 0.35,
"challengeSeed": ["114684727"], "challengeSeed": ["114684727"],
"description": [ "description": [
"Directives serve as markers in your HTML. When Angular.js compiles your HTML, it will can alter the behavior of DOM elements based on the directives you've used.", "Directives serve as markers in your HTML. When Angular.js compiles your HTML, it will alter the behavior of DOM elements based on the directives you've used.",
"Let's learn how these powerful directives work, and how to use them to make your web apps more dynamic", "Let's learn how these powerful directives work, and how to use them to make your web apps more dynamic",
"Go to <a href='http://campus.codeschool.com/courses/shaping-up-with-angular-js/level/2/section/1/video/1' target='_blank'>http://campus.codeschool.com/courses/shaping-up-with-angular-js/level/2/section/1/video/1</a> and complete the section." "Go to <a href='http://campus.codeschool.com/courses/shaping-up-with-angular-js/level/2/section/1/video/1' target='_blank'>http://campus.codeschool.com/courses/shaping-up-with-angular-js/level/2/section/1/video/1</a> and complete the section."
], ],

12
loopbackMigration.js
View File

@ -86,15 +86,19 @@ var users = dbObservable
.map(function(user) { .map(function(user) {
// flatten user // flatten user
assign(user, user.portfolio, user.profile); assign(user, user.portfolio, user.profile);
if (user.username) { if (!user.username) {
return user; user.username = 'fcc' + uuid.v4().slice(0, 8);
} }
user.username = 'fcc' + uuid.v4().slice(0, 8);
if (user.github) { if (user.github) {
user.isGithubCool = true; user.isGithubCool = true;
} else { } else {
user.isMigrationGrandfathered = true; user.isMigrationGrandfathered = true;
} }
providers.forEach(function(provider) {
user[provider + 'id'] = user[provider];
user[provider] = null;
});
return user; return user;
}) })
.shareReplay(); .shareReplay();
@ -123,7 +127,7 @@ var userIdentityCount = users
.map(function(provider) { .map(function(provider) {
return { return {
provider: provider, provider: provider,
externalId: user[provider], externalId: user[provider + 'id'],
userId: user._id || user.id userId: user._id || user.id
}; };
}) })