| 
							
							
								 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 | 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 |  |