Commit Graph

3265 Commits

Author SHA1 Message Date
177daf1752 Translated id bd7124d8c441eddfaeb5bdef
Translated into german.

"Waypoint: Learn how Free Code Camp Works"
2015-06-01 21:10:04 +02:00
8e5028fdcc Merge branch 'master' into staging 2015-05-31 12:33:52 -07:00
db6fcf7de6 add div and background color challenges 2015-05-31 12:32:09 -07:00
2deb79219d minor fix recommended by @eabedrapo 2015-05-31 12:03:59 -07:00
1041ad0ed1 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-05-31 11:49:19 -07:00
99315ec9c5 update local cities 2015-05-31 11:40:31 -07:00
d1c4567790 start refactoring challenge map 2015-05-31 11:27:16 -07:00
5380a9ea74 add yet unfinished curriculum overview to challengeMap 2015-05-31 02:01:55 -07:00
21d30663d7 Merge pull request #766 from LumenTeun/checks
Improves checks in 'Create a Set of Checkboxes'
2015-05-30 20:21:08 -07:00
0de2ded19a Merge pull request #765 from LumenTeun/lumenteun-753
Checks all margins in 'Add Different a Margin to Each Side of an Element' #753
2015-05-30 20:19:39 -07:00
9dc504a99d Merge branch 'LumenTeun-lumenteun-763' into stagingt push origin staging 2015-05-30 20:16:32 -07:00
2b39b22d67 Merge branch 'lumenteun-763' of https://github.com/LumenTeun/freecodecamp into LumenTeun-lumenteun-763
Conflicts:
	seed_data/challenges/basic-html5-and-css.json
2015-05-30 20:16:22 -07:00
d4eed5b514 Merge pull request #760 from LumenTeun/lumenteun-701
Improves 'Add Placeholder Text to a Text Field' and fixes #701
2015-05-30 20:12:30 -07:00
5d5b1ef5f5 Merge pull request #759 from LumenTeun/lumenteun-703
Incorrect seed in 'Use HTML5 to Require a Field' #703
2015-05-30 20:11:18 -07:00
840069f155 Merge pull request #749 from LumenTeun/grammar
Fixes sentence cut-off bug in Make Circular Images with a Border Radius
2015-05-30 20:09:17 -07:00
c1c3dd2a12 Merge pull request #734 from eabedrapo/translationsES-eabedrapo
HTML Waypoints translated to ES [WIP]
2015-05-30 20:07:50 -07:00
99b232cdc0 Merge pull request #725 from miyagui/miya-es-translation
es translation
2015-05-30 20:06:22 -07:00
522e8655e2 Merge pull request #696 from LumenTeun/lumenteun-mutations
Prevents incorrect solution to Mutations bonfire
2015-05-30 20:04:41 -07:00
330bd8be34 Merge branch 'master' into staging 2015-05-30 20:01:31 -07:00
9008877b65 update field guide 2015-05-30 20:00:57 -07:00
340644f706 Checks all margins in 'Add Different a Margin to Each Side of an Element' #753 2015-05-31 03:51:59 +02:00
456d35b88f Improves checks in 'Create a Set of Checkboxes' 2015-05-31 03:15:44 +02:00
d403204a31 Adds some missing slashes to tag-closes. #763 2015-05-31 02:31:56 +02:00
e5705ffc0e 10th HTML/CSS waypoint translated into ES
Waypoint "Use CSS Selectors to Style Elements" translated into Spanish.
2015-05-30 21:22:10 -03:00
1302fc4726 9th HTML waypoint translated into ES
Waypoint "Change the Color of Text" translated into Spanish.
2015-05-30 20:32:29 -03:00
56603efe76 7th & 8th HTML waypoints translated into ES
Translated into Spanish:
* Waypoint: Fill in the Blank with Placeholder Text
* Waypoint: Delete HTML Elements
2015-05-30 18:14:41 -03:00
04ba685158 6th HTML Waypoint translated into ES
Waypoint "Comment out HTML" translated into Spanish
2015-05-30 17:45:52 -03:00
b8460441d8 update cities 2015-05-30 13:43:42 -07:00
b2ab83b3f0 fix typos and improve copy up through google font challenge 2015-05-30 13:34:49 -07:00
8dda4324f7 Improves 'Add Placeholder Text to a Text Field' and fixes #701 2015-05-30 16:59:00 +02:00
d949da5c29 Incorrect seed in 'Use HTML5 to Require a Field' #703 2015-05-30 16:41:41 +02:00
e0ab6982af 5th HTML Waypoint translated into ES
Waypoint "Uncomment HTML" translated into Spanish.
2015-05-30 09:59:06 -03:00
2402274375 4th HTML Waypoint translated into ES
Waypoint "Visually Separate Elements with Line Breaks" translated into
Spanish.
2015-05-30 09:47:15 -03:00
2cc906dd9b close more issues related to typos and tests 2015-05-30 01:49:00 -07:00
b94766228b add cities 2015-05-30 01:18:44 -07:00
225fe72c6d close #750 2015-05-30 01:17:14 -07:00
879e3e5a90 close #754 and #755 2015-05-30 01:02:12 -07:00
c0eecdff0f Thrid Waypoint translated into ES
Waypoint "Inform with the Paragraph Element" translated into Spanish.
2015-05-29 23:26:44 -03:00
7729f20729 update meta tags 2015-05-29 17:52:05 -07:00
e256491976 Fixes sentence cut-off bug in Make Circular Images with a Border Radius 2015-05-30 02:00:11 +02:00
c8a9c2f009 ton of html hotfixes 2015-05-29 16:54:39 -07:00
8b79a56135 improvements to early html challenges 2015-05-29 11:04:27 -07:00
ebe3e2b04a Merge branch 'master' of github.com:FreeCodeCamp/freecodecamp
Conflicts:
	controllers/resources.js
2015-05-29 10:44:03 -07:00
1b9325dec0 start adding additional tests to html waypoints to make them more robust 2015-05-29 10:43:14 -07:00
f77241ccbc Second Waypoint translated into ES
Waypoint "Headline with the h2 Element" translated into Spanish.
2015-05-29 06:09:02 -03:00
70c36fc302 First Waypoint translated to ES
Say Hello to HTML Elements translated into Spanish.
2015-05-29 05:28:12 -03:00
7eccd543f4 typo 2015-05-28 21:52:53 -05:00
a9e4dc47f7 spanish computer-science corrections, get-set-for-fcc translation finished 2015-05-28 20:44:49 -05:00
b3c8648937 Merge pull request #723 from QuincyLarson/modals
Modals
2015-05-28 20:29:38 -04:00
e322b3b7d6 Merge branch 'master' into modals
Conflicts:
	seed_data/field-guides.json
	views/coursewares/showHTML.jade
2015-05-28 17:25:34 -07:00