From d54bbaaf2da26b733e8f7370b2db4f3273fd0bda Mon Sep 17 00:00:00 2001 From: Arsen Melikyan Date: Mon, 24 Aug 2015 14:48:38 +0400 Subject: [PATCH 1/2] Fixes missing backslash in waypoints' instructions' In three waypoints: [Find Numbers with Regular Expressions](http://www.freecodecamp.com/challenges/waypoint-find-numbers-with-regular-expressions), [Find White Space with Regular Expressions](http://www.freecodecamp.com/challenges/waypoint-find-white-space-with-regular-expressions), [Invert Regular Expression Matches with JavaScript](http://www.freecodecamp.com/challenges/waypoint-invert-regular-expression-matches-with-javascript) there are confusing instructions: /d+/gi instead of /\d+/gi, /s+/gi instead of /\s+/gi, /S+/gi instead of /\S+/gi.This commit fixed them. --- seed/challenges/basic-javascript.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/seed/challenges/basic-javascript.json b/seed/challenges/basic-javascript.json index 87d00dbfbb..5003de7f30 100644 --- a/seed/challenges/basic-javascript.json +++ b/seed/challenges/basic-javascript.json @@ -1036,7 +1036,7 @@ ], "tests":[ "assert(test === 2, 'Your RegEx should have found two numbers in the testString');", - "assert(editor.getValue().match(/\\/\\\\d\\+\\//gi), 'You should be using the following expression /\\d+/gi to find the numbers in the testString');" + "assert(editor.getValue().match(/\\/\\\\d\\+\\//gi), 'You should be using the following expression /\\\\d+/gi to find the numbers in the testString');" ], "challengeSeed":[ "var test = (function() {", @@ -1066,7 +1066,7 @@ ], "tests":[ "assert(test === 7, 'Your RegEx should have found seven spaces in the testString.');", - "assert(editor.getValue().match(/\\/\\\\s\\+\\//gi), 'You should be using the following expression /\\s+/gi to find the spaces in the testString.');" + "assert(editor.getValue().match(/\\/\\\\s\\+\\//gi), 'You should be using the following expression /\\\\s+/gi to find the spaces in the testString.');" ], "challengeSeed":[ "var test = (function(){", @@ -1094,7 +1094,7 @@ ], "tests":[ "assert(test === 49, 'Your RegEx should have found forty nine non-space characters in the testString.');", - "assert(editor.getValue().match(/\\/\\\\S\\/gi/gi), 'You should be using the following expression /\\S/gi to find non-space characters in the testString.');" + "assert(editor.getValue().match(/\\/\\\\S\\/gi/gi), 'You should be using the following expression /\\\\S/gi to find non-space characters in the testString.');" ], "challengeSeed":[ "var test = (function(){", From fd440916a87749ecedcb5c7f337a1dbd05040207 Mon Sep 17 00:00:00 2001 From: Quincy Larson Date: Mon, 24 Aug 2015 17:52:12 -0700 Subject: [PATCH 2/2] add descriptive message to failed account linking attempt --- server/boot/a-extendUserIdent.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/boot/a-extendUserIdent.js b/server/boot/a-extendUserIdent.js index 7114e1b53f..d14874d08b 100644 --- a/server/boot/a-extendUserIdent.js +++ b/server/boot/a-extendUserIdent.js @@ -49,7 +49,7 @@ export default function({ models }) { } if (identity.userId.toString() !== userId.toString()) { return Observable.throw( - new Error('An account is already linked to that profile') + new Error("It looks like you already have an account associated with that sign in method. Here's what you can do: 1) Sign out of this account. 2) Use that sign in method to sign into your other account. 3) Delete that account. 4) Then sign back into this account and you'll be able to link it here. If you need help, send us an email at team@freecodecamp.com.") ); } identity.credentials = credentials;