Commit Graph

862 Commits (d9332e7d03d6fc329f50c840f9cf3619db0a2fe4)

Author SHA1 Message Date
Quincy Larson 407cfbceac Merge pull request #3040 from natac13/attemp-fix-poor-description-#3038
Attempt to fix poor description Where Art Thou
2015-09-04 15:09:35 -07:00
Quincy Larson f92447f774 Merge pull request #3046 from ahstro/ahstro-3045
Updated ExpressWorks exercises in waypoint
2015-09-04 15:05:53 -07:00
Quincy Larson 04c3047361 improve jquery challenge wording 2015-09-04 15:00:58 -07:00
Quincy Larson 1519da3e6d Merge pull request #3050 from natac13/fix-students-using-example-in-challenge-parent-jquery
fix misleading description that leads to issues being submitted.
2015-09-04 14:54:19 -07:00
Quincy Larson cb8c3addfa Merge pull request #3056 from natac13/added-test-slot-machine-#2111
Added tests to JavaScript Give Slot Machine Some Style
2015-09-04 14:49:12 -07:00
Timothy Cyrus 706ab63693 Update bootstrap.json
Fix bad formatting with Label Bootstrap Wells test
2015-09-04 17:35:22 -04:00
Quincy Larson d84ebeaa5a Merge pull request #3067 from abhisekp/add-test-bf-palindrome
Add test cases to Bonfire:Check for Palindrome
2015-09-04 14:31:17 -07:00
Quincy Larson 2123796220 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-09-04 14:27:08 -07:00
Abhisek Pattnaik b447d8b61b Add Bonfire Check for Palindromes test cases
Add test cases with numbers in the string to also check for numbers.
2015-09-05 02:41:20 +05:30
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
Arsen Melikyan 08382d608f Merge pull request #2959 from awesomeaniruddh/awesomeaniruddh-2946
updated description of waypoint to make it more specific
2015-09-04 17:07:04 +04:00
natac13 34760ae375 fix misleading description that leads to issues being submitted.
closes #3044
closes #2980
closes #2805
closes #2337
2015-09-04 08:11:44 -04:00
Aniruddh Agarwal 357f378c21 Update html5-and-css.json 2015-09-04 17:44:27 +08:00
ahstro 113a3f5456 Updated ExpressWorks exercises in waypoint 2015-09-04 09:55:07 +02:00
Quincy Larson fdf3fbe157 Merge branch 'fix-camper-news-zipline' into staging 2015-09-03 18:40:04 -07:00
Natac13 6d39433aea Attempt to fix unclear description Where Art Thou
closes #3038
2015-09-03 18:21:36 -04:00
Natac13 9496152e00 fixes filter function return conditional
closes #3031
2015-09-03 14:02:44 -04:00
Arsen Melikyan fe61b1618c Merge pull request #2872 from natac13/fix-backslash-typo-2832
Removed backslash. When I just removed the one the linter did not lik…
2015-09-03 21:22:58 +04:00
Natac13 eddeeb630b I forgot a semi colon... 2015-09-03 13:14:42 -04:00
Arsen Melikyan 5e2194978a Merge pull request #2975 from natac13/fix-typo-in-tests-#2974
fixes typo in test
2015-09-03 20:40:44 +04:00
Natac13 4547cef942 fixed unnecessary self closing tag in the description. 2015-09-03 12:26:07 -04:00
Dmytro Yarmak dd5feb4a2c Improve test cases for Generate Random Whole Numbers within a Range 2015-09-02 23:17:33 +03:00
Natac13 fa0160b639 Fix the typo in Create Bootstrap Wells; first test had extra > 2015-09-01 18:31:21 -04:00
Arsen Melikyan f823a03ffe fixes a small typo 2015-09-02 00:14:57 +04:00
Quincy Larson 15e87f1432 update ziplines and basejumps to have placeholder text in tweet templates 2015-09-01 12:04:00 -07:00
Aniruddh Agarwal 148dc2c847 updated description of waypoint to make it more specific 2015-09-01 23:07:32 +08:00
Ben McMahon 3b5eddaeeb Merge pull request #2880 from bugron/bugron-2007
clarifies challenge instruction
2015-09-01 13:42:21 +01:00
Ben McMahon 91264f308c Merge pull request #2954 from natac13/fix-grammer-error-2952
fixes grammatical error
2015-09-01 13:31:26 +01:00
Ben McMahon 7af3e764c1 Merge pull request #2941 from awesomeaniruddh/awesomeaniruddh-2940
Fixed typo in 'Condense arrays with reduce' waypoint
2015-09-01 13:28:19 +01:00
Natac13 2757ebf6b3 fixes grammatical error on jQuery challenge 'Target the Children of an
Element Using jQuery'.... missing 'they' word
2015-09-01 06:42:33 -04:00
Dmytro Yarmak bdd2803923 Add output block to "Iterate with JavaScript For Loops" challange 2015-09-01 13:41:40 +03:00
Quincy Larson 3c88c69c18 continue work refactoring intermediate-bonfires 2015-08-31 23:56:07 -07:00
Quincy Larson 9abac81db5 update the camper news zipline 2015-08-31 23:44:31 -07:00
Aniruddh Agarwal edb26effd4 fixed issue #2940: replaced and with an 2015-09-01 08:35:07 +08:00
benmcmahon100 bc66284da9 Merge #2887 2015-08-31 20:21:15 +01:00
Berkeley Martinez 643d1077d3 Merge pull request #2917 from bugron/bugron-typo
fixes a minor typo
2015-08-31 07:21:04 -07:00
Arsen Melikyan eb14aec1bf fixes a minor typo 2015-08-31 13:30:12 +04:00
Dmytro Yarmak 00046fc038 Fix assertions for Bonfire: Symmetric Difference 2015-08-31 10:52:48 +03:00
Berkeley Martinez 4e321a0008 Merge pull request #2888 from shaikhatik0786/patch-1
Update basic-javascript.json
2015-08-30 19:38:09 -07:00
Ben McMahon 5013e16b65 Merge pull request #1795 from abhisekp/patch-2
Add test cases for Bonfire: Where do I belong
2015-08-30 21:56:00 +01: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 90c44651a6 Correct assert statement 2015-08-30 20:32:25 +05:30
Arsen Melikyan 74490154e3 clarifies challenge instruction 2015-08-30 18:14:05 +04:00
Natac13 42758dfadf Removed backslash. When I just removed the one the linter did not like this so I replace with &#125 for right curly brace 2015-08-30 05:46:19 -04:00
Berkeley Martinez c1cf4952cf Merge pull request #2860 from natac13/fix-typo-minor-2853
Fix typo minor 2853
2015-08-30 01:27:38 -07:00
Abhisek Pattnaik a0f700b7db Merge remote-tracking branch 'upstream/staging' into patch-3 2015-08-30 13:49:04 +05:30
Abhisek Pattnaik 7e495338c4 Replace expect with assert 2015-08-30 13:36:39 +05:30
Abhisek Pattnaik b63cc229a9 Merge remote-tracking branch 'upstream/staging' into patch-2 2015-08-30 13:01:51 +05:30
Ben McMahon 83ca697b2e Merge pull request #2862 from natac13/fix-typo-delete-jquery-functions-2832
Fix typo delete jquery functions 2832
2015-08-30 00:00:53 +01:00
Natac13 28b63c824e fixed the typo of double 'your' words in Delete jQuery Functions. issue #2832 2015-08-29 18:57:52 -04:00
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 4361d6edee Another Small Calrification to bonfire desc 2015-08-29 23:26:49 +01:00
Ben McMahon 465df6ca8c Merge pull request #1756 from abhisekp/patch-1
Add test cases for Bonfire: Where art thou
2015-08-29 22:46:26 +01:00
Ben McMahon a06ad15435 Small clarification in a bonfire desc 2015-08-29 22:44:19 +01: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
Ben McMahon f1e4065ee6 Merge pull request #2825 from bugron/bugron-2293
fixes 'editor.getValue(...).match(...) is null'
2015-08-29 19:22:27 +01:00
Ben McMahon 0a58825c93 Merge pull request #2850 from awesomeaniruddh/awesomeaniruddh-2842
expanded description of 'Where art thou' bonfire
2015-08-29 19:05:00 +01:00
Aniruddh Agarwal 02ffd55348 expanded description of 'Where art thou' bonfire 2015-08-30 01:25:30 +08:00
Berkeley Martinez 717c56edb7 fix freecatphotoapp.com test 2015-08-28 17:52:02 -07: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
Quincy Larson f88cce8939 start modifying intermediate bonfires 2015-08-28 04:38:56 -07:00
ahstro 33ed3ae8b0 return(foo) => return foo 2015-08-27 22:19:03 +02:00
bugron 8d369615f6 combines two tests in one 2015-08-27 23:19:09 +04:00
Ben McMahon 30b61dc06c Merge pull request #2774 from regonn/lack-of-semicolon
Fix lack of semicolon at seed/challenges/html5-and-css.json
2015-08-27 15:41:53 +01:00
Ben McMahon a048049ca3 allow literally any whitespace fix #2769 2015-08-27 15:31:56 +01:00
regonn ebd92743f1 fix lack of semicolon 2015-08-27 23:29:21 +09:00
Quincy Larson 28073a61d7 continue refactoring bonfire tests 2015-08-26 23:23:46 -07:00
Arsen Melikyan b24f367749 Changes nonexistent variable name to proper one 2015-08-26 18:59:59 +04:00
Ben McMahon 6296f3695b Merge pull request #2734 from awesomeaniruddh/staging
Expanded description of 'Remove an Element Using jQuery' waypoint
2015-08-26 13:42:51 +01:00
Aniruddh Agarwal 18acaba2f2 Expanded description of 'Remove an Element Using jQuery' waypoint 2015-08-26 20:40:54 +08:00
Ionut Costica 172543e670 Fixed ")" error
Somehow the assert's closing paren got deleted :")
2015-08-26 13:52:40 +03:00
bugron 5ac2902b46 Fixes a word typo 2015-08-26 12:11:40 +04:00
bugron 16579fdd4b Fixes indoor, personality and label issues 2015-08-26 11:51:36 +04:00
Berkeley Martinez cfd94523c3 Merge pull request #2699 from bugron/bugron-2106
Changes CSS attributes to CSS properties
2015-08-25 22:32:23 -07:00
Berkeley Martinez cb2bc3c0bd Merge pull request #2705 from QuincyLarson/alt-text
Alt text
2015-08-25 22:30:44 -07:00
bugron d2704d2dc3 Changes catPhotoApp.com to FCC controlled domain 2015-08-26 05:44:59 +04:00
Quincy Larson 31a82c5c64 add a note about jQuery and Animate.css not usually being accessible in code editor 2015-08-25 17:16:08 -07:00
bugron ac8fa3cbec Changes CSS attributes to CSS properties 2015-08-26 03:58:49 +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
Berkeley Martinez 5120540795 Merge pull request #2567 from AryanJ-NYC/AryanJ-NYC-1950
Added exercise description to 'Waypoint: Iterate over Arrays with map'
2015-08-25 08:42:23 -07:00
sJhonny-e 547fa9424f changed regex for checking style element in challenge "Use CSS Selectors to Style Elements"; regex now allows opening style elements to have whitespace before closing '>', and also the allowed attributes (type, media etc..) 2015-08-25 18:12:17 +03: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
Berkeley Martinez 782f06b737 Merge pull request #2018 from itxchy/patch-5
In the 9th jQuery challenge, I changed "#button" to "button" in the example to target all buttons.
2015-08-24 23:22:27 -07:00
Berkeley Martinez 595544887c Merge pull request #2657 from QuincyLarson/update-ziplines
add simon video and forkable template for portfolio zipline
2015-08-24 23:17:17 -07:00
Quincy Larson 66a490bbee add simon video and forkable template for portfolio zipline 2015-08-24 22:50:36 -07:00
Aryan Jabbari fbbbff2186 Changed 'Show the Local Weather' wording to fix #2623 2015-08-24 23:11:21 -04:00
Quincy Larson 852c2e3094 Merge pull request #2569 from issyl0/remove_mentions_of_h1
Center Text with Bootstrap: don't mention <h1> as it doesn't exist
2015-08-24 20:04:34 -07:00
Quincy Larson 4d97932310 Merge pull request #2611 from jbmartinez/jbmartinez-2610
Added tests to enforce ID styling. Closes #2610
2015-08-24 20:03:44 -07: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
Berkeley Martinez 2d8184ce21 Merge pull request #2637 from srodman7689/srodman7689-2636
Removed extra word from the description of bootstrap Waypoint: Use Spans for Inline Elements
2015-08-24 16:58:41 -07:00
Berkeley Martinez afd8bc1bd1 Merge pull request #2633 from bugron/bugron-2153
Adds a desctiption to avoid confusion in JS challenges
2015-08-24 16:21:41 -07:00
bugron f750182a4b Adds a desctiption to avoid confusion in JS challenges 2015-08-25 04:41:02 +04:00
Sean Rodman 4403f589b8 Closes Issue #2636 2015-08-24 16:21:05 -05:00
Berkeley Martinez d24611800d Merge pull request #2574 from issyl0/consistent_capitalization
Consistently capitalize "Delete" in the description and the tests
2015-08-24 12:59:24 -07:00
Isabell Long 9d79d98e04 Center Text with Bootstrap: don't mention <h1> as it doesn't exist
- Also change the wording of the preceding sentence to be singular, as
  we only care about <h2>s.
