Commit Graph

3230 Commits

Author SHA1 Message Date
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
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
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
7729f20729 update meta tags 2015-05-29 17:52:05 -07: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
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
1c76a104db Merge branch 'master' of github.com:FreeCodeCamp/freecodecamp 2015-05-28 17:24:00 -07:00
7e08f9d8f5 update videos 2015-05-28 17:22:45 -07:00
a9d8992b88 fix if else syntax in Jade and add cities 2015-05-28 16:59:25 -07:00
dbf265bd22 Merge branch 'master' into staging 2015-05-28 19:53:27 -04:00
193f9d16db Set a refresh on codemirror instance rather than setting the cursor position. Closes #640 2015-05-28 19:51:42 -04:00
560e66527b add jobs 2015-05-28 16:40:22 -07:00
8501de396f finish fixing modals 2015-05-28 16:18:04 -07:00
673a617151 create pair, help, bug modals 2015-05-28 14:29:45 -07:00
28f1efaab1 Merge branch 'master' into staging 2015-05-28 14:14:05 -04:00
72505915f8 Merge branch 'staging' of http://github.com/FreeCodeCamp/freecodecamp into staging 2015-05-28 14:13:56 -04:00
131b9ad1b7 bump version numbers to force fresh browser fetch and suppress "editor is not defined". closes # 2015-05-28 14:13:31 -04:00
5d71b87027 fix another typo in html curriculum 2015-05-28 10:32:59 -07:00
e7b9a90fbe add back omitted cities - sorry everyone! 2015-05-28 10:24:49 -07:00
29fec57af4 Merge branch 'master' of github.com:FreeCodeCamp/freecodecamp 2015-05-28 10:07:26 -07:00
cb4c572591 remove slashes from BR tags and correct Spanish sentence 2015-05-28 10:07:03 -07:00
167305031f Update show.jade
Typo
2015-05-28 08:58:01 -07:00
731cd57e8e closes #702 2015-05-28 11:32:41 -04:00
aa6ae15d40 Fixes typo, closed #700 2015-05-28 11:21:18 -04:00
8633315e74 Fixes test, closes #699 2015-05-28 11:13:42 -04:00
625167baf3 Unifies styling in instructions, closes #638 2015-05-28 11:02:41 -04:00
94a303b42b Betters tests for borders challenge, closes #572. 2015-05-28 09:49:09 -04:00
08cdc10363 Updates test hint display, closes #673 2015-05-28 09:18:46 -04:00
894428f6e2 Matches test output hint to instructions for link to external pages challenge, closes #677 2015-05-28 09:13:28 -04:00
3fbf84cf21 Ensures a button has been fully declared, fixes #683 2015-05-28 09:08:44 -04:00
14ff6d5306 Fix typo in waypoint name responsively style radio buttons, closes #667 2015-05-28 08:34:22 -04:00
c61a95eae5 Consistent use of <code>img</code> in add borders challenge, closes #670 2015-05-28 08:32:27 -04:00
5fd4ce0030 Fix typo in import a font family, closes # 698 2015-05-28 08:29:35 -04:00
718ae04f2f Add ability to test editor contents. Ensures classes are implemented, closes # 684 2015-05-28 08:26:25 -04:00
f6cebdea27 Tests correct <a> tag for presence of href attribute set to '#', closes # 686 2015-05-28 07:20:50 -04:00
119060dc3f Reorder tests to display in clockwise notation, fixes typos in tests to match condition, closes #665 2015-05-28 07:07:18 -04:00
8f7eea116a Prevents incorrect solution to Mutations bonfire 2015-05-28 12:59:25 +02:00
268f585050 References correct expressworks challenges, closes #692 2015-05-28 06:59:11 -04:00
e3fff3808e Linkifies image in custom heading challenge, closes #693 2015-05-28 06:55:03 -04:00
4dcaac8bc5 Specifies to add a solid border, closes #694 2015-05-28 06:51:17 -04:00