Commit Graph

904 Commits (4e33b355b0e947b015cf8526e85a355b29b51388)

Author SHA1 Message Date
dokkillo 87c01aae52 issue 2270 2015-08-20 17:21:10 +02:00
dokkillo 1bdbec15c3 issue 2265 2015-08-20 17:05:50 +02:00
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
Kian Moretz 9cf0f80321 change div to button in Target an element by ID jQuery challenge - fix for issue #2309 2015-08-20 10:09:33 -04:00
Aniruddh Agarwal a49734f3c5 updated description of DNA Pairing bonfire 2015-08-20 22:03:53 +08:00
Manuel Alzadiq Romero 235b952ff0 change in basic bonfire Mutations
Added an expect to be falsein order to avoid passing with wrong code
2015-08-20 07:55:21 -05:00
Mark Surnin 23139ff45f Added a test for factorial(0) to be equal to 1. 2015-08-20 12:01:38 +05:00
Matt Trifilo 45bcd32c9c Edited Pull Request #2018
Escaped the double quotation marks on line 418.
2015-08-19 22:48:25 -05:00
dokkillo cd26a96757 issue #2238 2015-08-20 00:33:53 +02:00
benmcmahon100 74d79da1bf Merge pull request #2239 from dokkillo/dokkillo-2099
issue #2099
2015-08-19 23:24:23 +01:00
benmcmahon100 f1053a2f68 Merge pull request #2235 from dokkillo/dokkillo-2218
issue #2218
2015-08-19 23:14:09 +01:00
dokkillo 21d674b238 issue #2099 2015-08-20 00:13:06 +02:00
dokkillo 2d06e35afe issue #2218 2015-08-19 23:45:58 +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 b256d87565 Merge pull request #1939 from ayampol/ayampol-1928
Fixes #1928
2015-08-19 21:35:02 +01:00
benmcmahon100 576dcf1345 Merge pull request #1975 from AryanJ-NYC/AryanJ-NYC-1909
Fixed #1909 #1972
2015-08-19 21:31:16 +01:00
benmcmahon100 e05aab352d Merge pull request #1977 from AryanJ-NYC/AryanJ-NYC-1944
Fixed #1944
2015-08-19 21:30:58 +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 96b815281d Merge pull request #1984 from AryanJ-NYC/AryanJ-NYC-1980
Fixed #1980
2015-08-19 21:30:42 +01:00
benmcmahon100 c6cb1a0742 Merge pull request #1985 from AryanJ-NYC/AryanJ-NYC-1982
Fixed #1982
2015-08-19 21:30:25 +01:00
benmcmahon100 c3da5e9373 Merge pull request #1990 from AryanJ-NYC/AryanJ-NYC-1924
Fixes #1924
2015-08-19 21:30:17 +01:00
benmcmahon100 a5faffc082 Merge pull request #1995 from jbmartinez/jbmartinez-1833
Fixes #1833
2015-08-19 21:29:50 +01:00
benmcmahon100 e18c3547e3 Merge pull request #1998 from itxchy/patch-2
Issue: Grammar #1994
2015-08-19 21:29:25 +01:00
benmcmahon100 7f712ffca3 Merge pull request #2003 from michael-krebs/michael-krebs-1986
fix #1986
2015-08-19 21:28:13 +01:00
benmcmahon100 c8de9d63fb Merge pull request #2004 from michael-krebs/michael-krebs-1988
fix #1988
2015-08-19 21:27:54 +01:00
benmcmahon100 a2d48f8b60 Merge pull request #2006 from itxchy/patch-4
Fixed: Misspell #1877
2015-08-19 21:27:34 +01:00
benmcmahon100 29988d92a8 Merge pull request #2022 from michael-krebs/michael-krebs-2011
fix #2011
2015-08-19 21:26:20 +01:00
benmcmahon100 79b319bbc0 Merge pull request #2051 from Gornstats/patch-1
Fixed new waypoint description typo
2015-08-19 21:24:33 +01:00
benmcmahon100 502a255253 Merge pull request #2069 from AryanJ-NYC/AryanJ-NYC-2036
Fixes #2036
2015-08-19 21:24:24 +01:00
benmcmahon100 45f0de877a Merge pull request #2074 from jbmartinez/jbmartinez-2049
Fixed #2049
2015-08-19 21:23:05 +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
benmcmahon100 79e259a0e7 Merge pull request #2127 from ptsurbeleu/staging
fix issue #2124 and rephrase the challenge a bit to avoid confusion
2015-08-19 21:22:12 +01:00
benmcmahon100 1a2183d1d1 Merge pull request #2228 from dokkillo/dokkillo-2189
Dokkillo 2189
2015-08-19 21:17:40 +01:00
dokkillo 222df425ac issue #2189 2015-08-19 21:57:41 +02:00
dokkillo 72dd0f7723 issue #2118 2015-08-19 21:00:39 +02:00
dokkillo a2e3e4a476 issue #2133 2015-08-19 20:29:53 +02:00
benmcmahon100 ca80196412 Merge pull request #2213 from dokkillo/staging
issue #2191
2015-08-19 19:11:27 +01:00
dokkillo 933d1edeee issue #2191 2015-08-19 19:12:51 +02:00
benmcmahon100 e600972247 Merge pull request #2181 from souldreamer/patch-3
Fix for Issue #2175
2015-08-19 18:00:09 +01:00
dokkillo 6947937f0a issue 2173 2015-08-19 18:49:25 +02:00
Ionut Costica 8e705b14ec Fix for Issue #2179, #2141, #2077, #1999
Fixes #2179, #2141, #2077, #1999
2015-08-19 15:43:39 +03:00
Ionut Costica a519565edf Fix for Issue #2175
Fixes #2175
2015-08-19 15:08:57 +03:00
Quincy Larson 6651e6da98 add types to testing waypoints 2015-08-18 21:49:16 -07:00
Pavel Tsurbeleu 0df76dc7b7 fix issue #2124 and rephrase the challenge a bit to avoid confusion 2015-08-18 15:17:26 -07:00
Jakob Dahl 298bea5e35 update seed for Override Styles in Subsequent CSS 2015-08-18 23:46:09 +02:00
Quincy Larson 8fe8bd8692 add beginnings of react and d3 challenges 2015-08-18 10:57:38 -07:00
Juan Martínez 91795de83f Fixed #2049 2015-08-18 14:05:51 +00:00
Aryan Jabbari 1822a207d3 Fixes #2036 2015-08-18 09:34:34 -04:00
Jeremy Gorniak 13c5ad0af8 Fixed typo in waypoints #1 and #2 2015-08-18 21:35:10 +10:00
Jeremy Gorniak 972b24b76f Fixed new waypoint description typo
Small but important typo in challenge description for:
Object Oriented and Functional Programming section
Waypoint #1 - Declare JavaScript Objects as Variables
2015-08-18 21:27:19 +10: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
Quincy Larson c8c42b19b3 closes #1739 2015-08-17 23:44:43 -07:00
Michael Krebs d8347b3b7c fix #2011 2015-08-18 02:05:53 -04:00
Matt Trifilo 666a0a2cf3 Fixed: issue #2014
I changed "#button" to "button" in the example to target all buttons, and I changed the single quotes to double quotes in the description for consistency.
2015-08-18 00:43:28 -05:00
Matt Trifilo e06b348918 Fixed: Misspell #1877
Issue #1877's description's hint mentioned the wrong variable.
2015-08-17 23:29:11 -05:00
Michael Krebs 3e520811d0 fix #1988 2015-08-18 00:22:33 -04:00
Michael Krebs 817684de4e fix #1986 2015-08-18 00:17:56 -04:00
Matt Trifilo 9a828c9d3e Issue: Grammar #1994
Put in the proposed grammar changes from [this issue](https://github.com/FreeCodeCamp/FreeCodeCamp/issues/1994).
2015-08-17 23:01:52 -05:00
Juan Martínez da2f54a2bc Fixes #1833 2015-08-18 03:33:38 +00:00
Aryan Jabbari 5d54d98190 Fixes #1924 2015-08-17 22:54:08 -04:00
Aryan Jabbari b3875a3d6e Fixed #1982 2015-08-17 22:31:37 -04:00
Aryan Jabbari 0e43c46bff Fixed #1980 2015-08-17 22:29:35 -04:00
Aryan Jabbari fa31cdca0e Fixed #1944 2015-08-17 22:21:57 -04:00
Juan Martínez db1afbc87b Fixes #1970 (minor typo) 2015-08-18 02:20:24 +00:00
Aryan Jabbari 32eeefa439 Fixed #1909 #1972 2015-08-17 22:19:14 -04:00
Abhisek Pattnaik 2b080ec2b7 Problem Instruction clarrification
Replaced with correct instruction to the problem.
2015-08-18 04:17:24 +05:30
benmcmahon100 45ad2a7c20 Merge remote-tracking branch 'origin/staging' into staging 2015-08-17 22:57:36 +01:00
benmcmahon100 7c80d64d08 Fix #1942 2015-08-17 22:57:25 +01:00
ayampol 5034a92038 Fix <a target='_blank'></a> code tags
Changed &rt to &gt.
2015-08-17 16:49:19 -04:00
ayampol 8f0fba855e Update basic-ziplines.json
Add missing </code> around &lt;a target='_blank'&rt;</a>.
2015-08-17 16:43:43 -04:00
Aryan Jabbari 4d56972e21 Fixed #1926 2015-08-17 16:42:20 -04:00
Aryan Jabbari 0cab1ebfe5 Moved closing code to line 961 2015-08-17 16:34:45 -04:00
Aryan Jabbari 8722a0a294 Fixes #1878 2015-08-17 16:19:02 -04:00
benmcmahon100 7c360285aa Spaced out code a bit more on the shift challenge 2015-08-17 21:12:19 +01:00
benmcmahon100 0bbb5cf122 fixed the moved some comments in a seed that were causing confusion 2015-08-17 21:11:01 +01:00
benmcmahon100 f0f75eeae5 fixed the tests on a challenge 2015-08-17 21:09:40 +01: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
benmcmahon100 9727f3e520 Merge pull request #1812 from AryanJ-NYC/AryanJ-NYC-1807
Fixes #1807
2015-08-17 20:22:55 +01:00
benmcmahon100 f0fd811faf Merge pull request #1818 from michael-krebs/michael-krebs-935
fix #935
2015-08-17 20:22:44 +01:00
benmcmahon100 7f4aa5487f Fix #1895 2015-08-17 20:16:11 +01:00
benmcmahon100 b35c77deb7 Fix #1871 2015-08-17 20:11:04 +01:00
benmcmahon100 93a7fa1c34 Fix #1870 #1874 and there was another issue but i cant find it related to the arithmetic on decimals challenge 2015-08-17 20:08:21 +01:00
Quincy Larson bfabe09dad Fix case insensitivity to colors 2015-08-17 10:18:28 -07:00
Juan Martínez 2fade59319 Changed test case for Waypoint: target elements by id 2015-08-17 16:01:51 +00:00
benmcmahon100 4abddbbfe0 Merge pull request #1814 from AryanJ-NYC/AryanJ-NYC-1806
Fixed issue #1806
2015-08-17 15:18:34 +01:00
benmcmahon100 4b2a53f974 Merge pull request #1857 from AryanJ-NYC/AryanJ-NYC-1856
Fixes #1856
2015-08-17 14:53:40 +01:00
Aryan Jabbari 6cf25e6a35 Fixes #1856 2015-08-17 09:52:34 -04:00
benmcmahon100 4b05626ce3 fix #1847 2015-08-17 14:34:19 +01:00
benmcmahon100 d601240b98 Merge remote-tracking branch 'origin/staging' into staging 2015-08-17 14:28:54 +01:00
benmcmahon100 946717fc65 Fix #1838 2015-08-17 14:28:30 +01:00
benmcmahon100 06c3d78c64 Update basic-javascript.json 2015-08-17 14:16:16 +01:00
benmcmahon100 e63c387ef7 Merge pull request #1815 from AryanJ-NYC/AryanJ-NYC-1813
Fixed #1813
2015-08-17 14:15:37 +01:00
Aryan Jabbari d4b3b0c336 Fixed #1849 2015-08-17 09:12:04 -04:00
benmcmahon100 1ce1c75c4d Fix #1835 2015-08-17 14:11:49 +01: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 c523e59b24 Merge pull request #1811 from AryanJ-NYC/AryanJ-NYC-1801
Fixed issue #1801
2015-08-17 14:00:42 +01: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
Abhisek Pattnaik 6f7495e6cb Added additional test case 2015-08-17 18:27:33 +05:30
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 42b42fd6b0 Improve OOP challenges 2015-08-16 19:34:11 -07:00
Michael Krebs 1be07e73c1 fix #935 2015-08-16 20:59:17 -04:00
Aryan Jabbari fda754f187 Fixed #1813 2015-08-16 20:47:43 -04:00
Aryan Jabbari e4e13cf676 Fixed issue #1806 2015-08-16 20:38:49 -04:00
Aryan Jabbari 854406e5fa Fixes #1807 2015-08-16 20:14:12 -04:00
Aryan Jabbari ae4ec8e9fd Deleted extra comma 2015-08-16 20:08:37 -04:00
Aryan Jabbari 1790b14808 Fixes #1801 2015-08-16 20:06:47 -04:00
Juan Martínez b4afc3430a Fixed #1090 2015-08-16 21:11:36 +00:00
Abhisek Pattnaik 817276ab96 Added test cases for Bonfire: Where do I belong
Checks for proper positioning of element based on proper sorting order.
2015-08-17 02:18:27 +05:30
benmcmahon100 0fd90f4aaf Fix #1790 2015-08-16 21:06:42 +01:00
benmcmahon100 9c7b651827 Fixed a challenge test on modify array data with indexes 2015-08-16 20:17:06 +01:00
benmcmahon100 33d0faae24 Fixed a challenge test 2015-08-16 18:26:11 +01:00
Quincy Larson 63be84f47f fix some minor issues with oop challenges 2015-08-16 09:12:54 -07:00
Quincy Larson 33ae7b243c fix #1771 2015-08-16 08:10:40 -07:00
Quincy Larson b05d9338f4 update csp 2015-08-16 08:03:34 -07:00
Quincy Larson edb58f6890 add authentication back in 2015-08-16 05:47:13 -07:00
Quincy Larson 8534ae2639 improvements to OOP 2015-08-16 05:25:10 -07:00
Quincy Larson 1c7db6e7a3 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-16 04:06:09 -07:00
Quincy Larson bce3b34f9b improvements to javascript challenges 2015-08-16 04:05:15 -07:00
Berkeley Martinez db21489541 Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into staging 2015-08-16 03:45:32 -07:00
Berkeley Martinez 0908844e6d run only user/identity migration 2015-08-16 03:45:00 -07:00
Quincy Larson 1fbb2a32f8 fix nested array challenge 2015-08-15 15:56:56 -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
Quincy Larson c8f44d98bf resequence some challenges 2015-08-15 14:23:10 -07:00
Quincy Larson bc163bef38 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-15 14:13:29 -07:00
Berkeley Martinez 38ceeee635 Update intermediate-bonfires.json 2015-08-15 14:04:01 -07:00
Berkeley Martinez dee33beafc Merge pull request #1761 from rtperson/staging
Added improved instructions to Least Common Multiple Bonfire.
2015-08-15 14:02:21 -07:00
Berkeley Martinez 40dc5db1fe Merge pull request #1768 from issyl0/staging
Close a <code> tag so that only actual code is marked
2015-08-15 13:59:59 -07:00
Quincy Larson f2ee2e4031 update JavaScript challenges 2015-08-15 13:57:44 -07:00
Berkeley Martinez 2538a6c5fb Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into staging 2015-08-15 12:25:39 -07:00
Berkeley Martinez 13b38aefb5 add random attribute to user props
Allows easier random sampling
2015-08-15 12:19:36 -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 1dd0294a18 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-15 11:11:40 -07:00
Quincy Larson 98bf10a7d3 QA javascript challenges and remove slot machine for now 2015-08-15 11:11:25 -07:00
Berkeley Martinez 59609b655c migration improvements 2015-08-14 18:24:13 -07:00
Quincy Larson 40ab7d2911 more style improvements to front end challenges 2015-08-14 18:17:34 -07:00
Quincy Larson 2bbad67141 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-14 17:29:28 -07:00
Quincy Larson aed4b6bfe1 improvements to copy of text and test output 2015-08-14 17:26:24 -07:00
benmcmahon100 326c22276d Added a helper function to main.js for challenge making 2015-08-15 01:08:33 +01:00
Quincy Larson e6297de282 add semicolons to end of all tests in js-style challenges 2015-08-14 14:48:59 -07:00
Quincy Larson 3a81e6efb3 improve javascript challenge copy 2015-08-14 14:40:02 -07:00
Quincy Larson 338485db8e Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-14 13:50:31 -07:00
Quincy Larson 28e0ad29cf more improvements to javascript challenges 2015-08-14 13:50:20 -07:00
Roger Turnau 01d71ca1d9 Added improved instructions to Least Common Multiple Bonfire. 2015-08-14 16:29:16 -04:00
benmcmahon100 d0b5bcd0b0 Fixed a weird error involving RegEx and single quotes 2015-08-14 20:26:05 +01:00
benmcmahon100 8a9a8710da Allow optional white space when nesting arrays 2015-08-14 12:08:40 +01:00
Quincy Larson af3f6bb109 more improvements to javascript challenges 2015-08-14 01:13:07 -07:00
Abhisek Pattnaik 2acf8b727c Bonfire: Where art thou test case update
Added further test cases to check for adhering to the instructions in bonfire properly.
2015-08-14 12:31:58 +05:30
Quincy Larson 99e7116ee5 make additional improvements to JavaScript challenge copy 2015-08-13 23:44:13 -07:00
Quincy Larson f3cef6de46 finish jquery and start modifying javascript 2015-08-13 22:07:54 -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
Berkeley Martinez 12f2aa9957 Merge pull request #1748 from FreeCodeCamp/jquery
Improved challenges and normalized formating
2015-08-13 15:52:02 -07:00
Quincy Larson dc54e37df6 move json and ajax challenges to under construction directory 2015-08-13 15:49:38 -07:00
Berkeley Martinez 146f42ef41 lint json 2015-08-13 15:42:17 -07:00
Quincy Larson fea723efbd Merge branch 'staging' into jquery
Conflicts:
	seed/challenges/basic-javascript.json
	seed/challenges/object-oriented-and-functional-programming.json
2015-08-13 15:39:30 -07:00
Quincy Larson 3f05565739 use double quotes for all string literals in waypoints 2015-08-13 15:32:40 -07:00
Quincy Larson 0a8855fb11 Merge branch 'OOPF' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-13 14:36:41 -07:00
Quincy Larson 2711664505 Merge branch 'staging' into jquery
Conflicts:
	seed/challenges/basic-ziplines.json
	seed/challenges/jquery.json
2015-08-13 13:25:53 -07:00
benmcmahon100 095552dbbe Added a more specific example 2015-08-13 21:25:31 +01:00
Quincy Larson 4cdd0e20d9 start adding json challenges 2015-08-13 12:55:50 -07:00
benmcmahon100 299405694b Add some code highlighting 2015-08-13 17:36:02 +01:00
benmcmahon100 c0140a9510 Added some testing and debugging challenges 2015-08-13 17:33:23 +01:00
Quincy Larson 66bd9338ab remove inaccurate copy from jQuery challenge 2015-08-13 00:57:36 -07:00
Quincy Larson 1b7195fbc1 replace RSAP with read-search-ask and replace AWS gifs with Imgur 2015-08-13 00:56:05 -07:00
Quincy Larson bf2db5ff62 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-12 21:25:11 -07:00
Quincy Larson 99d0a58049 update the look of onboarding and change RSAP to RSA 2015-08-12 21:24:57 -07:00
Berkeley Martinez cc2e7a69f9 fix loopback migration to new auth scheme
closes #1735
2015-08-12 20:30:08 -07:00
Berkeley Martinez 49e9d078f1 fix angular.js typo
closes #1287
2015-08-12 20:05:06 -07:00
benmcmahon100 7ee6a8f888 Merge pull request #1741 from FreeCodeCamp/staging
Final update to OOPF before pr into staging
2015-08-13 00:24:41 +01:00
benmcmahon100 2b654ecd83 Removed the under construction flag 2015-08-13 00:21:52 +01:00
benmcmahon100 7c19d6c0ef First twelve OOP challenges ready to roll 2015-08-13 00:20:15 +01: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 7a2c2544a4 fix issue discovered by @reddraft 2015-08-12 02:00:24 -07:00
Quincy Larson 5c1b45da2e Fix issues discovered by @eaglecookie and @sonorangirl 2015-08-12 01:39:17 -07:00
Quincy Larson 84c76bcfd0 fix typo discovered by @pieterdeville 2015-08-12 01:35:27 -07:00
Quincy Larson 88b6b8a9d8 make @nickbarry's recommended get-set-for-ziplines copy fixes' 2015-08-12 01:32:16 -07:00
Quincy Larson 096eb0a67e Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-12 01:23:27 -07:00
Quincy Larson ae0175b396 Merge pull request #1643 from Greenheart/greenheart-1628
clarified description for waypoint: make images mobile responsive
2015-08-12 01:23:18 -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 2c623ad78a Merge pull request #1655 from ahstro/ahstro-1647
'Convert HTML Entities' now allows upper and lower case entities
2015-08-12 01:13:14 -07:00
Quincy Larson a9bea09cc9 make changes suggested by @ahstro 2015-08-12 01:11:56 -07:00
Quincy Larson 9e128e2787 manually apply pull requests submitted by @cristianvnica and @kurzninja 2015-08-12 01:04:46 -07:00
Quincy Larson 5830ac2f8a make all single quotes in jquery challenges double quotes 2015-08-12 00:52:40 -07:00
Quincy Larson 82e03b579c Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-11 23:54:15 -07:00
Quincy Larson e42e954517 fix omission in simon zipline 2015-08-11 23:53:30 -07:00
benmcmahon100 1dc66b7671 First four OOP challenges and the final slot machine challenge. 2015-08-12 00:11:56 +01:00
benmcmahon100 9df99eb635 Removed new incomplete JS Challenges and moved to OOPF branch. 2015-08-11 15:39:07 +01:00
benmcmahon100 bfcd36ff88 Merge pull request #1716 from sonorangirl/slot-machine-challenge
Slot machine challenge - Fixed Typos and 4th test
2015-08-11 13:43:00 +01:00
Berkeley Martinez 5f21db457d fix challenge ordering
Now challenges are ordered on map first by top order value of json file
second by index of array
2015-08-10 23:29:32 -07:00
Quincy Larson b4f5f1a81e get everything seeding again 2015-08-10 22:17:49 -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 34a06f987f Merge pull request #1512 from djordjelacmanovic/djordjelacmanovic-1511
fixed issue #1511 - now checking for words longer than 9 chars
2015-08-10 20:40:39 -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 f67b37ff7b Merge pull request #1616 from ahstro/ahstro-1451
Wrong element in 'Target HTML Elements with Selectors Using jQuery'
2015-08-10 20:21:59 -07:00
Quincy Larson 853c728d9c improve get-started view and fix duplicate bonfire issue 2015-08-10 20:13:13 -07:00
Quincy Larson 8ee3306bee Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into onboarding 2015-08-10 19:58:56 -07:00
sonorangirl fb44b50941 Made some spaces optional for 4th test 2015-08-10 19:32:52 -07:00
sonorangirl 8efe8ee825 Fixed RegEx so that 4th test would pass 2015-08-10 19:22:18 -07:00
Berkeley Martinez d37a1a1a08 Merge pull request #1671 from ahstro/ahstro-1402
Disregard order in 'Symmetric Difference'
2015-08-10 19:11:33 -07:00
Quincy Larson a557f386ed Merge branch 'staging' into onboarding 2015-08-10 18:30:34 -07:00
Quincy Larson 041ef43be3 Merge branch 'staging' into onboarding 2015-08-10 18:30:15 -07:00
sonorangirl 8a16942036 Fixed typos in 1st slot machine challenge 2015-08-10 18:05:07 -07:00
Berkeley Martinez 4b0e95280d fix duplicate id's 2015-08-10 17:40:45 -07:00
Berkeley Martinez 234aa0a5ea fix missing quote escape 2015-08-10 17:35:16 -07:00
Berkeley Martinez c550760b66 Merge pull request #1709 from martinkwan/patch-2
Updated DNA Pairing link
2015-08-10 16:39:13 -07:00
Berkeley Martinez 5b61f15d06 Merge pull request #1706 from kurzninja/patch-3
Fix for incorrect RGB test value
2015-08-10 16:27:15 -07:00
Berkeley Martinez 8f332039af Merge pull request #1697 from martinkwan/patch-1
Updated Pig Latin Link
2015-08-10 15:46:12 -07:00
Quincy Larson a44622af82 Merge branch 'staging' into onboarding 2015-08-10 15:42:07 -07:00
Martin Kwan 81af7a69e6 Updated DNA Pairing link
Updated link so it would open in a new tab instead of the current tab
2015-08-10 14:42:37 -07:00
Martin Kwan 737adf1fac Update intermediate-bonfires.json 2015-08-10 13:42:33 -07:00
Berkeley Martinez 8dabd39950 add to seed script: exit on error
filter challenge blocks that do not have challenges
2015-08-10 12:15:30 -07:00
Brett Guillory 133c91fd16 Fix for incorrect RGB test value
RGB test value was testing for (0,0,255) which is B, should be testing for (0, 255,0), which is green.
2015-08-10 13:20:18 -05:00
Martin Kwan 5c987cbe9a Updated Pig Latin Link
Updated link so it would open in a new tab instead of the current tab
2015-08-10 00:40:12 -07:00
Berkeley Martinez 129ec7c98e Merge pull request #1613 from ahstro/wrong-class
Updated test case comment in 'fluid containers'
2015-08-09 23:06:56 -07:00
Berkeley Martinez 1d724f145e Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into staging 2015-08-09 22:58:46 -07:00
Berkeley Martinez 967f92e6f4 fix challenge naming scheme 2015-08-09 22:46:44 -07:00
Berkeley Martinez 0c349f9763 Merge pull request #1675 from alanmbarr/alanmbarr-1375
Update bootstrap.json waypoint-line-up-form-elements-responsively-with-bootstrap typo
2015-08-09 22:46:09 -07:00
Berkeley Martinez a551c3ad57 Merge pull request #1692 from royshouvik/patch-1
Update basic-javascript.json to fix #1642
2015-08-09 22:41:58 -07:00
Quincy Larson 13f08bf037 Merge branch 'staging' into onboarding 2015-08-09 22:00:26 -07:00
Quincy Larson 4ed041c0db update curriculum structure again 2015-08-09 21:26:26 -07:00
Shouvik Roy 02717582d8 Update basic-javascript.json to fix #1642
Fixed following issues
#1639 : Fixed ```description``` to have "In JavaScript" instead of "in JavaScript" and added punctuation.
#1640 #1641 Added punctuation and fixed typo to have "perform mathematical functions" instead of "preform mathematical functions".
2015-08-10 07:32:57 +05:30
Quincy Larson e0bd8c6dd2 remove pair programming Bonfire warm up challenge 2015-08-09 17:03:49 -07:00
Isabell Long 76e4fc2d33 Fix typos in the Basic Javascript challenge
- Partially fixes #1519 - looks like some of those typos had already
  been fixed.
2015-08-09 19:32:10 +00:00
Berkeley Martinez 8d680b487d Merge pull request #1704 from ahstro/completion-monitor
Refactored CompletionMonitor() slightly
2015-08-10 11:30:14 -07:00
Berkeley Martinez 97b0ccac8f fix mising type
remove extra bonfire in title
2015-08-10 11:27:12 -07:00
ahstro 9513a8b0e5 Incorrect JSON caused error during seed 2015-08-10 20:11:59 +02:00
ahstro aec8680567 Refactored CompletionMonitor() slightly 2015-08-10 18:44:19 +02:00
Berkeley Martinez 2476f35309 add challenge order to individual challenge 2015-08-09 07:40:16 -07:00
alanmbarr 50db4b9aaa other typo
text input instead of area for clarity
2015-08-08 22:10:07 -07:00
alanmbarr 6d1ddc759d Update bootstrap.json 2015-08-08 21:59:03 -07:00
ahstro 9bed47a763 Disregard order in 'Symmetric Difference' #1402 2015-08-09 02:08:44 +02:00
Quincy Larson 5fb1df0d55 start onboarding page 2015-08-08 16:13:23 -07:00
benmcmahon100 f22672e6c1 Removed new incomplete JS Challenges and moved to OOPF branch. 2015-08-08 17:21:13 +01:00
benmcmahon100 0f81e8465a Update to include OOP & functional programming course layout 2015-08-08 17:11:11 +01:00
Berkeley Martinez b1e34f8cc8 create name/dashName at seed 2015-08-08 07:50:35 -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 c5fb8c83f5 Added even more HTML entities and removed &APOS; 2015-08-08 03:43:14 +02:00
ahstro 9d6c5e63ab 'Convert HTML Entities' now allows upper and lower case entities #1647 2015-08-08 03:29:23 +02:00
ahstro e7c8589d08 Everything is horrible 2015-08-08 02:38:16 +02:00
Berkeley Martinez e1fb3856c4 Merge pull request #1637 from Greenheart/staging
fixed small typo
2015-08-07 09:01:44 -07:00
Shouvik Roy 8ff778b358 Fix for #1644
Change challenge description of "Bonfire: Where art thou", to fix issue #1644. Changed description to say "an array" instead of "a list" to make it clear and less confusing.
2015-08-07 21:04:20 +05:30
Samuel Plumppu 93083eb1c9 clarified description for waypoint: make images mobile responsive 2015-08-07 17:03:29 +02:00
Samuel Plumppu 805327ebac fixed small typo 2015-08-07 14:53:24 +02:00
Quincy Larson 350d59a235 revamp onboarding challenges to reflect changes to curriculum and wiki 2015-08-07 00:18:30 -07:00
Quincy Larson c5ad1ad851 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-06 23:19:18 -07:00
Quincy Larson 629eaa6ef9 restructure curriculum to split jQuery and Ajax into seperate sections 2015-08-06 23:19:05 -07:00
Samuel Plumppu 344b729bce fixed tests to check for lowercase hexadecimal colors 2015-08-07 02:13:11 +02:00
ahstro 42321f5cef Wrong element in jQuery targeting waypoint 2015-08-06 22:41:49 +02:00
Samuel Plumppu 3b14872cbe updated instructions for waypoint: get set for ziplines to fit with new Codepen UI 2015-08-06 22:30:46 +02:00
ahstro fb2599b8fe Grammatical error in 'Use Hex Code for Specific Colors' 2015-08-06 22:27:16 +02:00
ahstro b2d714112f Updated test case comment in 'fluid containers' 2015-08-06 22:23:00 +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
Samuel Plumppu 4349d06d16 fixed typos 2015-08-06 20:45:59 +02:00
Dealga McArdle 0993261ebc sputkin -> sputnik 2015-08-06 16:02:20 +02:00
benmcmahon100 e68bc0272d Fix https://github.com/FreeCodeCamp/freecodecamp/issues/1593 2015-08-06 14:54:44 +01:00
benmcmahon100 5eb9c060e1 Fix https://github.com/FreeCodeCamp/freecodecamp/issues/1599 2015-08-06 14:51:26 +01:00
Quincy Larson 61507f575d fix some issues that were breaking seed task 2015-08-06 02:27:56 -07:00
Quincy Larson dfb48fbdad update dashed name 2015-08-06 02:26:09 -07:00
Quincy Larson 2e0e7d5a74 rename all of Ben's JavaScript challenges to be more in line with other waypoints 2015-08-06 02:06:53 -07:00
Quincy Larson e8a3f3ef04 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-06 01:44:37 -07:00
Quincy Larson 89fffce02d add simon zipline 2015-08-06 01:44:31 -07:00
Berkeley Martinez 8b8d9cab51 Merge pull request #1594 from martinkwan/patch-1
Updated Roman Numeral Challenge link
2015-08-06 00:58:24 -07:00
Berkeley Martinez eeffb7f706 Merge pull request #1595 from flota113/flota113-1585
Fixed a few typos in javascript-basic
2015-08-06 00:57:56 -07:00
Berkeley Martinez 47403e204c Merge pull request #1592 from cristianvnica/cristianvnica-1488
Fixing issue #1488
2015-08-06 00:57:06 -07:00
Marcin Flotyński 5882b9b84f Fixed a few typos in javascript-basic 2015-08-06 09:03:03 +02:00
Martin Kwan 3b94475f9d Updated Roman Numeral Challenge link
Updated link so it would open in a new tab instead of the current tab.
2015-08-06 00:02:15 -07:00
Cristian V. Nica f33ac57984 Fixing issue #1488
Correcting small mistakes in the waypoint instruction.
2015-08-06 09:30:13 +03:00
benmcmahon100 7d04da6c60 Merge pull request #1584 from flota113/flota113-1579
Fixed tests in Waypoint: Use Comments to Clarify Code
2015-08-06 00:21:59 +01:00
Marcin Flotyński c577190e67 Fixed tests
Added check if the object isn't null and escaped quotes because text
enclosed apostrophe
2015-08-06 00:57:55 +02:00
Marcin Flotyński 073456e0de changed to agree with the style -
greater than 0 instead of greater than or eqal to 1
2015-08-06 00:25:11 +02:00
Marcin Flotyński c6b2140c02 first fixes - length larger _or equal_ to 1
I'm not sure if the tests are too vague - they allow to comment out way
more than just the text specified - like the whole page..
2015-08-06 00:20:52 +02:00
Marcin Flotyński 36f66c1262 Fixed tests in waypoint
changes col-xs-12 to col-xs-6 so the tests works
Issue #1578
2015-08-05 23:53:45 +02:00
Rafael J. Rodriguez 43a1a62536 Fix for Issue #1540 2015-08-05 17:34:06 -04:00
benmcmahon100 117306de33 Merge pull request #1576 from cristianvnica/cristianvnica-1575
Fixing #1575
2015-08-05 21:24:05 +01:00
Cristian V. Nica caef8c9da8 Fixing #1575
Fixing small typo
2015-08-05 23:22:37 +03:00
benmcmahon100 145cb422e2 Merge pull request #1573 from Greenheart/staging
added test for object for steamroller bonfire
2015-08-05 21:22:12 +01:00
Berkeley Martinez 3cfd69c704 add loopbackMigrationGrandfathered flag 2015-08-05 13:01:48 -07:00
benmcmahon100 974bf503ec Merge pull request #1572 from cristianvnica/cristianvnica-1571
Trying to fix: #1571
2015-08-05 20:43:17 +01:00
Samuel Plumppu 27cff0becf added test for object for steamroller bonfire 2015-08-05 21:37:04 +02:00
Quincy Larson 40cdf76035 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-05 11:58:09 -07:00
Quincy Larson 01e408d48c new final-ish curriculum structure 2015-08-05 11:57:58 -07:00
Cristian V. Nica 5ff371fc6f Trying to fix: #1571
I have found a small typo on challenge: An Array Of new Information
2015-08-05 21:55:25 +03:00
Berkeley Martinez 71ca6b1b5b mark if user is github cool during migration 2015-08-05 11:22:58 -07:00
Berkeley Martinez f656311b3e remove comments from migration 2015-08-05 11:22:58 -07:00
benmcmahon100 f68c6d0fa3 Changed the object lessons to use dot notation instead of bracket
Fix https://github.com/FreeCodeCamp/freecodecamp/issues/1564
2015-08-05 17:31:42 +01:00
benmcmahon100 e7cac3ccf9 fix https://github.com/FreeCodeCamp/freecodecamp/issues/1559 2015-08-05 16:54:57 +01:00
benmcmahon100 4ff54006d3 Merge remote-tracking branch 'origin/staging' into staging 2015-08-05 15:39:18 +01:00
benmcmahon100 ceed3c4877 Fix some typos 2015-08-05 15:38:54 +01: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
Quincy Larson 932bc0ab65 continue working on jquery challenges 2015-08-04 23:24:26 -07:00
Berkeley Martinez c9e0184387 Merge pull request #1508 from flota113/flota113-1502
Small Fix of Bootstrap waypoint challenge - Issue 1502
2015-08-04 12:35:08 -07:00
Berkeley Martinez 00a9cfdf48 Merge pull request #1517 from ngalluzzo/fix-class-typo
Typo on 'Responsive Design with Bootstrap'
2015-08-04 12:34:47 -07:00
Ben ecacbc6233 Update bootstrap.json
fixed typo (misspelled 'container')
2015-08-04 14:03:19 -05:00
Nic Galluzzo ad46b72bd0 Update bootstrap.json 2015-08-04 08:54:21 -07:00
Djordje Lacmanović a3e5005058 fixed issue #1511 - now checking for words longer than 9 chars
closes #1511
2015-08-04 16:51:10 +02:00
Marcin Flotyński dbf8443430 Small Fix of Bootstrap waypoint challenge - Issue 1502
Changed second check for second class - 'btn-default'
2015-08-04 15:00:22 +02:00
benmcmahon100 fc0ccf3aea Fixed typos in magical maths waypoints and restored server.js to a previous working state 2015-08-04 13:28:41 +01:00
Quincy Larson aa10e1ff69 quick sweep to make sure all tests run properly 2015-08-03 23:03:12 -07:00
Quincy Larson eb8b9df5ad Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-03 21:17:55 -07:00
benmcmahon100 e6f14fc25f Merge remote-tracking branch 'origin/staging' into staging 2015-08-04 00:53:34 +01:00
benmcmahon100 aa906f81c3 fix https://github.com/FreeCodeCamp/freecodecamp/issues/1450 missing semi-colon and assert( 2015-08-04 00:53:20 +01:00
Berkeley Martinez 4c94bf7fcd Merge pull request #1231 from ahstro/lumenteun-410
Improved consitency in 'Friendly Date Ranges' test cases.
2015-08-03 16:04:37 -07:00
Berkeley Martinez 2f1d9c4826 Merge pull request #1197 from 1hella/1hella-1156
Fix typos in Bonfire: Friendly Date Ranges #1156
2015-08-03 16:02:50 -07:00
Djordje Lacmanović c9db4191c2 fixed a typo as per issue 1473 2015-08-04 00:39:11 +02:00
benmcmahon100 6c0049803d Fixed two typos and fixed a no tests tun error 2015-08-03 20:43:23 +01:00
benmcmahon100 4be714aa97 Generalised RegEx for waypoint-make-it-functional fix https://github.com/FreeCodeCamp/freecodecamp/issues/1476 added comment to show where to block exploits in jsframework 2015-08-03 18:02:26 +01:00
benmcmahon100 c9c2a74461 Hardened The check-the-length-property-of-a-string-variable challenge to make it hard to get no tests run 2015-08-03 17:01:27 +01:00
benmcmahon100 43bba0744a Fixed route on waypoint-label-bootstrap-wells and the tests. Fixed the test messages on waypoint-give-each-element-a-unique-id 2015-08-03 16:42:26 +01:00
Quincy Larson dfa45edb7c Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-02 19:06:32 -07:00
Quincy Larson 686017006b fix minor grammar issue in javascript challenges 2015-08-02 19:06:25 -07:00
benmcmahon100 a879441c77 Two of the tests were inverted 2015-08-02 22:09:36 +01:00
benmcmahon100 c8f2b4a571 Allows users to add values to the inner arrays 2015-08-02 21:24:13 +01:00
benmcmahon100 b7324b4155 Fixed the fact it was myDecimal instead of myFloat 2015-08-02 21:15:39 +01: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
Jose M Viloria dcbb753b71 Typo in Waypoint #38
Deleted extra semicolon.
2015-08-01 16:39:38 -07:00
Berkeley Martinez ca26efa4fb Merge branch 'Sazumo-1248' of https://github.com/Sazumo/freecodecamp into Sazumo-Sazumo-1248 2015-08-01 16:12:08 -07:00
Quincy Larson 21cc71ab24 add help room to chat room challenge, thanks to SaintPeter's suggestion 2015-08-01 12:36:42 -07:00
Quincy Larson a5b1d23a3c Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-01 12:16:14 -07:00
Quincy Larson 44007c9643 implement ckylee additional test to everything be true bonfire #1397 2015-08-01 12:14:25 -07:00
Quincy Larson cc890d017a Merge pull request #1399 from biellls/patch-1
Change order of subarrays to cover all cases
2015-08-01 11:53:47 -07:00
Quincy Larson 2b9c89eccc fixed tcyrus broken pull request and also extend its methodology to another challenge 2015-08-01 11:45:59 -07:00
Quincy Larson 942e26fed5 Merge branch 'staging' of https://github.com/tcyrus/freecodecamp into tcyrus-staging 2015-08-01 11:30:22 -07:00
Quincy Larson 61a8a54682 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-01 11:29:54 -07:00
Quincy Larson 5937ceaec7 Merge pull request #1432 from SaintPeter/sorted_union_bonfire
Added additional tests to Sorted Union Bonfire
2015-08-01 11:27:45 -07:00
benmcmahon100 fd0307ffcf Added extra regex moving on to fix scroller without those new images 2015-08-01 19:13:37 +01:00
benmcmahon100 7443236912 Added extra regex moving on to fix scroller without those new images 2015-08-01 19:12:44 +01:00
Quincy Larson 596f8f660a Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-01 08:26:07 -07:00
Quincy Larson 1e2011a354 fix some issues and finalize jquery challenges for today 2015-08-01 08:25:56 -07:00
benmcmahon100 f6564884a2 All done without extra regex 2015-08-01 16:11:57 +01:00
benmcmahon100 8f47390b79 Merge remote-tracking branch 'origin/staging' into staging 2015-08-01 16:10:58 +01:00
benmcmahon100 9370561579 All done without the extra regex 2015-08-01 16:10:21 +01:00
Quincy Larson 57592545d9 add two more jquery challenges 2015-08-01 07:11:11 -07:00
Quincy Larson feab8b508e remove field guide cruft and update all field guide links to wiki 2015-07-31 21:55:49 -07:00
Quincy Larson fd68501e16 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-07-31 21:13:46 -07:00
Quincy Larson 439849e9d8 start removing field guide and update nonprofits 2015-07-31 21:13:40 -07:00
Berkeley Martinez 646fa1cbac remove mention of comments from zipline
update hot stories api uri
2015-07-31 20:10:30 -07:00
SaintPeter 99304b3a04 Added additional tests to Sorted Union Bonfire 2015-07-31 18:04:06 -07:00
benmcmahon100 d52525f1f4 Non-tested slot machine challenges. Leaving out one challenge as it will require slot machine images to be created and hosted in a static location 2015-08-01 00:47:39 +01:00
Quincy Larson ae38aab8cc fix issue with codemirror framework and script tag rendering 2015-07-31 16:38:12 -07:00
Quincy Larson 2ccd6e3ee3 fix html view instruction column 2015-07-31 14:36:00 -07:00
Quincy Larson 2547868854 fix storage and reset functionality for js and html challenge views 2015-07-31 13:37:06 -07:00
benmcmahon100 4b47e5282c Non-tested slot machine challenges. Leaving out one challenge as it will require slot machine images to be created and hosted in a static location 2015-07-31 19:56:11 +01:00
benmcmahon100 74d938b3af Merge remote-tracking branch 'origin/staging' into staging 2015-07-31 19:54:00 +01:00
benmcmahon100 dd9984fc2d Non-tested slot machine challenges. Leaving out one challenge as it will require slot machine images to be created and hosted in a static location 2015-07-31 19:53:21 +01:00
Quincy Larson 051a7bb287 add new jquery challenges and resequence other challenges 2015-07-30 22:40:17 -07:00
Quincy Larson 62897b8a51 add removal and clone jquery challenges 2015-07-30 18:31:40 -07:00
Quincy Larson 1d7fc8589c add .remove() challenge 2015-07-30 18:12:29 -07:00
Quincy Larson d4d4124158 add a removeClass challenge 2015-07-30 18:05:02 -07:00
Quincy Larson 1fa0c48257 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-07-30 17:31:53 -07:00
Quincy Larson 489f52180b add two new jquery challenges 2015-07-30 17:31:47 -07:00
benmcmahon100 972ae79b22 Ready JavaScript Curriculum 2015-07-31 00:22:56 +01:00
Quincy Larson 482f16893c Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-07-30 15:51:38 -07:00
benmcmahon100 b9adf97a91 Ready JavaScript Curriculum 2015-07-30 23:46:47 +01:00
Quincy Larson 60105a9fe7 finish drafting copy and tests for bootstrap section 2015-07-30 15:45:54 -07:00
benmcmahon100 d588263658 Extra comma was breaking node seed 2015-07-30 21:54:33 +01:00
Quincy Larson 448daf1fa4 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-07-30 13:01:57 -07:00
Quincy Larson 35761f6316 fix some minor issues with bootstrap challenges 2015-07-30 13:01:46 -07:00
benmcmahon100 1e412b1498 Ready JavaScript Curriculum 2015-07-30 20:58:02 +01:00
Quincy Larson 14368f6471 add container-fluid divs to all bootstrap waypoints 2015-07-30 12:20:34 -07:00
Quincy Larson fc7af46e0c finish color tutorial 2015-07-29 23:21:44 -07:00
Quincy Larson 549ab1bd0e start work on RGB section 2015-07-29 00:33:17 -07:00
Quincy Larson 5fd95c584c Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
Conflicts:
	seed/challenges/basic-javascript.json
2015-07-28 23:11:00 -07:00
Quincy Larson 2d009777b3 add ID related challenges 2015-07-28 18:51:39 -07:00
Quincy Larson fd3374fca7 about to start priority and !important waypoints 2015-07-28 17:11:51 -07:00
TCYRUS e67d843f48 Fix Issue #1015
Fix two of the tests in "Waypoint: Create an Ordered List"
2015-07-28 13:17:05 -04:00
biellls 19c2408348 Change order of subarrays to cover all cases
Since in all tests each subarray has a larger max than the previous subarray, if the user does not reset max for each subarray, the tests still pass.
2015-07-27 20:37:39 +02:00
Berkeley Martinez 9bc14d24a4 Display contact information for job and size thumbnail 2015-07-26 07:57:14 -07:00
Berkeley Martinez f547ce32f7 update jobs model and jobs seed 2015-07-25 21:59:52 -07:00
Berkeley Martinez 4792485ac4 show jobs route up 2015-07-25 21:32:18 -07:00
Berkeley Martinez fe51774814 Fix dup id's in basic javascript 2015-07-25 20:22:13 -07:00
Quincy Larson 37d5efed4e Merge branch 'staging' into js-curriculum
Conflicts:
	seed/challenges/basic-javascript.json
2015-07-24 16:08:45 -07:00
Quincy Larson ea26455c4c Merge branch 'js-curriculum' of https://github.com/benmcmahon100/freecodecamp into benmcmahon100-js-curriculum
Conflicts:
	seed/challenges/basic-javascript.json
2015-07-24 15:59:37 -07:00
Quincy Larson 890bd8cd9c additional refactor of HTML challenges 2015-07-23 22:24:51 -07:00
Quincy Larson efa5d769c2 QA first dozen html challenges 2015-07-23 18:44:16 -07:00
benmcmahon100 a24ef288b4 Ready Js Curriculum
Added Regex, Random Numbers and If else Challenges
2015-07-24 00:38:13 +01:00
Berkeley Martinez 01c72656c8 fix 'id' not _id.
fix spacing after semi colon
2015-07-23 16:14:45 -07:00
Quincy Larson 3dfeaadba0 update zipline copy with CodePen override warning 2015-07-23 16:03:51 -07:00
Berkeley Martinez 47901a9b0a add missing false in hikes challenge 2015-07-23 16:03:49 -07:00
Quincy Larson ac5e31596d add transcript for missing hike 2015-07-23 16:03:49 -07:00
Berkeley Martinez a4c4eb1493 fix type hike not hikes 2015-07-23 16:03:47 -07:00
Berkeley Martinez 3df60136e8 add title field to challenges 2015-07-23 16:03:46 -07:00
Quincy Larson 8f738fb1d0 add videos to new challenges 2015-07-23 16:03:46 -07:00
Quincy Larson 83654fb86a finish adding the nodeschool challenges 2015-07-23 16:03:46 -07:00
Quincy Larson 8b78d6e9ca update basejump demo urls 2015-07-23 16:03:46 -07:00
Quincy Larson 99b99dc1a7 finish scripts and overall structure for new curriculum 2015-07-23 16:03:46 -07:00