greatbody
/
freeCodeCamp
mirror of https://github.com/freeCodeCamp/freeCodeCamp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
3,586 Commits
3 Branches
0 Tags
959 MiB
Commit Graph

3586 Commits (698eeb33e3fa6f4cd88bdcb74a7897819a7484d8)

Author SHA1 Message Date
benmcmahon100 4349a5cf6e First twelve OOP challenges ready to roll 2015-08-13 00:20:15 +01: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 760fa4e360 fix issue discovered by @reddraft 2015-08-12 02:00:24 -07:00
Quincy Larson 5e5c3c32e1 Fix issues discovered by @eaglecookie and @sonorangirl 2015-08-12 01:39:17 -07:00
Quincy Larson f673a1f707 fix typo discovered by @pieterdeville 2015-08-12 01:35:27 -07:00
Quincy Larson f1b2c57bea make @nickbarry's recommended get-set-for-ziplines copy fixes' 2015-08-12 01:32:16 -07:00
Quincy Larson 0458cbeea3 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-12 01:23:27 -07:00
Quincy Larson 011d1fe903 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 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 51227f2d34 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 2941bcd5ea make changes suggested by @ahstro 2015-08-12 01:11:56 -07:00
Quincy Larson 9ff8440d1d Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 
Conflicts:
	seed/challenges/jquery-ajax-and-json.json
 2015-08-12 01:06:03 -07:00
Quincy Larson 3603531208 manually apply pull requests submitted by @cristianvnica and @kurzninja 2015-08-12 01:04:46 -07:00
Quincy Larson b87f8f0234 Merge pull request #1617 from ahstro/target-elements 
Improves 'Target Elements by ID Using jQuery'
 2015-08-12 00:55:20 -07:00
Quincy Larson 78441a49d4 make all single quotes in jquery challenges double quotes 2015-08-12 00:52:40 -07:00
Quincy Larson 848d6b8cfc Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-11 23:54:15 -07:00
Quincy Larson d18c819ebd fix omission in simon zipline 2015-08-11 23:53:30 -07:00
benmcmahon100 05afe79320 First four OOP challenges and the final slot machine challenge. 2015-08-12 00:11:56 +01:00
benmcmahon100 1827857eed Removed new incomplete JS Challenges and moved to OOPF branch. 2015-08-11 15:39:07 +01:00
benmcmahon100 928afe9915 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
benmcmahon100 9f62d63a68 Merge pull request #1537 from benflinn/patch-1 
Update bootstrap.json
 2015-08-11 13:12:16 +01:00
Berkeley Martinez 382393e1f2 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 22ce7219a6 get everything seeding again 2015-08-10 22:17:49 -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 5ad9cf8fab 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 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 b3de4e5de4 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 eb5d275d23 improve get-started view and fix duplicate bonfire issue 2015-08-10 20:13:13 -07:00
Quincy Larson d61dd76875 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into onboarding 2015-08-10 19:58:56 -07:00
sonorangirl 0670f73b6d Made some spaces optional for 4th test 2015-08-10 19:32:52 -07:00
sonorangirl f8c63c9dba Fixed RegEx so that 4th test would pass 2015-08-10 19:22:18 -07:00
Berkeley Martinez 50f3845f32 Merge pull request #1671 from ahstro/ahstro-1402 
Disregard order in 'Symmetric Difference'
 2015-08-10 19:11:33 -07:00
Quincy Larson 354338e99f Merge branch 'staging' into onboarding 2015-08-10 18:30:34 -07:00
Quincy Larson 04d6de9a05 Merge branch 'staging' into onboarding 2015-08-10 18:30:15 -07:00
sonorangirl e7f1f12a6f Fixed typos in 1st slot machine challenge 2015-08-10 18:05:07 -07:00
Berkeley Martinez 93df41acc6 fix duplicate id's 2015-08-10 17:40:45 -07:00
Berkeley Martinez 3c4213dd03 fix missing quote escape 2015-08-10 17:35:16 -07:00
Berkeley Martinez cf1bb322e8 Merge pull request #1709 from martinkwan/patch-2 
Updated DNA Pairing link
 2015-08-10 16:39:13 -07:00
Berkeley Martinez 784572009e Merge pull request #1706 from kurzninja/patch-3 
Fix for incorrect RGB test value
 2015-08-10 16:27:15 -07:00
Berkeley Martinez 8b4a554e2c Merge pull request #1697 from martinkwan/patch-1 
Updated Pig Latin Link
 2015-08-10 15:46:12 -07:00
Quincy Larson 59e6204768 Merge branch 'staging' into onboarding 2015-08-10 15:42:07 -07:00
Martin Kwan dbf92d04e1 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 ee0392482d Update intermediate-bonfires.json 2015-08-10 13:42:33 -07:00
Berkeley Martinez b1003b403c 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 062d73af14 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 b784ef90b6 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 7dc6b4de86 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 d2069827d5 Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into staging 2015-08-09 22:58:46 -07:00