- Fixes #1361.
2015-08-24 20:14:23 +01:00
Isabell Long f5e266a260 Consistently capitalize "Delete" in the description and the tests
- http://www.freecodecamp.com/challenges/waypoint-warn-your-users-of-a-dangerous-action.
- Fixes #1405.
2015-08-24 20:10:13 +01:00
Berkeley Martinez 175800ef37 Merge pull request #2421 from bugron/bugron-1063
fixed missing URL scheme #1063
2015-08-24 11:15:02 -07: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 045d1a73b6 Merge pull request #2570 from dokkillo/dokkillo-2308
issue 2308 Center Text with Bootstrap typo
2015-08-24 11:10:51 -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
Berkeley Martinez cf24be1673 Merge pull request #2577 from bugron/bugron-2311
Fixes a typo #2311
2015-08-24 10:53:56 -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
Juan Martínez 141e6f7c36 Added tests for enforcing ID styling. Closes #2610 2015-08-24 03:03:02 +00:00
Quincy Larson c264ce6e9d continue refactoring bonfire tests 2015-08-23 18:02:58 -07:00
Ben McMahon d445aeb569 Merge pull request #2593 from srodman7689/srodman7689-2552
Closes issue #2552
2015-08-24 01:15:05 +01:00
Sean Rodman 5e97207174 Close issue #2552 2015-08-23 18:59:34 -05:00
benmcmahon100 f0a783c9df Added some leniency to the test so that it doesn't require a new line 2015-08-24 00:29:34 +01:00
benmcmahon100 8136443f87 Fix #2605 2015-08-24 00:22:35 +01:00
Quincy Larson e4896eb0c0 continue refactor of tests 2015-08-23 15:18:40 -07:00
Quincy Larson 59bb244286 start refactoring bonfire tests 2015-08-23 13:10:30 -07: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
ahstro 67158e876d Check all children instead of just one in 'Target Children with jQuery' 2015-08-23 15:19:05 +02:00
Arsen Melikyan e960cbd9b1 Fixes a typo #2311 2015-08-23 16:38:38 +04:00
dokkillo 7d1398d01d issue 2308 2015-08-23 12:14:03 +02:00
Aryan Jabbari ba0ff40604 Fixed #1876; fixed some grammar issues; adhered to JS comment conventions 2015-08-23 05:19:45 -04:00
Aryan Jabbari a8e3af20b0 Replaced backticks with <code></code> 2015-08-23 05:03:52 -04:00
Aryan Jabbari 2d3c0c2780 Deleted tab 2015-08-23 03:47:13 -04:00
Aryan Jabbari 7b53607492 Fixes #1950 using @benschenker's suggested text. 2015-08-23 03:42:42 -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 4cc423e488 possibly fix issue with bootstrap wells challenge 2015-08-22 18:08:25 -07:00
Quincy Larson 0107ec6006 replace other images with imgur images and turn one image into a code snippet 2015-08-22 17:47:52 -07:00
Quincy Larson cbb0397dae replace evernote links with more reliable imgur links 2015-08-22 17:44:53 -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
Quincy Larson 46c3e638e5 Merge pull request #2529 from issyl0/consistently_use_double_quotes
Target Even Numbered Elements: consistently use double quotes
2015-08-22 15:23:59 -07:00
Isabell Long 9ae92c92b2 Target Even Numbered Elements: consistently use double quotes
- Fixes #2528.
2015-08-22 23:20:48 +01: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 33418cc813 Merge pull request #2419 from bugron/bugron-1064
fixed unclosed "code" tag #1064
2015-08-22 11:01:15 -07:00
Isabell Long 3d818147a5 Spans for Inline Elements: remove "grow" as we already said "fill"
- Fixes #2332.
2015-08-22 18:51:21 +01:00
Isabell Long ab35e56661 Target Parent jQuery: elements => element because we reference only one
- Partially fixes #2392.
2015-08-22 18:46:37 +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
Berkeley Martinez 8545105232 Merge pull request #2496 from issyl0/fix_code_tag_form_elements
Add missing <code> tags to form element bootstrap waypoint
2015-08-22 09:22:30 -07:00
Isabell Long 3ff2fc946c Add missing <code> tags to form element bootstrap waypoint
- Fixes #2409.
2015-08-22 17:19:46 +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
Berkeley Martinez d5c6a54923 Merge pull request #2459 from allan-hernandez/patch-1
Confusing Wells Text - #2391 #2458
2015-08-21 14:43:25 -07:00
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
Allan Hernandez 1c2748b623 Update bootstrap.json
Clarifying - Agree with @BerkeleyTrue on clarity
2015-08-21 16:35:14 -05: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
Berkeley Martinez 9dd3960a0b Merge pull request #2454 from saadanerdetbare/saadanerdetbare-2431
2431 changed wording on testresult
2015-08-21 14:30:27 -07:00
Allan Hernandez 007f913517 Confusing Wells Text - #2391 #2458
Checklist instructions were incorrect as seen in

