Commit Graph

414 Commits (c5d07b9e051b4856b5eb67db905a807c29a95413)

Author SHA1 Message Date
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
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 98bf10a7d3 QA javascript challenges and remove slot machine for now 2015-08-15 11:11:25 -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
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 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
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
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 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 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
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