Commit Graph

817 Commits

Author SHA1 Message Date
Quincy Larson
d25330278b remove unneccessary additional bonfire argument I added a month ago 2015-09-27 00:21:15 -07:00
Arsen Melikyan
9b24c15f29 Merge pull request #3351 from alnero/feature/russian-translation
Add russian translation for the basic-ziplines
2015-09-22 21:16:35 +04:00
Anton Strömkvist
13d79f8a4f Merge pull request #3321 from natac13/natac13-expect-to-assert-advanced-bonfires
changed expects to assert style tests
2015-09-21 16:56:33 +02:00
Nerodenko Alexey
0da44d712b Add russian translation for the basic-ziplines 2015-09-21 17:19:22 +03:00
natac13
4763f9957c changed expects to assert style tests
more uniform descriptions
closes #3316
2015-09-20 16:24:01 -04:00
Arsen Melikyan
5ab8c0a228 Merge pull request #3377 from TylerMoeller/patch-1
Fix typo in html5-and-css.json
2015-09-20 20:27:01 +04:00
Anton Strömkvist
f06cf41065 Merge pull request #3369 from bugron/fix/editor-match-error_fix
Fixes two 'editor.match() in null' errors
2015-09-20 17:47:47 +02:00
Tyler Moeller
99f2dc2ac4 Fix typo in html5-and-css.json
The challenge "Nest an Anchor Element within a Paragraph" has a small typo at the end of the English description text as highlighted below:

"Now nest your existing a element within a new p element so that the surrounding paragraph says "View more cat photos", but where only "cat photos" is a link, and the rest of the text is rest is plain text."

This commit removes the final "rest is" highlighted above, giving us this sentence instead:

Now nest your existing a element within a new p element so that the surrounding paragraph says "View more cat photos", but where only "cat photos" is a link, and the rest of the text is plain text.
2015-09-20 08:35:21 -07:00
Arsen Melikyan
8129f8a277 fixes two 'editor.match() in null' errors 2015-09-20 02:17:25 +04:00
Aniruddh Agarwal
dfe6da9ea6 Added test to determine num of elements with class 2015-09-19 20:18:17 +08:00
Berkeley Martinez
f871db26da Merge pull request #3326 from AEA2002/change/functionName
changed user-named function: replace to myReplace
2015-09-17 22:50:30 -07:00
Berkeley Martinez
5da4be5779 Merge pull request #3341 from QuincyLarson/basejump
make "basejump" singular instead of plural on the map
2015-09-17 13:35:22 -07: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
58a8725d75 make "basejump" singular instead of plural on the map 2015-09-16 23:57:05 -07:00
ahstro
a526b9d54a Fix typo in bonfire test case 2015-09-16 22:34:25 +02:00
AEA2002
986a9977ee changed user-named function: replace to myReplace 2015-09-15 19:02:56 -04:00
ahstro
7e9c5e0882 Add more falsy values to 'Falsy Bouncer', again.
This was already fixed at some point by abhisekp, but their changes
seems to have been overwritten somewhere along the line.
2015-09-15 18:46:51 +02:00
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