Hallaathrad
							
						 
					 | 
					
						
						
							
						
						fe422d2300
					 | 
					
						
						
							
							adding wiki as detached and integrating into .less folder
						
						
						
						
						
						
					 | 
					
						2016-02-09 23:26:59 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Berkeley Martinez
							
						 
					 | 
					
						
						
							
						
						692f577eb3
					 | 
					
						
						
							
							Fix linting issue
						
						
						
						
						
						
					 | 
					
						2015-11-03 21:54:42 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Quincy Larson
							
						 
					 | 
					
						
						
							
						
						63f56c94b8
					 | 
					
						
						
							
							continue refining waypoints
						
						
						
						
						
						
					 | 
					
						2015-10-27 17:49:58 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Quincy Larson
							
						 
					 | 
					
						
						
							
						
						989cb87c00
					 | 
					
						
						
							
							add redirect for now vanished field guide articles
						
						
						
						
						
						
					 | 
					
						2015-08-04 18:00:01 -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
							
						 
					 | 
					
						
						
							
						
						4fb3b3e7cc
					 | 
					
						
						
							
							add more cities and move the bootcamp calculator to field guide entries (still untested).
						
						
						
						
						
						
					 | 
					
						2015-07-02 13:59:13 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Berkeley Martinez
							
						 
					 | 
					
						
						
							
						
						12b055353e
					 | 
					
						
						
							
							remove challangeMap
						
						
						
						
						
						
						
						move to challenges router 
						
						
					 | 
					
						2015-06-19 14:49:10 -07: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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Berkeley Martinez
							
						 
					 | 
					
						
						
							
						
						bfd33d8b40
					 | 
					
						
						
							
							fix use app.use(router) to add sub router
						
						
						
						
						
						
					 | 
					
						2015-06-03 16:31:42 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Berkeley Martinez
							
						 
					 | 
					
						
						
							
						
						8165105b29
					 | 
					
						
						
							
							refactor all boot to export func and use loopback
						
						
						
						
						
						
					 | 
					
						2015-06-03 16:19:23 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Berkeley Martinez
							
						 
					 | 
					
						
						
							
						
						7c2f171d31
					 | 
					
						
						
							
							fix all the linting errors in boot
						
						
						
						
						
						
					 | 
					
						2015-06-01 16:23:53 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								terakilobyte
							
						 
					 | 
					
						
						
							
						
						d9c3251f94
					 | 
					
						
						
							
							Begin shaping codebase for loopback migration.
						
						
						
						
						
						
					 | 
					
						2015-06-01 18:30:43 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |