Commit Graph

292 Commits

Author SHA1 Message Date
Berkeley Martinez
5de6837959 Merge pull request #3548 from FreeCodeCamp/converge-bonfires
refactor all Bonfire tests to use assert and have friendly messages
2015-09-30 19:47:20 -07:00
Quincy Larson
dca179c2c5 Merge branch 'staging' into converge-bonfires
Conflicts:
	seed/challenges/basic-bonfires.json
	seed/challenges/intermediate-bonfires.json
2015-09-30 19:06:28 -07:00
Quincy Larson
4fffabfe8f fix exact change and QA all JS challenges 2015-09-30 18:33:32 -07:00
natac13
90230ec907 fix test so it does not match code not in the answer 2015-09-30 05:13:13 -04:00
Mike
ab72094333 Remove Unnecessary Left Over Semicolon
Remove left over semicolon from function that was converted from an anonymous function at https://github.com/FreeCodeCamp/FreeCodeCamp/issues/3287
2015-09-30 02:40:21 -04:00
Aniruddh Agarwal
82e61c28b2 Merge pull request #3520 from abhisekp/fix/waypoint-manipulate-arrays-with-unshift
Minor fix comments in Waypoint: Manipulate Arrays With unshift
2015-09-28 09:19:05 +08:00
Abhisek Pattnaik
0ef3e36d6f Fix comments in Waypoint: Manipulate Arrays With unshift 2015-09-28 03:45:13 +05:30
Abhisek Pattnaik
305f661196 Correct comment
Replace "ourArray[1]" with "ourArray"
close FreeCodeCamp/FreeCodeCamp#3515
2015-09-28 01:04:59 +05:30
ahstro
d9d558a8a9 Slot Machine false positives
The 'Add your JavaScript Slot Machine Slots' waypoint would
throw false positives if all slot numbers were the same, effectively
allowing the campers to pass the test without having written any code.
2015-09-21 23:42:19 +02:00
Arsen Melikyan
e4eda74fa2 Merge pull request #3342 from avastu/Fix-title-case
Fixes "Javascript uses use" typos
2015-09-17 15:23:04 +04:00
Utsav Ahuja
63da377fa8 Fixed "Javascript uses use" typo 2015-09-17 01:04:00 -07:00
Quincy Larson
31f818788d Merge branch 'patch-4' of https://github.com/souldreamer/FreeCodeCamp into souldreamer-patch-4
Conflicts:
	seed/challenges/basic-javascript.json
2015-09-13 23:35:27 -07:00
Quincy Larson
ba4aacdbfd minor improvements to suggested edits 2015-09-13 23:26:03 -07:00
Quincy Larson
404b6d93c5 Merge branch 'bugron-basic_js_fix-3' of https://github.com/bugron/FreeCodeCamp into bugron-bugron-basic_js_fix-3 2015-09-13 21:03:00 -07:00
Quincy Larson
9bdbb59b67 Merge branch 'bugron-basic_js_fix-2' of https://github.com/bugron/FreeCodeCamp into bugron-bugron-basic_js_fix-2
Conflicts:
	seed/challenges/basic-javascript.json
2015-09-13 20:59:54 -07:00
Quincy Larson
2688f48c71 small copy improvements to @bugron fixes 2015-09-13 20:55:51 -07:00
Quincy Larson
5ccf8fe56c Merge branch 'bugron-basic_js_fix-1' of https://github.com/bugron/FreeCodeCamp into bugron-bugron-basic_js_fix-1 2015-09-13 20:48:46 -07:00
Quincy Larson
5376c1d4fe Merge pull request #3266 from leonfeng/leonfeng-fix-3208
Change the example in Waypoint: Manipulate Arrays With unshift()
2015-09-13 20:22:30 -07:00
Joel Bentley
c0f08b140a Add explanation of how values passed to function 2015-09-13 16:02:25 -04:00
Joel Bentley
bf08c300be Remove unneeded tests 2015-09-13 15:34:54 -04:00
Joel Bentley
96e071687b Modify sample function in code to match form of sample function in description 2015-09-13 14:04:52 -04:00
bugron
3af8a9eb9f Fixes typos, word issues in Basic JS, part 3 2015-09-13 09:10:30 +04:00
bugron
43778e5149 Fixes typos, word issues in Basic JS, part 2 2015-09-13 09:02:54 +04:00
bugron
02d24381a7 Fixes typos, word issues in Basic JS, part 1 2015-09-13 08:52:51 +04:00
Berkeley Martinez
b3c7a73ee1 Merge pull request #2892 from bugron/bugron-2256
fixes a test and some text
2015-09-12 21:31:46 -07:00
Leon Feng
8f2f7d7858 Change the unshift() example to make it less confusing to beginners 2015-09-13 03:54:24 +08:00
Joel Bentley
d177e388ea Fix description of Waypoint: Find Numbers with Regular Expressions 2015-09-12 15:00:04 -04:00
Aniruddh Agarwal
627bc03f92 Added external link to substantiate js waypoint
Added a link to FCC wiki to provide explanation of the formula used in the 'Create a JavaScript Slot Machine' basic javascript waypoint as well as the "Generate Random Whole Numbers within a Range" waypoint
closes #2595
2015-09-10 20:20:58 +08:00
bugron
acf6ae2eda fixes a test and some text 2015-09-09 18:32:20 +04:00
Arsen Melikyan
f58e3c07bc Merge pull request #3125 from natac13/change-test-in-javascript-challenges-and-add-optional-spaces-in-jquery-aswell
Test improvements, single and double quote jQuery selectors
2015-09-09 08:39:42 +04:00
Aniruddh Agarwal
9067154566 Fix typo in basic-javascript waypoint
Waypoint 'Invert Regular Expression Matches with JavaScript' had a semi-colon in the description for the regex example which is not needed.
closes #3148
2015-09-09 11:52:21 +08:00
Arsen Melikyan
90805e1aaa Merge pull request #3181 from awesomeaniruddh/awesomeaniruddh-3169
Fixed typo in Basic Javascript Waypoint
2015-09-09 07:44:40 +04:00
Arsen Melikyan
09c7475145 Merge pull request #3102 from AryanJ-NYC/AryanJ-NYC-1875
Clarified instructions for shift() challenge
2015-09-09 07:25:03 +04:00
Aniruddh Agarwal
1c618799b4 Fixed typo in Basic Javascript Waypoint
Waypoint 'Sift through Text with Regular Expressions' had `...` in its description instead of `.`. Made the required changes.
closes #3169
2015-09-09 10:02:08 +08:00
Aryan Jabbari
b54b2de9ab Clarifies instructions for shift() challenge; closes #1875 2015-09-08 17:31:15 -04:00
Anton Strömkvist
c815084d10 Merge pull request #3087 from bugron/bugron-toLowerCase_fix
Fixes 'd[0].toLowerCase() is not a function' error
2015-09-08 22:33:54 +02:00
Anton Strömkvist
bd0f7c1c23 Merge pull request #3091 from bugron/bugron-divide_fix
fixes a condition in assert
2015-09-08 22:29:04 +02:00
Anton Strömkvist
3c28cc3cc6 Merge pull request #3088 from bugron/bugron-add_two_num-fix
fixes assert and adds a dot
2015-09-08 22:24:11 +02:00
Arsen Melikyan
83c1b5c8aa Merge pull request #3153 from ahstro/ahstro-3152
Move brace out of user-edit scope
2015-09-08 23:25:25 +04:00
Anton Strömkvist
4b2c209a22 Merge pull request #2921 from bugron/bugron-2803
fixes an idle test and some text
2015-09-08 21:07:55 +02:00
Arsen Melikyan
91d3959bfd Merge pull request #2953 from dmytroyarmak/dmytroyarmak-2948
Add output block to "Iterate with JavaScript For Loops" challange
2015-09-08 21:37:00 +04:00
bugron
e0db3181d3 fixes an idle test and some text 2015-09-08 19:13:20 +04:00
Dmytro Yarmak
ccb88cadf3 Add output block to "Iterate with JavaScript While Loops" challange 2015-09-08 10:59:14 +03:00
Anton Strömkvist
7a3e84cb0d Merge pull request #2739 from bugron/bugron-1881
Changes nonexistent variable name to proper one
2015-09-08 01:57:41 +02:00
ahstro
0055c3b271 Move brace out of user-edit scope
Move the closing brace of a function down below the
`// Only change code above this line`-comment in
`Use Conditional Logic with IfElse Statements`

