Commit Graph

66 Commits

Author SHA1 Message Date
dokkillo
45b53937c8 issue #2265 2015-08-20 16:57:50 +02:00
dokkillo
c8b32afaeb Merge remote-tracking branch 'upstream/staging' into staging
Conflicts:
	seed/challenges/html5-and-css.json
2015-08-20 16:46:06 +02:00
dokkillo
b001b8f8f2 issue #2271 2015-08-20 16:28:14 +02:00
benmcmahon100
74d79da1bf Merge pull request #2239 from dokkillo/dokkillo-2099
issue #2099
2015-08-19 23:24:23 +01:00
dokkillo
21d674b238 issue #2099 2015-08-20 00:13:06 +02:00
benmcmahon100
dd2d376130 Merge pull request #1910 from itxchy/patch-1
Spelling and grammar edit.
2015-08-19 21:35:50 +01:00
benmcmahon100
1159849947 Merge pull request #1978 from jbmartinez/jbmartinez-1970
Fixes #1970 (minor typo)
2015-08-19 21:30:50 +01:00
benmcmahon100
e14e8239bf Merge pull request #2125 from saadanerdetbare/saadanerdetbare-2119
update seed for Override Styles in Subsequent CSS
2015-08-19 21:22:25 +01:00
dokkillo
a2e3e4a476 issue #2133 2015-08-19 20:29:53 +02:00
Jakob Dahl
298bea5e35 update seed for Override Styles in Subsequent CSS 2015-08-18 23:46:09 +02:00
Quincy Larson
85b736b64d fix 1705 2015-08-18 01:07:09 -07:00
Quincy Larson
27758a7418 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-17 23:44:53 -07:00
Juan Martínez
db1afbc87b Fixes #1970 (minor typo) 2015-08-18 02:20:24 +00:00
Matt Trifilo
e8bffc5721 Spelling and grammar edit.
Minor spelling and grammar edit in the description of "Waypoint: Use Hex Code for Specific Colors" for clarity.
2015-08-17 14:55:22 -05:00
benmcmahon100
db4170eed7 Merge pull request #1769 from djordjelacmanovic/djordjelacmanovic-1005
fixed #1005
2015-08-17 20:25:16 +01:00
benmcmahon100
cebe1bfdcb Merge pull request #1853 from AryanJ-NYC/AryanJ-NYC-1849
Fixed #1849
2015-08-17 20:25:02 +01:00
Quincy Larson
bfabe09dad Fix case insensitivity to colors 2015-08-17 10:18:28 -07:00
Aryan Jabbari
d4b3b0c336 Fixed #1849 2015-08-17 09:12:04 -04:00
benmcmahon100
c748534b43 Merge pull request #1851 from AryanJ-NYC/AryanJ-NYC-1848
Fixed #1848
2015-08-17 14:03:04 +01:00
Aryan Jabbari
11f62a7cbf Fixed #1848 2015-08-17 09:01:48 -04:00
benmcmahon100
cffefac4ca Merge pull request #1832 from ahstro/ahstro-1830
Ignore case in HTML/CSS hex color waypoints.
2015-08-17 13:58:35 +01:00
Quincy Larson
97b3d298fe fix 1844 2015-08-17 05:30:28 -07:00
ahstro
9681534f24 Ignore case in HTML/CSS hex color waypoints. #1830 2015-08-17 10:21:01 +02:00
Quincy Larson
33ae7b243c fix #1771 2015-08-16 08:10:40 -07:00
Djordje Lacmanović
d80ed9f366 fixes issue #1005 2015-08-16 00:37:31 +02:00
Quincy Larson
40e14c3999 fix critical failing test in early waypoint 2015-08-15 15:33:21 -07:00
Isabell Long
fa454cfdd4 Close a <code> tag so that only actual code is marked
- Fixes #1767, hopefully.
2015-08-15 19:53:04 +01:00
Quincy Larson
40ab7d2911 more style improvements to front end challenges 2015-08-14 18:17:34 -07:00
Quincy Larson
aed4b6bfe1 improvements to copy of text and test output 2015-08-14 17:26:24 -07:00
Quincy Larson
f1dd82974f finish QAing bootstrap 2015-08-13 20:58:27 -07:00
Quincy Larson
914d9c81b0 fix a ton of bugs in waypoints 2015-08-13 17:57:06 -07:00
Quincy Larson
ed0d38a474 make more progress QAing challenges 2015-08-13 17:20:52 -07:00
Quincy Larson
3f05565739 use double quotes for all string literals in waypoints 2015-08-13 15:32:40 -07:00
Quincy Larson
d138757c52 Merge branch 'staging' into jquery
Conflicts:
	seed/challenges/bootstrap.json
	seed/challenges/jquery.json
2015-08-12 02:06:03 -07:00
Quincy Larson
c408bbe20b manually add minor test improvement submitted by @ramadis 2015-08-12 01:21:25 -07:00
Quincy Larson
75b54a395e Merge branch 'staging' of https://github.com/MatiKid/freecodecamp into MatiKid-staging 2015-08-12 01:16:04 -07:00
Quincy Larson
db6db2e403 Merge branch 'staging' into jquery
Conflicts:
	seed/challenges/bootstrap.json
2015-08-10 22:03:51 -07:00
Berkeley Martinez
6691897dbe Merge pull request #1612 from ahstro/ahstro-1467
Improve 'Turn an image to a Link'-waypoint
2015-08-10 20:25:54 -07:00
Berkeley Martinez
e7a4ec068c Merge pull request #1614 from ahstro/ahstro-1461
Grammatical error in 'Use Hex Code for Specific Colors'
2015-08-10 20:23:29 -07:00
Berkeley Martinez
26e69c8621 add type to challenges 2015-08-07 23:37:32 -07:00
Berkeley Martinez
f241a362d5 rename top level title to name 2015-08-07 18:43:45 -07:00
ahstro
e7c8589d08 Everything is horrible 2015-08-08 02:38:16 +02:00
Samuel Plumppu
344b729bce fixed tests to check for lowercase hexadecimal colors 2015-08-07 02:13:11 +02:00
ahstro
fb2599b8fe Grammatical error in 'Use Hex Code for Specific Colors' 2015-08-06 22:27:16 +02:00
ahstro
52300b9648 Changed test order & added <code> in 'img to link' 2015-08-06 22:07:54 +02:00
Samuel Plumppu
cf9b981564 fixed typos 2015-08-06 21:31:24 +02:00
Quincy Larson
959fde64fc add a span challenge and replace more old outside images with s3 images 2015-08-05 00:06:20 -07:00
Quincy Larson
fa86f650e2 update cats to fetch from s3 2015-08-04 23:31:00 -07:00
LumenTeun
f0aeb26337 'Create a Text Field' now makes sure the input type is text. #1241 2015-08-01 17:07:03 -07:00
Berkeley Martinez
28610c4092 Merge branch 'staging' of https://github.com/amorphid/freecodecamp into amorphid-staging 2015-08-01 16:47:26 -07:00