Commit Graph

770 Commits

Author SHA1 Message Date
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
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
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
Joel Bentley
d177e388ea Fix description of Waypoint: Find Numbers with Regular Expressions 2015-09-12 15:00:04 -04:00
bugron
d63721c250 improves tests to check if elements are nested properly 2015-09-12 10:46:30 +04:00
Quincy Larson
e8974de9b9 fix plural typo on basejump challenges 2015-09-11 23:30:43 -07:00
Arsen Melikyan
e93901a57f Merge pull request #3240 from awesomeaniruddh/awesomeaniruddh-1031
Fixed erroneous test in bootstrap waypoint
2015-09-11 18:27:48 +04:00
Aniruddh Agarwal
a56ff225d1 updated ambiguous description of jquery waypoint 2015-09-11 22:15:56 +08:00
bugron
ea5464c806 fixes assert in challenge 2015-09-11 17:19:37 +04:00
Aniruddh Agarwal
9a41abc048 Merge pull request #3106 from AryanJ-NYC/AryanJ-NYC-1282
Made changes to smallest common multiple bonfire instructions as suggested by @jrtmns
2015-09-11 16:50:36 +08:00
Aniruddh Agarwal
a278b211cc Fixed erroneous test in bootstrap waypoint
Modified the last test in the bootstrap waypoint `Add Font Awesome Icons to all of our Buttons` so that it doesn't validate `</i`, but `</i>`
closes #1031
2015-09-11 14:01:49 +08:00
Aniruddh Agarwal
ca2e10db74 Updated instructions of waypoints for new C9 interface
Updated the instructions for all the basejump-related waypoints to be consistent with the new Cloud9 interface
closes #1318
2015-09-11 10:02:07 +08:00
Aniruddh Agarwal
79adbc9342 Fixed typo in basic bonfire description
Changed 'Meet Bonfire' bonfire's description from `clicking Run code` to `clicking Run tests`
closes #3235
2015-09-11 09:00:55 +08:00
Berkeley Martinez
ef5715fa24 fix missing n in conditional 2015-09-10 13:09:56 -07:00
Nathan Scott
20c45e7082 Fix typo in test for bonfire Drop It 2015-09-10 13:09:55 -07:00
Nathan Scott
0bc6831399 Add extra test case for bonfire Drop It to fix issue #2533 2015-09-10 13:09:55 -07:00
Aryan Jabbari
2bfcc9c46d Made changes to instructions as suggested by @jrtmns; closes #1282 2015-09-10 15:59:14 -04:00
Berkeley Martinez
744a8182ba Merge pull request #2650 from AryanJ-NYC/AryanJ-NYC-2623
Changed 'Show the Local Weather' wording
2015-09-10 12:52:12 -07:00
Berkeley Martinez
6aa75f7c67 Merge pull request #2967 from bugron/bugron-2966
fixes a small typo
2015-09-10 12:37:57 -07: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
Aniruddh Agarwal
de4b2cbaef Updated description of voting app basejump
Updated description of the Voting App basejump so that unauthenticated users can now vote.
fixes #1398
2015-09-10 19:48:19 +08:00
Berkeley Martinez
ac74f266ff Merge branch 'master' into staging 2015-09-09 22:41:22 -07:00
Quincy Larson
09c4b542a0 update feedback copy for ziplines and basejumps 2015-09-09 20:05:10 -07:00
Quincy Larson
5a50c13823 Merge pull request #3115 from abhisekp/add-test-bf-palindrome
Add and Update test cases for "Bonfire: Check for Palindromes"
2015-09-09 14:29:56 -07:00
Quincy Larson
f8657efc0e Merge pull request #3129 from tcyrus/patch-2
Fixed tests in "Split your Bootstrap Row" and "Create Bootstrap Wells"
2015-09-09 14:24:34 -07:00