Commit Graph

118 Commits

Author SHA1 Message Date
dokkillo
901453745e issue 2265 2015-08-20 17:05:50 +02:00
dokkillo
9246cf97f5 issue #2265 2015-08-20 16:57:50 +02:00
dokkillo
9b1d7294c0 Merge remote-tracking branch 'upstream/staging' into staging
Conflicts:
	seed/challenges/html5-and-css.json
2015-08-20 16:46:06 +02:00
dokkillo
75b19e0e30 issue #2271 2015-08-20 16:28:14 +02:00
benmcmahon100
67edb85184 Merge pull request #2239 from dokkillo/dokkillo-2099
issue #2099
2015-08-19 23:24:23 +01:00
dokkillo
d1d1b2015b issue #2099 2015-08-20 00:13:06 +02:00
benmcmahon100
0836533cb7 Merge pull request #1910 from itxchy/patch-1
Spelling and grammar edit.
2015-08-19 21:35:50 +01:00
benmcmahon100
0bc326c4bc Merge pull request #1978 from jbmartinez/jbmartinez-1970
Fixes #1970 (minor typo)
2015-08-19 21:30:50 +01:00
benmcmahon100
33e03a965e 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
2c7313dcdb issue #2133 2015-08-19 20:29:53 +02:00
Jakob Dahl
986ad3662c update seed for Override Styles in Subsequent CSS 2015-08-18 23:46:09 +02:00
Quincy Larson
02b25dfd3e fix 1705 2015-08-18 01:07:09 -07:00
Quincy Larson
6b02219ca5 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-17 23:44:53 -07:00
Juan Martínez
e632f2b06a Fixes #1970 (minor typo) 2015-08-18 02:20:24 +00:00
Matt Trifilo
e6061ef944 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
fa89229a86 Merge pull request #1769 from djordjelacmanovic/djordjelacmanovic-1005
fixed #1005
2015-08-17 20:25:16 +01:00
benmcmahon100
9c5d152f09 Merge pull request #1853 from AryanJ-NYC/AryanJ-NYC-1849
Fixed #1849
2015-08-17 20:25:02 +01:00
Quincy Larson
84d48d220d Fix case insensitivity to colors 2015-08-17 10:18:28 -07:00
Aryan Jabbari
2e56330919 Fixed #1849 2015-08-17 09:12:04 -04:00
benmcmahon100
37596b9994 Merge pull request #1851 from AryanJ-NYC/AryanJ-NYC-1848
Fixed #1848
2015-08-17 14:03:04 +01:00
Aryan Jabbari
5ce7870edc Fixed #1848 2015-08-17 09:01:48 -04:00
benmcmahon100
3cdc1e5b57 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
983831e4ce fix 1844 2015-08-17 05:30:28 -07:00
ahstro
20f0cf5b37 Ignore case in HTML/CSS hex color waypoints. #1830 2015-08-17 10:21:01 +02:00
Juan Martínez
4338d69458 Fixed #1090 2015-08-16 21:11:36 +00:00
Quincy Larson
d1c5a38c02 fix #1771 2015-08-16 08:10:40 -07:00
Djordje Lacmanović
361c16bb1e fixes issue #1005 2015-08-16 00:37:31 +02:00
Quincy Larson
0d61531b4d fix critical failing test in early waypoint 2015-08-15 15:33:21 -07:00
Isabell Long
8c4469fdd7 Close a <code> tag so that only actual code is marked
- Fixes #1767, hopefully.
2015-08-15 19:53:04 +01:00
Quincy Larson
1edbc06ba5 more style improvements to front end challenges 2015-08-14 18:17:34 -07:00
Quincy Larson
7670d73ff5 improvements to copy of text and test output 2015-08-14 17:26:24 -07:00
Quincy Larson
7c5d5cc51a finish QAing bootstrap 2015-08-13 20:58:27 -07:00
Quincy Larson
060eeefd32 fix a ton of bugs in waypoints 2015-08-13 17:57:06 -07:00
Quincy Larson
9402b3b052 make more progress QAing challenges 2015-08-13 17:20:52 -07:00
Quincy Larson
837d412777 use double quotes for all string literals in waypoints 2015-08-13 15:32:40 -07:00
Quincy Larson
0fdf9fbe62 Merge branch 'staging' into jquery
Conflicts:
	seed/challenges/bootstrap.json
	seed/challenges/jquery.json
2015-08-12 02:06:03 -07:00
Quincy Larson
c3a2aa3870 manually add minor test improvement submitted by @ramadis 2015-08-12 01:21:25 -07:00
Quincy Larson
aeb5b40168 Merge branch 'staging' of https://github.com/MatiKid/freecodecamp into MatiKid-staging 2015-08-12 01:16:04 -07:00
Quincy Larson
f2356c6767 Merge branch 'staging' into jquery
Conflicts:
	seed/challenges/bootstrap.json
2015-08-10 22:03:51 -07:00
Berkeley Martinez
0420624d6a 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
a36fcdabdd 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
24e45d18ce add type to challenges 2015-08-07 23:37:32 -07:00
Berkeley Martinez
d31b53da2a rename top level title to name 2015-08-07 18:43:45 -07:00
ahstro
75919c63f3 Everything is horrible 2015-08-08 02:38:16 +02:00
Samuel Plumppu
85026d558e fixed tests to check for lowercase hexadecimal colors 2015-08-07 02:13:11 +02:00
ahstro
e0f1342a00 Grammatical error in 'Use Hex Code for Specific Colors' 2015-08-06 22:27:16 +02:00
ahstro
962ee6d7d5 Changed test order & added <code> in 'img to link' 2015-08-06 22:07:54 +02:00
Samuel Plumppu
e9ad1bad8d fixed typos 2015-08-06 21:31:24 +02:00
Quincy Larson
d838036ed2 add a span challenge and replace more old outside images with s3 images 2015-08-05 00:06:20 -07:00
Quincy Larson
78234c556b update cats to fetch from s3 2015-08-04 23:31:00 -07:00