c6e3c89b7c
adds ability to 1-click expand images
2015-09-14 21:10:28 +04:00
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
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
ba4aacdbfd
minor improvements to suggested edits
2015-09-13 23:26:03 -07:00
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
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
2688f48c71
small copy improvements to @bugron fixes
2015-09-13 20:55:51 -07:00
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
389d8b43a8
switch backticks for doublequotes and fix the git.json file as well
2015-09-13 20:44:25 -07:00
ba25511ee5
Merge branch 'awesomeaniruddh-1318' of https://github.com/awesomeaniruddh/FreeCodeCamp into awesomeaniruddh-awesomeaniruddh-1318
2015-09-13 20:39:40 -07:00
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
f31fe15d77
minor formatting improvement to @awesomeaniruddh fix
2015-09-13 19:56:57 -07:00
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
c0f08b140a
Add explanation of how values passed to function
2015-09-13 16:02:25 -04:00
bf08c300be
Remove unneeded tests
2015-09-13 15:34:54 -04:00
96e071687b
Modify sample function in code to match form of sample function in description
2015-09-13 14:04:52 -04:00
a0ef8dd2ee
Merge pull request #3277 from awesomeaniruddh/awesomeaniruddh-3268
...
Updated instructions to ziplines intro challenge
2015-09-12 23:56:35 -07:00
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
e982bd198e
Merge pull request #3261 from awesomeaniruddh/awesomeaniruddh-2065
...
Fixes description of jQuery waypoint
2015-09-12 23:02:33 -07:00
0c7b1dbf5f
Fixes description of jQuery waypoint
2015-09-13 13:58:37 +08:00
3af8a9eb9f
Fixes typos, word issues in Basic JS, part 3
2015-09-13 09:10:30 +04:00
43778e5149
Fixes typos, word issues in Basic JS, part 2
2015-09-13 09:02:54 +04:00
02d24381a7
Fixes typos, word issues in Basic JS, part 1
2015-09-13 08:52:51 +04:00
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
94ca5a0326
Merge pull request #3225 from awesomeaniruddh/awesomeaniruddh-1398
...
Updated description of voting app basejump
2015-09-12 21:39:47 -07:00
b3c7a73ee1
Merge pull request #2892 from bugron/bugron-2256
...
fixes a test and some text
2015-09-12 21:31:46 -07:00
91f6e21757
fix typo
2015-09-12 20:39:23 -07:00
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
8f50925bba
Merge pull request #2957 from awesomeaniruddh/awesomeaniruddh-2955
...
updated ambiguous description of jquery waypoint
2015-09-12 19:52:32 -07:00
9243a1832f
Edited decription of html waypoint to include details
2015-09-13 07:40:17 +08:00
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
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
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
efc42e4eeb
Improve wording of Tests 1 and 2
2015-09-13 04:12:10 +08:00
8f2f7d7858
Change the unshift() example to make it less confusing to beginners
2015-09-13 03:54:24 +08:00
d177e388ea
Fix description of Waypoint: Find Numbers with Regular Expressions
2015-09-12 15:00:04 -04:00
d63721c250
improves tests to check if elements are nested properly
2015-09-12 10:46:30 +04:00
e8974de9b9
fix plural typo on basejump challenges
2015-09-11 23:30:43 -07:00
e93901a57f
Merge pull request #3240 from awesomeaniruddh/awesomeaniruddh-1031
...
Fixed erroneous test in bootstrap waypoint
2015-09-11 18:27:48 +04:00
a56ff225d1
updated ambiguous description of jquery waypoint
2015-09-11 22:15:56 +08:00
ea5464c806
fixes assert in challenge
2015-09-11 17:19:37 +04:00
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
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
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
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
ef5715fa24
fix missing n in conditional
2015-09-10 13:09:56 -07:00
20c45e7082
Fix typo in test for bonfire Drop It
2015-09-10 13:09:55 -07:00
0bc6831399
Add extra test case for bonfire Drop It to fix issue #2533
2015-09-10 13:09:55 -07:00
2bfcc9c46d
Made changes to instructions as suggested by @jrtmns; closes #1282
2015-09-10 15:59:14 -04:00
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
6aa75f7c67
Merge pull request #2967 from bugron/bugron-2966
...
fixes a small typo
2015-09-10 12:37:57 -07:00
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
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
ac74f266ff
Merge branch 'master' into staging
2015-09-09 22:41:22 -07:00
09c4b542a0
update feedback copy for ziplines and basejumps
2015-09-09 20:05:10 -07:00
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
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
3739998d73
Merge pull request #3137 from natac13/fix-parentheses-in-description-#3133
...
fix parenthesis in the description of first jquery challenge
2015-09-09 14:10:37 -07:00
c5577ee9e5
Merge pull request #3185 from awesomeaniruddh/awesomeaniruddh-3172
...
fixed test descriptions in OOJavascript waypoint
2015-09-09 14:08:49 -07:00
5db725d82c
fix additional spacing issues
2015-09-09 14:06:16 -07:00
1c09217953
Merge branch 'mdnlinks' of https://github.com/ahstro/freecodecamp into ahstro-mdnlinks
2015-09-09 13:56:05 -07:00
3c18fabacf
Merge pull request #3195 from awesomeaniruddh/awesomeaniruddh-2779
...
Wording error in description of HTML waypoint
2015-09-09 18:21:26 +01:00
7b04184fcc
Set up new curriculum order. OOPF is now before basic bonfires and where art thou is now in intermediate
2015-09-09 18:10:22 +01:00
43cfd024df
Wording error in description of HTML waypoint
...
`16 colors` instead of `16 values`
closes #2779
2015-09-09 22:42:55 +08:00
acf6ae2eda
fixes a test and some text
2015-09-09 18:32:20 +04:00
e432536d5f
Cleaned up `seed/bonfireMDNlinks.js`
...
The indentation mixed tabs and spaces, so I converted everything to
spaces. I also edited the top comment to look a bit more stylish.
2015-09-09 10:17:57 +02:00
d15a40ccf3
Merge pull request #2598 from suhussai/suhussai-2557
...
Added link about Roman Numeral to MDNLinks section.
2015-09-09 10:08:38 +02:00
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
44d54b7f69
fixed test descriptions in OOJavascript waypoint
...
The first and the second waypoints in the Object Orientated and Functional Programming section had errors in the test descriptions
closes #3172
2015-09-09 12:31:42 +08:00
c9c454dd69
Merge pull request #3183 from awesomeaniruddh/awesomeaniruddh-3130
...
Fixed wording error in HTML/CSS waypoint
2015-09-09 08:02:45 +04:00
471236b814
Fixed wording error in HTML/CSS waypoint
...
Waypoint 'Add Different Padding to Each Side of an Element' had a small wording error: the tests were missing `the`
closes #3130
2015-09-09 11:57:39 +08:00
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
90805e1aaa
Merge pull request #3181 from awesomeaniruddh/awesomeaniruddh-3169
...
Fixed typo in Basic Javascript Waypoint
2015-09-09 07:44:40 +04:00
09c7475145
Merge pull request #3102 from AryanJ-NYC/AryanJ-NYC-1875
...
Clarified instructions for shift() challenge
2015-09-09 07:25:03 +04:00
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
c57251a446
Added link about Roman Numeral to MDNLinks section
...
Added link mentioned in Waypoint description about
Roman Numerals to MDNLinks in order to make it more apparent.
Affects Waypoint 3 in Intermediate Algorithm Scripting.
http://www.freecodecamp.com/challenges/bonfire-roman-numeral-converter
closes #2557 .
2015-09-08 18:21:00 -06:00
b54b2de9ab
Clarifies instructions for shift() challenge; closes #1875
2015-09-08 17:31:15 -04:00
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
bd0f7c1c23
Merge pull request #3091 from bugron/bugron-divide_fix
...
fixes a condition in assert
2015-09-08 22:29:04 +02:00
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
83c1b5c8aa
Merge pull request #3153 from ahstro/ahstro-3152
...
Move brace out of user-edit scope
2015-09-08 23:25:25 +04:00
4b2c209a22
Merge pull request #2921 from bugron/bugron-2803
...
fixes an idle test and some text
2015-09-08 21:07:55 +02:00
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
e0db3181d3
fixes an idle test and some text
2015-09-08 19:13:20 +04:00
721ea81593
Add more falsy values
2015-09-08 16:06:44 +05:30
5365153c6d
Merge pull request #3131 from awesomeaniruddh/awesomeaniruddh-3089
...
Fixed incorrect challenge seed for bootstrap waypoint
2015-09-08 11:31:36 +02:00
ccb88cadf3
Add output block to "Iterate with JavaScript While Loops" challange
2015-09-08 10:59:14 +03:00
796abfc99e
Fixed incorrect challenge seed for bootstrap waypoint
...
Waypoint 'Use Spans for Inline Elements' has incorrect code in the seed. Corrected it.
Closes #3089
2015-09-08 10:39:07 +08:00
c5423c4840
Merge pull request #3150 from natac13/fix-mispelling-#3149
...
Grammatical error: fix mispelling of falsey to falsy
2015-09-08 02:34:11 +02:00
9e692ab600
Merge pull request #2912 from dmytroyarmak/dmytroyarmak-2797
...
Fix assertions for Bonfire: Symmetric Difference
2015-09-08 02:25:26 +02:00
94f4114b4f
Merge pull request #3154 from tcyrus/patch-3
...
Grammatical error: Changed Instructions for "Where art thou"
2015-09-08 02:15:38 +02:00
4966c1e5bd
Merge pull request #2788 from bugron/bugron-1891
...
combines two tests in one
2015-09-08 02:12:23 +02:00
7a3e84cb0d
Merge pull request #2739 from bugron/bugron-1881
...
Changes nonexistent variable name to proper one
2015-09-08 01:57:41 +02:00
58e6efff3c
Merge pull request #2728 from bugron/bugron-1390
...
Fixes "indoor", "personality" and "label" issues
2015-09-08 01:56:04 +02:00
ef1881baa9
Merge pull request #2423 from saadanerdetbare/saadanerdetbare-2387
...
Grammatical error: Change word third to second in 'Use Bracket Notation to Find the NthtoLast Character in a String'
2015-09-08 01:01:07 +02:00
6121fa173f
Merge pull request #1798 from jbmartinez/jbmartinez-1090
...
Changes test cases to validate correct border-width. Closes #1090 , #1012 , #1495
2015-09-08 00:07:53 +02:00
080ef01f33
Update basic-bonfires.json
...
Remove repeated "the" in Instructions for "Where art thou"
Changed "the the" to "the"
2015-09-07 17:46:49 -04:00
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
3361599d3a
fix mispelling of falsey to falsy
...
closes #3149
2015-09-07 13:09:51 -04:00
033175ae23
Updated and rebased pr
2015-09-07 03:08:08 +02:00
bugron
Quincy Larson
Quincy Larson
Joel Bentley
Berkeley Martinez
Aniruddh Agarwal
Aniruddh Agarwal
Leon Feng
Arsen Melikyan
Nathan Scott
Aryan Jabbari
Ben McMahon
ahstro
suhussai
Abhisek Pattnaik
Dmytro Yarmak
Timothy Cyrus
natac13
Jakob Dahl