Commit Graph

3166 Commits

Author SHA1 Message Date
bca88b78f1 Update README.md 2015-05-27 22:15:30 -04:00
79b20d9798 Update copy for uncomment html. Fix iframe view covering up button in narrow width. Make iframe fixed so it's viewable as code editor expands and people scroll down. closes #596, closes #655 2015-05-27 15:15:28 -04:00
6996467c72 Merge branch 'staging' of http://github.com/FreeCodeCamp/freecodecamp into staging 2015-05-27 15:04:20 -04:00
d67bfda098 Merge pull request #657 from benmcmahon100/patch-10
Provisional fix to issue #655
2015-05-27 15:04:01 -04:00
5a1588f8b3 Provisional fix to issue #655
Needs testing
2015-05-27 19:51:06 +01:00
6a2d365b9a Update framework version, set cursor to line 15 on load to force full display. Closes #653 2015-05-27 14:40:06 -04:00
a85951505b Typo fix, closes #654 2015-05-27 14:32:56 -04:00
774913391d Syntax error fix, closes #585 2015-05-27 14:07:36 -04:00
cad39e1b5e Fixes duplication bug in Firefox 2015-05-27 13:39:37 -04:00
153735de79 Merge branch 'staging' of http://github.com/FreeCodeCamp/freecodecamp into staging 2015-05-27 13:31:17 -04:00
73709c615c Merge pull request #560 from therahl/theRahl-477
improved tests for chunky monkey bonfire
2015-05-27 13:30:34 -04:00
2b2a238b84 Merge pull request #620 from dougtslug/dougtslug-grammar
very minor grammatical error fixed
2015-05-27 13:29:39 -04:00
598a4abd1a Merge pull request #623 from dougtslug/dougtslug-569
Issue #569 fix, tests added.
2015-05-27 13:28:41 -04:00
81b51abea0 Merge pull request #641 from benmcmahon100/patch-7
Fix to issue #633 and a hand full of the other issues related to the challenge
2015-05-27 13:27:49 -04:00
dd2e2683c6 Merge pull request #647 from dougtslug/dougtslug-645
Fix for issue #645.
2015-05-27 13:26:48 -04:00
26737c2740 Update wording and test, closes #629 2015-05-27 13:23:23 -04:00
5bbc0acc16 Fix for issue #645. Small grammatical error 2015-05-28 01:09:52 +08:00
33308e0571 Updated tests to verify placeholder text in use html 5 to require waypoint and closes #643 2015-05-27 12:32:31 -04:00
c90e00bdeb Fix to issue #633
More tests added to match description
2015-05-27 16:51:41 +01:00
b76cc9ea22 Add link to image to bootstrap site to show grid in more detail, closes #622 2015-05-27 11:40:48 -04:00
63fae51651 Update instructions and test output for line up form elements waypoint, closes #621 2015-05-27 11:22:36 -04:00
c4817d6302 Update copy for pair programming challenge to tell users to advance the challenge to begin bonfires, closes #616 2015-05-27 10:44:42 -04:00
b89c5d07a7 Add test to check text of button, closes #608 2015-05-27 10:27:30 -04:00
39d364e112 Specifies which class to give padding to. Closes #602 2015-05-27 10:11:33 -04:00
d40fbfa7e7 Rename "date" to "data" in add a submit button waypoint. closes #611 2015-05-27 09:51:31 -04:00
de2ad65bfa Add on to fixed copy by extending test to check for "cat photos". Fixes #598 2015-05-27 09:45:14 -04:00
8723c4c299 Adds "be" to the tests for comment html challenge. Closes #593 2015-05-27 09:30:47 -04:00
e5e2dec017 Issue 569 fix, tests added. 2015-05-27 15:26:04 +08:00
02e5ada304 very minor grammatical error fixed 2015-05-27 14:03:06 +08:00
87e2697b93 fix #577 2015-05-26 19:22:40 -07:00
eaf0c738a7 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp 2015-05-26 19:12:06 -07:00
3eff07345e Merge pull request #592 from LumenTeun/grammar
Minor grammatical error
2015-05-26 19:11:50 -07:00
843681d3bb fixes #568 2015-05-26 18:57:47 -07:00
e34d920ee7 closes #588 2015-05-26 18:42:51 -07:00
011625d926 Minor grammatical error 2015-05-27 02:51:08 +02:00
f81f22b108 fix 591 2015-05-26 17:37:21 -07:00
81fb739794 Merge branch 'master' of github.com:FreeCodeCamp/freecodecamp 2015-05-26 15:25:38 -07:00
4153bc58c6 update the cities and fix #553 2015-05-26 15:25:21 -07:00
dd9e4e03c4 Merge branch 'master' of http://github.com/FreeCodeCamp/freecodecamp 2015-05-26 16:33:14 -04:00
8a737a992e update firefox instructions 2015-05-26 13:31:34 -07:00
b92f392908 Fix typo add backslash to info on change color of text info
closes #563
2015-05-26 13:28:59 -07:00
0bade642a9 fix some aspects of zipline/basejump submission 2015-05-26 13:09:07 -07:00
0365a6590a improved tests for chunky monkey bonfire 2015-05-26 12:47:13 -07:00
33b98f4054 Merge branch 'master' of http://github.com/FreeCodeCamp/freecodecamp 2015-05-26 15:18:41 -04:00
885dd7e5e6 temporary fix for firefox duplication causing false completion 2015-05-26 15:18:26 -04:00
697fff79d5 Merge branch 'master' of github.com:FreeCodeCamp/freecodecamp
Conflicts:
	seed_data/challenges/basic-html5-and-css.json
2015-05-26 11:44:45 -07:00
7d9ffbaa65 closes #509 2015-05-26 11:44:00 -07:00
c078702da4 fixes #492 2015-05-26 11:25:33 -07:00
40837abeaa Fix conflicts 2015-05-26 13:37:00 -04:00
15817591d4 Closes #493 2015-05-26 13:33:50 -04:00