Fix #3152
2015-09-07 22:56:27 +02:00
Jakob Dahl
033175ae23 Updated and rebased pr 2015-09-07 03:08:08 +02:00
natac13
34246716c0 Test improvements
changed the jquery selector to account for single and double quotes
as well as optional spaces on:
[Give your JavaScript Slot Machine some stylish images](http://www.freecodecamp.com/challenges/waypoint-give-your-javascript-slot-machine-some-stylish-images)
[Bring your JavaScript Slot Machine to Life](http://www.freecodecamp.com/challenges/waypoint-bring-your-javascript-slot-machine-to-life)
[Target the same element with multiple jQuery Selectors](http://www.freecodecamp.com/challenges/waypoint-target-the-same-element-with-multiple-jquery-selectors)
[Target the Parent of an Element Using jQuery](http://www.freecodecamp.com/challenges/waypoint-target-the-parent-of-an-element-using-jquery)
2015-09-06 13:12:06 -04:00
Arsen Melikyan
c8dee301ee Merge pull request #3109 from AryanJ-NYC/AryanJ-NYC-2136
Added details to instructions of JS arrays waypoint
2015-09-06 10:18:44 +04:00
Aryan Jabbari
0f46ed8c9d Used strict equality for second assert 2015-09-06 00:39:07 -04:00
Aryan Jabbari
2817ec49a9 Checks that length is used twice for JS bracket notation challenges; closes #3105 2015-09-06 00:37:12 -04:00
Aryan Jabbari
aa34bf1a41 Added details to instructions of JS arrays waypoint; closes #2136 2015-09-05 20:53:54 -04:00
bugron
f417adc2d1 fixes a condition in assert 2015-09-05 19:20:41 +04:00
bugron
f4512dd929 fixes assert and some text 2015-09-05 18:05:09 +04:00
bugron
7289607f07 Fixes 'd[0].toLowerCase() is not a function' error 2015-09-05 16:38:09 +04:00
Quincy Larson
6bcc72ece7 Merge pull request #3002 from dmytroyarmak/dmytroyarmak-2999
Improve test cases for Generate Random Whole Numbers within a Range
2015-09-04 15:27:36 -07:00
natac13
d789633494 Added tests to JavaScript Give Slot Machine Some Style
The challenge could be passed by copying the code 3 times.
Made new tests to stop this

closes #2111
2015-09-04 13:48:51 -04:00
Dmytro Yarmak
dd5feb4a2c Improve test cases for Generate Random Whole Numbers within a Range 2015-09-02 23:17:33 +03:00
Dmytro Yarmak
bdd2803923 Add output block to "Iterate with JavaScript For Loops" challange 2015-09-01 13:41:40 +03:00
Atik Shaikh
da6fdcb9e5 Update basic-javascript.json 2015-08-31 00:49:27 +05:30
Ben McMahon
20d58b5208 Merge pull request #2490 from abhisekp/patch-3
Add correction to Waypoint - Sift through Text with Regular Expressions
2015-08-30 16:16:48 +01:00
Abhisek Pattnaik
a2db581771 Change challenge seed 2015-08-30 20:37:32 +05:30
Abhisek Pattnaik
a0f700b7db Merge remote-tracking branch 'upstream/staging' into patch-3 2015-08-30 13:49:04 +05:30
Natac13
20462582f4 fixed minor typo where there was a 's' left when the sentence was changed. Issue #2853 2015-08-29 18:30:16 -04:00
Ben McMahon
e3e1f16195 Merge pull request #2820 from AEA2002/staging
Minor edit in Find the Nth Character
2015-08-29 19:25:29 +01:00
Ben McMahon
fc5316f545 Merge pull request #2821 from uwaseem/uwaseem-1979
Fixed typo for issue 1979
2015-08-29 19:23:46 +01:00
bugron
beab6a4472 fixes 'editor.getValue(...).match(...) is null' 2015-08-29 02:35:06 +04:00
waseem
eec0d073f1 Fixed typo for issue 1979 2015-08-29 04:08:48 +08:00
ahstro
33ed3ae8b0 return(foo) => return foo 2015-08-27 22:19:03 +02:00
Arsen Melikyan
b24f367749 Changes nonexistent variable name to proper one 2015-08-26 18:59:59 +04:00
AEA2002
b9cfc09eb9 Minor edit in Find the Nth Character
In "Use Bracket Notation to Find the Nth Character in a String" section removed "last" from  'The third last letter of lastName should be..."
2015-08-25 18:34:31 -04:00
Aniruddh Agarwal
57c3261415 replaced + by . 2015-08-25 22:42:58 +08:00
Aniruddh Agarwal
0cc032a6e9 fixed conflicts 2015-08-25 22:21:33 +08:00
Aniruddh Agarwal
beb537d5eb Cleaned up description for 'Sift through Text with Regular Expressions' waypoint 2015-08-25 20:26:32 +08:00
Aniruddh Agarwal
5ce26c5b4b Expanded description of 'Build Javacript Objects' waypoint 2015-08-25 19:36:47 +08:00
Quincy Larson
048a7d3dce Merge pull request #2620 from bugron/bugron-1522
Fixes missing backslash in waypoints' instructions'
2015-08-24 19:02:22 -07:00
Quincy Larson
e5a9b697ae Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-24 17:54:00 -07:00
bugron
f750182a4b Adds a desctiption to avoid confusion in JS challenges 2015-08-25 04:41:02 +04:00
Berkeley Martinez
26e1f3fdac Merge pull request #2568 from AryanJ-NYC/AryanJ-NYC-1876
Fixed #1876; fixed some grammar issues; adhered to JS comment convent…
2015-08-24 11:14:32 -07:00
Berkeley Martinez
c82909de0c Merge pull request #2596 from suhussai/suhussai-2592
Typo Fix. Closes #2592
2015-08-24 11:03:34 -07:00
Arsen Melikyan
d54bbaaf2d 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.
2015-08-24 14:48:38 +04:00
benmcmahon100
8136443f87 Fix #2605 2015-08-24 00:22:35 +01:00
suhussai
2cc09ce374 Typo Fix. Closes #2592
Changed "greater then" to "greater than" in Waypoint 30, http://freecodecamp.com/challenges/waypoint-generate-random-whole-numbers-with-javascript
2015-08-23 12:20:28 -06:00
Aryan Jabbari
ba0ff40604 Fixed #1876; fixed some grammar issues; adhered to JS comment conventions 2015-08-23 05:19:45 -04:00
Quincy Larson
9fc3fd72b1 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-22 18:08:37 -07:00
Quincy Larson
ebf1530d6f update JavaScript copy from pull request 2015-08-22 17:40:59 -07:00
Berkeley Martinez
810e40e4db Merge pull request #2505 from issyl0/fix_typo_iterate_with_js
In the while loop iterator section, advise while loops, not for loops
2015-08-22 17:22:14 -07:00
Abhisek Pattnaik
3b6da88e7f Fix error in string 2015-08-23 03:26:20 +05:30
Abhisek Pattnaik
e87913edad Fix Add your JavaScript Slot Machine Instructions 2015-08-23 03:22:05 +05:30
Isabell Long
1206655940 In the while loop iterator section, advise while loops, not for loops
- Fixes #2504.
2015-08-22 20:27:08 +01:00
Berkeley Martinez
f90f59f0c6 Merge pull request #2498 from issyl0/add_full_stops
Add full stops at the end of "Random Whole Number" waypoint
2015-08-22 10:14:04 -07:00
Isabell Long
a816dc5a19 Add periods at the end of sentences in the Random Whole Number waypoint
- Partially fixes #1991.
2015-08-22 18:08:58 +01:00
waseem
7fad44e648 Fixed grammar - replaced 'but' with 'by' 2015-08-22 22:21:15 +08:00
Abhisek Pattnaik
c5c68c252c Correct Sift through Text with Regular Expressions
- Change information text
- Change regular expression
- Change code in editor
- Change assertion
2015-08-22 19:05:41 +05:30
benmcmahon100
cd511ad314 Merge remote-tracking branch 'origin/staging' into staging 2015-08-21 22:40:18 +01:00
benmcmahon100
ae6746f978 Fix a syntax(ish) error 2015-08-21 22:37:34 +01:00
benmcmahon100
ae43cb0fa3 Merge pull request #2451 from ahstro/ahstro-2440
Moved myArray into 'Only change code'-block
2015-08-21 22:34:16 +01:00
benmcmahon100
0f1baeeb68 Merge remote-tracking branch 'origin/staging' into staging 2015-08-21 22:01:11 +01:00
benmcmahon100
e33a929f0c Fix #2444 2015-08-21 22:01:03 +01:00
Berkeley Martinez
c32e89baff fix delete is a keyword not a function 2015-08-21 12:37:47 -07:00
ahstro
ae6271964f Moved myArray into 'Only change code'-block 2015-08-21 21:22:25 +02:00