Commit Graph

869 Commits (6d2c5a4f5f8f12491b09cbf1499ce288e85c5a33)

Author SHA1 Message Date
Aryan Jabbari 266b40702e Changed 'background color of blue' to 'color of blue'; fixed #3306 2015-09-15 01:13:52 -04:00
Joel Bentley 627cb9b122 Fix description Bonfire: Arguments Optional 2015-09-14 19:38:59 -04:00
Berkeley Martinez fba0d02c08 Merge branch 'bonfire-tests' of https://github.com/QuincyLarson/freecodecamp into QuincyLarson-bonfire-tests 2015-09-14 15:28:14 -07:00
Berkeley Martinez 1eb34dc175 Merge pull request #3298 from awesomeaniruddh/fix/html-waypoint-desc
Fix waypoint description to be in accordance with W3C rec
2015-09-14 15:20:33 -07:00
Berkeley Martinez a30a5f4bcb Merge pull request #3303 from avastu/Fix-title-case
Fixed Ambigious Explanation of Title Case
2015-09-14 15:18:33 -07:00
Quincy Larson 4f16b0e996 revert intermediate-bonfires to previous state for another camper to tackle 2015-09-14 14:57:14 -07:00
Quincy Larson d66dbc3879 Merge branch 'staging' into bonfire-tests 2015-09-14 14:56:06 -07:00
Quincy Larson 952b5e8e70 verify all basic-bonfires.json bonfires work as before 2015-09-14 14:55:00 -07:00
Aniruddh Agarwal 22e785b0b8 Fix waypoint description to be in accordance with W3C rec 2015-09-15 05:50:14 +08:00
Utsav Ahuja 148f68e3a1 Fixed ambigious wording 2015-09-14 14:30:53 -07:00
Berkeley Martinez ac5573b11c Merge pull request #3291 from QuincyLarson/fix-3278
minor formatting improvement to @awesomeaniruddh fix
2015-09-14 14:13:13 -07:00
Quincy Larson b605af0f09 Merge pull request #3301 from avastu/patch-2
Corrected Incorrectly Styled Text in Target HTML Elements
2015-09-14 14:12:08 -07:00
Utsav Ahuja 9a7fc92e79 Corrected Incorrectly Styled Text
In Target HTML Elements (jQuery) per https://github.com/FreeCodeCamp/FreeCodeCamp/issues/3299
2015-09-14 13:49:28 -07:00
Quincy Larson e107b0e005 Merge branch 'feature/enlarge-images' of https://github.com/bugron/FreeCodeCamp into bugron-feature/enlarge-images 2015-09-14 13:43:34 -07:00
Quincy Larson 98ed941384 most of the basic bonfires have running tests 2015-09-14 13:43:04 -07:00
bugron c6e3c89b7c adds ability to 1-click expand images 2015-09-14 21:10:28 +04:00
Quincy Larson 3d08496eb8 Merge branch 'staging' into bonfire-tests
Conflicts:
	seed/challenges/basic-bonfires.json
	seed/challenges/intermediate-bonfires.json
2015-09-14 00:24:33 -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 389d8b43a8 switch backticks for doublequotes and fix the git.json file as well 2015-09-13 20:44:25 -07:00
Quincy Larson ba25511ee5 Merge branch 'awesomeaniruddh-1318' of https://github.com/awesomeaniruddh/FreeCodeCamp into awesomeaniruddh-awesomeaniruddh-1318 2015-09-13 20:39:40 -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
Quincy Larson f31fe15d77 minor formatting improvement to @awesomeaniruddh fix 2015-09-13 19:56:57 -07:00
Quincy Larson d0359e5b27 Merge pull request #3278 from awesomeaniruddh/awesomeaniruddh-3276
Edited decription of html waypoint to include details
2015-09-13 19:50:48 -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
Berkeley Martinez a0ef8dd2ee Merge pull request #3277 from awesomeaniruddh/awesomeaniruddh-3268
Updated instructions to ziplines intro challenge
2015-09-12 23:56:35 -07:00
Berkeley Martinez 11370db569 Merge pull request #3263 from leonfeng/leonfeng-fix-3260
Fix wording of the tests in Waypoint: Create Bootstrap Wells
2015-09-12 23:29:54 -07:00
Berkeley Martinez e982bd198e Merge pull request #3261 from awesomeaniruddh/awesomeaniruddh-2065
Fixes description of jQuery waypoint
2015-09-12 23:02:33 -07:00
Aniruddh Agarwal 0c7b1dbf5f Fixes description of jQuery waypoint 2015-09-13 13:58:37 +08: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 849e823d54 Merge pull request #3255 from bugron/bugron-1117
Improves tests to check if elements are nested properly
2015-09-12 21:46:14 -07:00
Berkeley Martinez 94ca5a0326 Merge pull request #3225 from awesomeaniruddh/awesomeaniruddh-1398
Updated description of voting app basejump
2015-09-12 21:39:47 -07: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
Berkeley Martinez 91f6e21757 fix typo 2015-09-12 20:39:23 -07:00
Berkeley Martinez 5360531dc8 Merge branch 'sJhonny-e-969' of https://github.com/sJhonny-e/FreeCodeCamp into sJhonny-e-sJhonny-e-969 2015-09-12 20:37:48 -07:00
Berkeley Martinez 8f50925bba Merge pull request #2957 from awesomeaniruddh/awesomeaniruddh-2955
updated ambiguous description of jquery waypoint
2015-09-12 19:52:32 -07:00
Aniruddh Agarwal 9243a1832f Edited decription of html waypoint to include details 2015-09-13 07:40:17 +08:00
Aniruddh Agarwal 739a8b122b Merge pull request #3273 from joel-bentley/joel-bentley-2274
Fix description of Waypoint: Find Numbers with Regular Expressions
2015-09-13 07:12:28 +08:00
Aniruddh Agarwal 4bf3959ad4 Updated instructions to ziplines intro challenge
Updated the instructions to add jQuery as well as Bootstrap in the JS section.
closes #3268
2015-09-13 07:04:18 +08:00
Berkeley Martinez ee92c923d7 Merge pull request #3254 from FreeCodeCamp/more-info
Reorient Search and Submit buttons on Camper News
2015-09-12 13:20:36 -07:00
Leon Feng efc42e4eeb Improve wording of Tests 1 and 2 2015-09-13 04:12:10 +08:00
Leon Feng 8f2f7d7858 Change the unshift() example to make it less confusing to beginners 2015-09-13 03:54:24 +08:00