Quincy Larson 
							
						 
					 
					
						
						
							
						
						fe1b3f4d2a 
					 
					
						
						
							
							fix broken test from recent pull request  
						
						
						
						
					 
					
						2015-06-19 17:53:59 -07:00 
						 
				 
			
				
					
						
							
							
								Quincy Larson 
							
						 
					 
					
						
						
							
						
						cd63977687 
					 
					
						
						
							
							Merge branch 'master' into staging  
						
						... 
						
						
						
						Conflicts:
	seed/challenges/basic-bonfires.json 
						
						
					 
					
						2015-06-19 17:39:11 -07:00 
						 
				 
			
				
					
						
							
							
								Quincy Larson 
							
						 
					 
					
						
						
							
						
						93ed1cfb1f 
					 
					
						
						
							
							Merge pull request  #961  from LumenTeun/lumenteun-942  
						
						... 
						
						
						
						More test cases for 'Seek and Destroy' 
						
						
					 
					
						2015-06-19 17:32:31 -07:00 
						 
				 
			
				
					
						
							
							
								Quincy Larson 
							
						 
					 
					
						
						
							
						
						5f7443c91e 
					 
					
						
						
							
							Merge pull request  #960  from 1hella/1hella-959  
						
						... 
						
						
						
						1hella 959 
						
						
					 
					
						2015-06-19 17:31:14 -07:00 
						 
				 
			
				
					
						
							
							
								Quincy Larson 
							
						 
					 
					
						
						
							
						
						25f4d4c30e 
					 
					
						
						
							
							Merge pull request  #958  from LumenTeun/lumenteun-941  
						
						... 
						
						
						
						'No repeats please' test fix. 
						
						
					 
					
						2015-06-19 17:29:25 -07:00 
						 
				 
			
				
					
						
							
							
								Quincy Larson 
							
						 
					 
					
						
						
							
						
						6078b54393 
					 
					
						
						
							
							Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging  
						
						
						
						
					 
					
						2015-06-19 16:18:56 -07:00 
						 
				 
			
				
					
						
							
							
								Quincy Larson 
							
						 
					 
					
						
						
							
						
						d5ea05e448 
					 
					
						
						
							
							Merge branch 'Lemony-Andrew-master' into staging  
						
						... 
						
						
						
						Conflicts:
	server/views/coursewares/showBonfire.jade 
						
						
					 
					
						2015-06-19 16:17:59 -07:00 
						 
				 
			
				
					
						
							
							
								Quincy Larson 
							
						 
					 
					
						
						
							
						
						93e96643fb 
					 
					
						
						
							
							Merge pull request  #940  from LumenTeun/lumenteun-907  
						
						... 
						
						
						
						Check fix in 'Bootstrap Grid'. 
						
						
					 
					
						2015-06-19 16:07:48 -07:00 
						 
				 
			
				
					
						
							
							
								Quincy Larson 
							
						 
					 
					
						
						
							
						
						40a1ff835c 
					 
					
						
						
							
							Merge pull request  #939  from LumenTeun/lumenteun-911  
						
						... 
						
						
						
						Test for almost palindromes in 'Check for Palindromes' 
						
						
					 
					
						2015-06-19 16:06:56 -07:00 
						 
				 
			
				
					
						
							
							
								Quincy Larson 
							
						 
					 
					
						
						
							
						
						a339c1b60b 
					 
					
						
						
							
							Merge pull request  #938  from LumenTeun/lumenteun-914  
						
						... 
						
						
						
						Improves check for catphotoapp.com in 'Link to External Pages with Anchor Elements' 
						
						
					 
					
						2015-06-19 16:05:23 -07:00 
						 
				 
			
				
					
						
							
							
								Quincy Larson 
							
						 
					 
					
						
						
							
						
						c2c64b153a 
					 
					
						
						
							
							Merge pull request  #937  from LumenTeun/lumenteun-918  
						
						... 
						
						
						
						Fixed Zipline jQuery.getJSON() links. 
						
						
					 
					
						2015-06-19 16:03:17 -07:00 
						 
				 
			
				
					
						
							
							
								Quincy Larson 
							
						 
					 
					
						
						
							
						
						f200a6f8a3 
					 
					
						
						
							
							Merge pull request  #936  from LumenTeun/lumenteun-924  
						
						... 
						
						
						
						More 'Convert HTML Entities' test cases. Fixes  #924  
						
						
					 
					
						2015-06-19 16:00:45 -07:00 
						 
				 
			
				
					
						
							
							
								Berkeley Martinez 
							
						 
					 
					
						
						
							
						
						adbbbf3743 
					 
					
						
						
							
							fix name and dashed name switched  
						
						... 
						
						
						
						close  #975  
					
						2015-06-18 20:02:32 -07:00 
						 
				 
			
				
					
						
							
							
								Stephen Wanhella 
							
						 
					 
					
						
						
							
						
						9342503873 
					 
					
						
						
							
							Added new test with different max number to Bonfire: Truncate a String  
						
						... 
						
						
						
						Issue 959 
						
						
					 
					
						2015-06-18 17:48:30 -07:00 
						 
				 
			
				
					
						
							
							
								Brett Guillory 
							
						 
					 
					
						
						
							
						
						d6db51355e 
					 
					
						
						
							
							Added missing MDN Link  
						
						... 
						
						
						
						This bonfire "Missing letters"seems to be missing an important MDN link to "String.fromCharCode()", which is needed to get the missing character to return for the test. Since the missing character is obviously not in the string supplied, you cannot get the character code for it from the string. 
						
						
					 
					
						2015-06-18 17:48:30 -07:00 
						 
				 
			
				
					
						
							
							
								Brett Guillory 
							
						 
					 
					
						
						
							
						
						8ade99b5d7 
					 
					
						
						
							
							Fixed a word  
						
						
						
						
					 
					
						2015-06-18 17:48:29 -07:00 
						 
				 
			
				
					
						
							
							
								LumenTeun 
							
						 
					 
					
						
						
							
						
						842a2efe64 
					 
					
						
						
							
							More test cases for 'Seek and Destroy'  #942  
						
						
						
						
					 
					
						2015-06-18 11:56:13 +02:00 
						 
				 
			
				
					
						
							
							
								LumenTeun 
							
						 
					 
					
						
						
							
						
						d1a12fc894 
					 
					
						
						
							
							'No repeats please' test fix.  #941  
						
						
						
						
					 
					
						2015-06-17 23:30:08 +02:00 
						 
				 
			
				
					
						
							
							
								Quincy Larson 
							
						 
					 
					
						
						
							
						
						d615e94c29 
					 
					
						
						
							
							fix minor typo in html challenge  
						
						
						
						
					 
					
						2015-06-16 18:00:17 -07:00 
						 
				 
			
				
					
						
							
							
								Matias Cao 
							
						 
					 
					
						
						
							
						
						13c3d213ce 
					 
					
						
						
							
							WP11 ES Translation  
						
						
						
						
					 
					
						2015-06-16 18:27:58 -03:00 
						 
				 
			
				
					
						
							
							
								greasan 
							
						 
					 
					
						
						
							
						
						07c2e6b1c3 
					 
					
						
						
							
							Translated basic HTML5 and CSS  
						
						
						
						
					 
					
						2015-06-16 19:40:07 +02:00 
						 
				 
			
				
					
						
							
							
								greasan 
							
						 
					 
					
						
						
							
						
						891aa09f04 
					 
					
						
						
							
							Merge branch 'staging' of  https://github.com/FreeCodeCamp/freecodecamp  into greasan-translateDE  
						
						
						
						
					 
					
						2015-06-16 19:20:27 +02:00 
						 
				 
			
				
					
						
							
							
								terakilobyte 
							
						 
					 
					
						
						
							
						
						e319652373 
					 
					
						
						
							
							Fix wikipedia viewer zipline naming  
						
						
						
						
					 
					
						2015-06-16 08:36:54 -04:00 
						 
				 
			
				
					
						
							
							
								terakilobyte 
							
						 
					 
					
						
						
							
						
						76811b9215 
					 
					
						
						
							
							Fix json typo  
						
						
						
						
					 
					
						2015-06-15 18:59:56 -04:00 
						 
				 
			
				
					
						
							
							
								greasan 
							
						 
					 
					
						
						
							
						
						845c0ccc74 
					 
					
						
						
							
							Merge branch 'staging' of  https://github.com/FreeCodeCamp/freecodecamp  into greasan-translateDE  
						
						
						
						
					 
					
						2015-06-15 18:54:20 +02:00 
						 
				 
			
				
					
						
							
							
								LumenTeun 
							
						 
					 
					
						
						
							
						
						663492c582 
					 
					
						
						
							
							Check fix in 'Bootstrap Grid'.  #907  
						
						
						
						
					 
					
						2015-06-15 18:26:44 +02:00 
						 
				 
			
				
					
						
							
							
								LumenTeun 
							
						 
					 
					
						
						
							
						
						480c5dec0a 
					 
					
						
						
							
							Test for almost palindromes.  #911  
						
						
						
						
					 
					
						2015-06-15 18:14:55 +02:00 
						 
				 
			
				
					
						
							
							
								LumenTeun 
							
						 
					 
					
						
						
							
						
						0038c48875 
					 
					
						
						
							
							Improves check for catphotoapp.com.  Fixes   #914  
						
						
						
						
					 
					
						2015-06-15 18:06:09 +02:00 
						 
				 
			
				
					
						
							
							
								LumenTeun 
							
						 
					 
					
						
						
							
						
						00c1cdef5b 
					 
					
						
						
							
							Fixed Zipline jQuery.getJSON() links.  Fixes   #918   #919  
						
						
						
						
					 
					
						2015-06-15 17:43:52 +02:00 
						 
				 
			
				
					
						
							
							
								LumenTeun 
							
						 
					 
					
						
						
							
						
						f50cee119c 
					 
					
						
						
							
							More 'Convert HTML Entities' test cases.  Fixes   #924  
						
						
						
						
					 
					
						2015-06-15 17:26:37 +02:00 
						 
				 
			
				
					
						
							
							
								Quincy Larson 
							
						 
					 
					
						
						
							
						
						b6fc2551d9 
					 
					
						
						
							
							Merge branch 'interview' into staging  
						
						... 
						
						
						
						Conflicts:
	app.js
	controllers/challenge.js
	seed/future-jquery-ajax-json.json 
						
						
					 
					
						2015-06-14 01:02:39 -07:00 
						 
				 
			
				
					
						
							
							
								Quincy Larson 
							
						 
					 
					
						
						
							
						
						2b7177e856 
					 
					
						
						
							
							add dashedName attributes to JSON  
						
						
						
						
					 
					
						2015-06-14 00:55:27 -07:00 
						 
				 
			
				
					
						
							
							
								Quincy Larson 
							
						 
					 
					
						
						
							
						
						2c8a134e80 
					 
					
						
						
							
							first challenge json file updated with dashedname  
						
						
						
						
					 
					
						2015-06-13 23:50:36 -07:00 
						 
				 
			
				
					
						
							
							
								greasan 
							
						 
					 
					
						
						
							
						
						f2ff5236eb 
					 
					
						
						
							
							Merge branch 'staging' of  https://github.com/FreeCodeCamp/freecodecamp  into greasan-translateDE  
						
						
						
						
					 
					
						2015-06-12 22:19:10 +02:00 
						 
				 
			
				
					
						
							
							
								Quincy Larson 
							
						 
					 
					
						
						
							
						
						5fb89cb091 
					 
					
						
						
							
							Merge branch 'master' of github.com:FreeCodeCamp/freecodecamp into staging  
						
						
						
						
					 
					
						2015-06-11 11:16:31 -07:00 
						 
				 
			
				
					
						
							
							
								greasan 
							
						 
					 
					
						
						
							
						
						701241aac8 
					 
					
						
						
							
							Merge branch 'staging' of  https://github.com/FreeCodeCamp/freecodecamp  into greasan-translateDE  
						
						
						
						
					 
					
						2015-06-10 07:16:02 +02:00 
						 
				 
			
				
					
						
							
							
								Quincy Larson 
							
						 
					 
					
						
						
							
						
						61486c2d7c 
					 
					
						
						
							
							Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging  
						
						... 
						
						
						
						Conflicts:
	app.js
	controllers/fieldGuide.js
	controllers/story.js
	seed/challenges/basic-html5-and-css.json
	seed/challenges/bootstrap.json
	seed/field-guides.json
	server/views/partials/navbar.jade
	views/resources/jobs-form.jade
	views/resources/nonprofits-form.jade
	views/resources/pmi-acp-agile-project-managers-form.jade 
						
						
					 
					
						2015-06-09 13:48:29 -07:00 
						 
				 
			
				
					
						
							
							
								greasan 
							
						 
					 
					
						
						
							
						
						8b8dab2970 
					 
					
						
						
							
							Merge branch 'staging' of  https://github.com/FreeCodeCamp/freecodecamp  into greasan-translateDE  
						
						
						
						
					 
					
						2015-06-05 15:48:38 +02:00 
						 
				 
			
				
					
						
							
							
								Quincy Larson 
							
						 
					 
					
						
						
							
						
						3654bb7e6f 
					 
					
						
						
							
							change _id to id everywhere that seems relevant to loopback  
						
						
						
						
					 
					
						2015-06-04 13:20:42 -07:00 
						 
				 
			
				
					
						
							
							
								Berkeley Martinez 
							
						 
					 
					
						
						
							
						
						02b195511e 
					 
					
						
						
							
							fix challengeSeeds should be arrays  
						
						
						
						
					 
					
						2015-06-04 12:31:33 -07:00 
						 
				 
			
				
					
						
							
							
								Quincy Larson 
							
						 
					 
					
						
						
							
						
						618cedddb0 
					 
					
						
						
							
							Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging  
						
						
						
						
					 
					
						2015-06-04 12:24:30 -07:00 
						 
				 
			
				
					
						
							
							
								Berkeley Martinez 
							
						 
					 
					
						
						
							
						
						272d9b4ad5 
					 
					
						
						
							
							Update seed directory to use loopback  
						
						
						
						
					 
					
						2015-06-02 20:32:10 -07:00