closes #2391 
closes #2458
2015-08-21 16:17:21 -05: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
Jakob Dahl 49fcdec9b7 2431 reworded 2nd test 2015-08-21 22:54:03 +02:00
Jakob Dahl dd71ada021 2431 changed wording on testresult 2015-08-21 22:06:04 +02: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
benmcmahon100 d87b0457fe Merge remote-tracking branch 'origin/staging' into staging 2015-08-21 20:21:15 +01:00
benmcmahon100 9584c7870a Update JSON 2015-08-21 20:20:56 +01:00
Berkeley Martinez 6d3fcb3d0b Merge pull request #2342 from dokkillo/dokkillo-2333
issue 2333 : Fix grammar error in Waypoint
2015-08-21 09:37:17 -07:00
Jakob Dahl 0132a1afca 2324 for id attributes to be under relevant parents 2015-08-21 17:45:30 +02:00
Arsen Melikyan 24dbee7257 fixed missing URL scheme #1063 2015-08-21 18:38:43 +04:00
Arsen Melikyan 3d16d96133 fixed #1064 2015-08-21 17:56:44 +04:00
Ionut Costica 636e16d522 [Waypoint: Remove Classes from an element with jQuery] usually expected to not validate if using removeClass() without parameters
Added extra test to the waypoint to check if `.removeClass` was used with the `"btn-default"` parameter as most people expect to have to do (and are confused when the code validates before they've finished writing their function, as seen by the myriad of issues opened about it).

Closes #2302
Closes #2402
Closes #2301
Closes #2197
Closes #2160
Closes #1923
Closes #1898
2015-08-21 15:18:40 +03:00
benmcmahon100 4de75fc9e7 Fix #2364 2015-08-20 23:38:16 +01:00
dokkillo 81afc27412 issue 2333 2015-08-20 20:24:25 +02:00
benmcmahon100 708b8dc0dc Merge pull request #2241 from dokkillo/dokkillo-2238
issue #2238
2015-08-20 17:35:23 +01:00
benmcmahon100 bec51ec2db Merge pull request #2315 from erratadei/erratadei-1754-and-2305
change in basic bonfire Mutations
2015-08-20 17:32:34 +01:00
benmcmahon100 87a7a4b256 Merge pull request #2320 from awesomeaniruddh/staging
updated description of DNA Pairing bonfire
2015-08-20 17:32:06 +01:00
benmcmahon100 66aee866ad Merge pull request #2321 from meecoder/meecoder-2309
change div to button in Target Elements by ID Using jQuery waypoint
2015-08-20 17:31:00 +01:00
dokkillo 87c01aae52 issue 2270 2015-08-20 17:21:10 +02:00
dokkillo 1bdbec15c3 issue 2265 2015-08-20 17:05:50 +02:00
dokkillo 45b53937c8 issue #2265 2015-08-20 16:57:50 +02:00
dokkillo c8b32afaeb Merge remote-tracking branch 'upstream/staging' into staging
Conflicts:
	seed/challenges/html5-and-css.json
2015-08-20 16:46:06 +02:00
dokkillo b001b8f8f2 issue #2271 2015-08-20 16:28:14 +02:00
Kian Moretz 9cf0f80321 change div to button in Target an element by ID jQuery challenge - fix for issue #2309 2015-08-20 10:09:33 -04:00
Aniruddh Agarwal a49734f3c5 updated description of DNA Pairing bonfire 2015-08-20 22:03:53 +08:00
Manuel Alzadiq Romero 235b952ff0 change in basic bonfire Mutations
Added an expect to be falsein order to avoid passing with wrong code
2015-08-20 07:55:21 -05:00
Mark Surnin 23139ff45f Added a test for factorial(0) to be equal to 1. 2015-08-20 12:01:38 +05:00
Matt Trifilo 45bcd32c9c Edited Pull Request #2018
Escaped the double quotation marks on line 418.
2015-08-19 22:48:25 -05:00
dokkillo cd26a96757 issue #2238 2015-08-20 00:33:53 +02:00
benmcmahon100 74d79da1bf Merge pull request #2239 from dokkillo/dokkillo-2099
issue #2099
2015-08-19 23:24:23 +01:00
benmcmahon100 f1053a2f68 Merge pull request #2235 from dokkillo/dokkillo-2218
issue #2218
2015-08-19 23:14:09 +01:00
dokkillo 21d674b238 issue #2099 2015-08-20 00:13:06 +02:00
dokkillo 2d06e35afe issue #2218 2015-08-19 23:45:58 +02:00
benmcmahon100 dd2d376130 Merge pull request #1910 from itxchy/patch-1
Spelling and grammar edit.
2015-08-19 21:35:50 +01:00
benmcmahon100 b256d87565 Merge pull request #1939 from ayampol/ayampol-1928
Fixes #1928
2015-08-19 21:35:02 +01:00
benmcmahon100 576dcf1345 Merge pull request #1975 from AryanJ-NYC/AryanJ-NYC-1909
Fixed #1909 #1972
2015-08-19 21:31:16 +01:00
benmcmahon100 e05aab352d Merge pull request #1977 from AryanJ-NYC/AryanJ-NYC-1944
Fixed #1944
2015-08-19 21:30:58 +01:00
benmcmahon100 1159849947 Merge pull request #1978 from jbmartinez/jbmartinez-1970
Fixes #1970 (minor typo)
2015-08-19 21:30:50 +01:00
benmcmahon100 96b815281d Merge pull request #1984 from AryanJ-NYC/AryanJ-NYC-1980
Fixed #1980
2015-08-19 21:30:42 +01:00
benmcmahon100 c6cb1a0742 Merge pull request #1985 from AryanJ-NYC/AryanJ-NYC-1982
Fixed #1982
2015-08-19 21:30:25 +01:00
benmcmahon100 c3da5e9373 Merge pull request #1990 from AryanJ-NYC/AryanJ-NYC-1924
Fixes #1924
2015-08-19 21:30:17 +01:00
benmcmahon100 a5faffc082 Merge pull request #1995 from jbmartinez/jbmartinez-1833
Fixes #1833
2015-08-19 21:29:50 +01:00
benmcmahon100 e18c3547e3 Merge pull request #1998 from itxchy/patch-2
Issue: Grammar #1994
2015-08-19 21:29:25 +01:00
benmcmahon100 7f712ffca3 Merge pull request #2003 from michael-krebs/michael-krebs-1986
fix #1986
2015-08-19 21:28:13 +01:00
benmcmahon100 c8de9d63fb Merge pull request #2004 from michael-krebs/michael-krebs-1988
fix #1988
2015-08-19 21:27:54 +01:00
benmcmahon100 a2d48f8b60 Merge pull request #2006 from itxchy/patch-4
Fixed: Misspell #1877
2015-08-19 21:27:34 +01:00
benmcmahon100 29988d92a8 Merge pull request #2022 from michael-krebs/michael-krebs-2011
fix #2011
2015-08-19 21:26:20 +01:00
benmcmahon100 79b319bbc0 Merge pull request #2051 from Gornstats/patch-1
Fixed new waypoint description typo
2015-08-19 21:24:33 +01:00
benmcmahon100 502a255253 Merge pull request #2069 from AryanJ-NYC/AryanJ-NYC-2036
Fixes #2036
2015-08-19 21:24:24 +01:00
benmcmahon100 45f0de877a Merge pull request #2074 from jbmartinez/jbmartinez-2049
Fixed #2049
2015-08-19 21:23:05 +01:00
benmcmahon100 e14e8239bf Merge pull request #2125 from saadanerdetbare/saadanerdetbare-2119
update seed for Override Styles in Subsequent CSS
2015-08-19 21:22:25 +01:00
benmcmahon100 79e259a0e7 Merge pull request #2127 from ptsurbeleu/staging
fix issue #2124 and rephrase the challenge a bit to avoid confusion
2015-08-19 21:22:12 +01:00
benmcmahon100 1a2183d1d1 Merge pull request #2228 from dokkillo/dokkillo-2189
Dokkillo 2189
2015-08-19 21:17:40 +01:00
dokkillo 222df425ac issue #2189 2015-08-19 21:57:41 +02:00
dokkillo 72dd0f7723 issue #2118 2015-08-19 21:00:39 +02:00
dokkillo a2e3e4a476 issue #2133 2015-08-19 20:29:53 +02:00
benmcmahon100 ca80196412 Merge pull request #2213 from dokkillo/staging
issue #2191
2015-08-19 19:11:27 +01:00
dokkillo 933d1edeee issue #2191 2015-08-19 19:12:51 +02:00
benmcmahon100 e600972247 Merge pull request #2181 from souldreamer/patch-3
Fix for Issue #2175
2015-08-19 18:00:09 +01:00
dokkillo 6947937f0a issue 2173 2015-08-19 18:49:25 +02:00
Ionut Costica 8e705b14ec Fix for Issue #2179, #2141, #2077, #1999
Fixes #2179, #2141, #2077, #1999
2015-08-19 15:43:39 +03:00
Ionut Costica a519565edf Fix for Issue #2175
Fixes #2175
2015-08-19 15:08:57 +03:00
Quincy Larson 6651e6da98 add types to testing waypoints 2015-08-18 21:49:16 -07:00
Pavel Tsurbeleu 0df76dc7b7 fix issue #2124 and rephrase the challenge a bit to avoid confusion 2015-08-18 15:17:26 -07:00
Jakob Dahl 298bea5e35 update seed for Override Styles in Subsequent CSS 2015-08-18 23:46:09 +02:00
Juan Martínez 91795de83f Fixed #2049 2015-08-18 14:05:51 +00:00
Aryan Jabbari 1822a207d3 Fixes #2036 2015-08-18 09:34:34 -04:00
Jeremy Gorniak 13c5ad0af8 Fixed typo in waypoints #1 and #2 2015-08-18 21:35:10 +10:00
Jeremy Gorniak 972b24b76f Fixed new waypoint description typo
Small but important typo in challenge description for:
Object Oriented and Functional Programming section
Waypoint #1 - Declare JavaScript Objects as Variables
2015-08-18 21:27:19 +10:00
Quincy Larson 85b736b64d fix 1705 2015-08-18 01:07:09 -07:00
Quincy Larson 27758a7418 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-17 23:44:53 -07:00
Quincy Larson c8c42b19b3 closes #1739 2015-08-17 23:44:43 -07:00
Michael Krebs d8347b3b7c fix #2011 2015-08-18 02:05:53 -04:00
Matt Trifilo 666a0a2cf3 Fixed: issue #2014
I changed "#button" to "button" in the example to target all buttons, and I changed the single quotes to double quotes in the description for consistency.
2015-08-18 00:43:28 -05:00
Matt Trifilo e06b348918 Fixed: Misspell #1877
Issue #1877's description's hint mentioned the wrong variable.
2015-08-17 23:29:11 -05:00
Michael Krebs 3e520811d0 fix #1988 2015-08-18 00:22:33 -04:00
Michael Krebs 817684de4e fix #1986 2015-08-18 00:17:56 -04:00
Matt Trifilo 9a828c9d3e Issue: Grammar #1994
Put in the proposed grammar changes from [this issue](https://github.com/FreeCodeCamp/FreeCodeCamp/issues/1994).
2015-08-17 23:01:52 -05:00
Juan Martínez da2f54a2bc Fixes #1833 2015-08-18 03:33:38 +00:00
Aryan Jabbari 5d54d98190 Fixes #1924 2015-08-17 22:54:08 -04:00
Aryan Jabbari b3875a3d6e Fixed #1982 2015-08-17 22:31:37 -04:00
Aryan Jabbari 0e43c46bff Fixed #1980 2015-08-17 22:29:35 -04:00
Aryan Jabbari fa31cdca0e Fixed #1944 2015-08-17 22:21:57 -04:00
Juan Martínez db1afbc87b Fixes #1970 (minor typo) 2015-08-18 02:20:24 +00:00
Aryan Jabbari 32eeefa439 Fixed #1909 #1972 2015-08-17 22:19:14 -04:00
Abhisek Pattnaik 2b080ec2b7 Problem Instruction clarrification
Replaced with correct instruction to the problem.
2015-08-18 04:17:24 +05:30
benmcmahon100 45ad2a7c20 Merge remote-tracking branch 'origin/staging' into staging 2015-08-17 22:57:36 +01:00
benmcmahon100 7c80d64d08 Fix #1942 2015-08-17 22:57:25 +01:00
ayampol 5034a92038 Fix <a target='_blank'></a> code tags
Changed &rt to &gt.
2015-08-17 16:49:19 -04:00
ayampol 8f0fba855e Update basic-ziplines.json
Add missing </code> around &lt;a target='_blank'&rt;</a>.
2015-08-17 16:43:43 -04:00
Aryan Jabbari 4d56972e21 Fixed #1926 2015-08-17 16:42:20 -04:00
Aryan Jabbari 0cab1ebfe5 Moved closing code to line 961 2015-08-17 16:34:45 -04:00
Aryan Jabbari 8722a0a294 Fixes #1878 2015-08-17 16:19:02 -04:00
benmcmahon100 7c360285aa Spaced out code a bit more on the shift challenge 2015-08-17 21:12:19 +01:00
benmcmahon100 0bbb5cf122 fixed the moved some comments in a seed that were causing confusion 2015-08-17 21:11:01 +01:00
benmcmahon100 f0f75eeae5 fixed the tests on a challenge 2015-08-17 21:09:40 +01:00