wildscotsmen 
							
						 
					 
					
						
						
						
						
							
						
						
							9296eb6e7b 
							
						 
					 
					
						
						
							
							Updated report form to sponsor's specifications.  
						
						 
						
						
						
						
					 
					
						2018-10-18 15:22:31 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								wildscotsmen 
							
						 
					 
					
						
						
						
						
							
						
						
							bd270a0e13 
							
						 
					 
					
						
						
							
							Added shuffling for array.  
						
						 
						
						
						
						
					 
					
						2018-10-18 13:51:32 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								wildscotsmen 
							
						 
					 
					
						
						
						
						
							
						
						
							deb5cc8a01 
							
						 
					 
					
						
						
							
							Segregated quiz into component.  
						
						 
						
						
						
						
					 
					
						2018-10-18 13:30:08 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								wildscotsmen 
							
						 
					 
					
						
						
						
						
							
						
						
							eecae7bb29 
							
						 
					 
					
						
						
							
							Changed title of quiz.  
						
						 
						
						
						
						
					 
					
						2018-10-18 13:08:53 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								wildscotsmen 
							
						 
					 
					
						
						
						
						
							
						
						
							f464485aee 
							
						 
					 
					
						
						
							
							Removed extraneous comma.  
						
						 
						
						
						
						
					 
					
						2018-10-18 13:04:02 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								wildscotsmen 
							
						 
					 
					
						
						
						
						
							
						
						
							5e130b3d77 
							
						 
					 
					
						
						
							
							Added quiz component to dependencies.  
						
						 
						
						
						
						
					 
					
						2018-10-18 13:03:03 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								wildscotsmen 
							
						 
					 
					
						
						
						
						
							
						
						
							38357dd44c 
							
						 
					 
					
						
						
							
							Merge branch 'master' of  https://github.com/alDuncanson/marten-application  into feature/quiz-game  
						
						 
						
						
						
						
					 
					
						2018-10-18 12:49:44 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								wildscotsmen 
							
						 
					 
					
						
						
						
						
							
						
						
							3b91b09e09 
							
						 
					 
					
						
						
							
							Added a draft of the quiz game.  
						
						 
						
						
						
						
					 
					
						2018-10-18 12:48:01 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jacob McCloughan 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							a7ca249d1e 
							
						 
					 
					
						
						
							
							Merge pull request  #27  from alDuncanson/refactor/readme-edit  
						
						 
						
						... 
						
						
						
						Updated readme 
						
						
					 
					
						2018-10-08 02:32:28 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jacob McCloughan 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							60e8ff2e2e 
							
						 
					 
					
						
						
							
							Merge pull request  #29  from alDuncanson/feature/single-sighting  
						
						 
						
						... 
						
						
						
						feature/single-sighting 
						
						
					 
					
						2018-10-08 00:50:09 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								wildscotsmen 
							
						 
					 
					
						
						
						
						
							
						
						
							e792bb3483 
							
						 
					 
					
						
						
							
							Made sure that we don't try to fetch IDs that aren't in the database.  
						
						 
						
						
						
						
					 
					
						2018-10-08 00:47:24 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								wildscotsmen 
							
						 
					 
					
						
						
						
						
							
						
						
							74cd0ec307 
							
						 
					 
					
						
						
							
							Updated comment to reflect its component.  
						
						 
						
						
						
						
					 
					
						2018-10-08 00:30:06 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								malfecient 
							
						 
					 
					
						
						
						
						
							
						
						
							8c69f5351a 
							
						 
					 
					
						
						
							
							Created a component for pulling in a single sighting.  
						
						 
						
						
						
						
					 
					
						2018-10-07 23:14:57 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jacob McCloughan 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							062051a38c 
							
						 
					 
					
						
						
							
							Updated readme  
						
						 
						
						... 
						
						
						
						Made it more up-to-date with the project's current status. 
						
						
					 
					
						2018-10-06 19:19:58 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Joey Coscarelli 
							
						 
					 
					
						
						
						
						
							
						
						
							1f6aeb44b7 
							
						 
					 
					
						
						
							
							Merge branch 'master' of  https://github.com/alDuncanson/marten-application  into Sightings  
						
						 
						
						
						
						
					 
					
						2018-10-04 20:47:59 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Al Duncanson 
							
						 
					 
					
						
						
						
						
							
						
						
							f19d0361e3 
							
						 
					 
					
						
						
							
							removed comments  
						
						 
						
						
						
						
					 
					
						2018-10-04 19:48:43 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jacob McCloughan 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							664d4dc926 
							
						 
					 
					
						
						
							
							Merge pull request  #24  from alDuncanson/develop  
						
						 
						
						... 
						
						
						
						Develop into master 
						
						
					 
					
						2018-10-04 19:29:07 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ajmaley 
							
						 
					 
					
						
						
						
						
							
						
						
							25bbe3088d 
							
						 
					 
					
						
						
							
							Merge branch 'feature/flamelink' of  https://github.com/alDuncanson/marten-application  into develop  
						
						 
						
						
						
						
					 
					
						2018-10-04 19:24:22 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ajmaley 
							
						 
					 
					
						
						
						
						
							
						
						
							8a6ce0012a 
							
						 
					 
					
						
						
							
							Prepared feature for production  
						
						 
						
						
						
						
					 
					
						2018-10-04 19:22:31 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ajmaley 
							
						 
					 
					
						
						
						
						
							
						
						
							e427e3f702 
							
						 
					 
					
						
						
							
							updated git ignore  
						
						 
						
						
						
						
					 
					
						2018-10-04 19:17:44 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ajmaley 
							
						 
					 
					
						
						
						
						
							
						
						
							9556e0eb99 
							
						 
					 
					
						
						
							
							Added flamelink features  
						
						 
						
						
						
						
					 
					
						2018-10-04 19:14:48 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ajmaley 
							
						 
					 
					
						
						
						
						
							
						
						
							1e61914815 
							
						 
					 
					
						
						
							
							Fixed merge conflict  
						
						 
						
						
						
						
					 
					
						2018-10-04 18:52:34 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Al Duncanson 
							
						 
					 
					
						
						
						
						
							
						
						
							376e58bb6f 
							
						 
					 
					
						
						
							
							update gitignore, remove vscode settings json  
						
						 
						
						
						
						
					 
					
						2018-10-04 18:39:24 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ajmaley 
							
						 
					 
					
						
						
						
						
							
						
						
							987c89837f 
							
						 
					 
					
						
						
							
							Created Flamelink component to grab data from flamelink and sends data to the <p id="flamelinkDemo"> tag. Still need to firgure out how to grab all fields and display without hardcoding.  
						
						 
						
						... 
						
						
						
						Added my Flamelink instance to Main.js and added it as a prop for the Info component.
Info.js calls the Flamelink component and pushes the Flamelink instance to the Flamelink component as a prop. 
						
						
					 
					
						2018-10-04 18:35:36 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Al Duncanson 
							
						 
					 
					
						
						
						
						
							
						
						
							754e534914 
							
						 
					 
					
						
						
							
							removed todos, fixmes  
						
						 
						
						
						
						
					 
					
						2018-10-04 18:34:06 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Al Duncanson 
							
						 
					 
					
						
						
						
						
							
						
						
							861dc783bf 
							
						 
					 
					
						
						
							
							edited the current location marker  
						
						 
						
						
						
						
					 
					
						2018-10-04 18:30:20 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Al Duncanson 
							
						 
					 
					
						
						
						
						
							
						
						
							7dd828a38c 
							
						 
					 
					
						
						
							
							split maps into multiple components, render sighting markers in real time, pull sighting info into marker info boxes  
						
						 
						
						
						
						
					 
					
						2018-10-04 17:19:27 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Joey Coscarelli 
							
						 
					 
					
						
						
						
						
							
						
						
							26c87b92d3 
							
						 
					 
					
						
						
							
							Sightings component - FIXME  
						
						 
						
						
						
						
					 
					
						2018-10-03 23:55:29 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Al Duncanson 
							
						 
					 
					
						
						
						
						
							
						
						
							9dc5c4d69c 
							
						 
					 
					
						
						
							
							added check for props  
						
						 
						
						
						
						
					 
					
						2018-10-03 16:41:09 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Al Duncanson 
							
						 
					 
					
						
						
						
						
							
						
						
							2cb980822b 
							
						 
					 
					
						
						
							
							changed textField width  
						
						 
						
						
						
						
					 
					
						2018-10-02 15:10:02 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Al Duncanson 
							
						 
					 
					
						
						
						
						
							
						
						
							d0d9820699 
							
						 
					 
					
						
						
							
							map renders markers on click, sends lat and lng to firebase, yeet  
						
						 
						
						
						
						
					 
					
						2018-10-02 14:51:26 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Al Duncanson 
							
						 
					 
					
						
						
						
						
							
						
						
							603156def7 
							
						 
					 
					
						
						
							
							added map  
						
						 
						
						
						
						
					 
					
						2018-09-28 15:21:29 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Al Duncanson 
							
						 
					 
					
						
						
						
						
							
						
						
							ee0404a82b 
							
						 
					 
					
						
						
							
							resolve merge conflicts  
						
						 
						
						
						
						
					 
					
						2018-09-28 15:10:32 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Al Duncanson 
							
						 
					 
					
						
						
						
						
							
						
						
							f8b998cf52 
							
						 
					 
					
						
						
							
							added images, added styles, record lat/lng onClick()  
						
						 
						
						
						
						
					 
					
						2018-09-27 18:00:35 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Al Duncanson 
							
						 
					 
					
						
						
						
						
							
						
						
							a19b738c26 
							
						 
					 
					
						
						
							
							added comments  
						
						 
						
						
						
						
					 
					
						2018-09-27 14:48:59 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Al Duncanson 
							
						 
					 
					
						
						
						
						
							
						
						
							477ba66608 
							
						 
					 
					
						
						
							
							updated map component, wrapped with api key, added markers/info windows  
						
						 
						
						
						
						
					 
					
						2018-09-27 14:28:49 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Al Duncanson 
							
						 
					 
					
						
						
						
						
							
						
						
							aeae021f2b 
							
						 
					 
					
						
						
							
							added google-map-react component, added geolocation  
						
						 
						
						
						
						
					 
					
						2018-09-24 14:42:41 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Al Duncanson 
							
						 
					 
					
						
						
						
						
							
						
						
							56972690cc 
							
						 
					 
					
						
						
							
							added Google Maps API key, unencrypted temporarily  
						
						 
						
						
						
						
					 
					
						2018-09-24 14:41:32 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								wildscotsmen 
							
						 
					 
					
						
						
						
						
							
						
						
							2b572d50f8 
							
						 
					 
					
						
						
							
							Merge branch 'master' of  https://github.com/alDuncanson/marten-application  into feature/#2  
						
						 
						
						
						
						
					 
					
						2018-09-23 19:38:53 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								wildscotsmen 
							
						 
					 
					
						
						
						
						
							
						
						
							c3f05ef67f 
							
						 
					 
					
						
						
							
							Got the form to send data to Firebase. Still needs a toast or something to tell the user the data was sent.  
						
						 
						
						
						
						
					 
					
						2018-09-23 19:37:35 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jacob McCloughan 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							a144e9f805 
							
						 
					 
					
						
						
							
							Merge pull request  #22  from alDuncanson/WildScotsmen-patch-1-1  
						
						 
						
						... 
						
						
						
						Updated readme.md 
						
						
					 
					
						2018-09-21 17:30:04 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								wildscotsmen 
							
						 
					 
					
						
						
						
						
							
						
						
							ed0a607560 
							
						 
					 
					
						
						
							
							Fixed spacing issues between desktop and mobile.  
						
						 
						
						
						
						
					 
					
						2018-09-21 17:24:40 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								wildscotsmen 
							
						 
					 
					
						
						
						
						
							
						
						
							2a402407ae 
							
						 
					 
					
						
						
							
							Added proper form validation for description field.  
						
						 
						
						
						
						
					 
					
						2018-09-21 17:19:56 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								wildscotsmen 
							
						 
					 
					
						
						
						
						
							
						
						
							c22bcae00d 
							
						 
					 
					
						
						
							
							Improved layout of form. Actually got data sending over a GET form method.  
						
						 
						
						
						
						
					 
					
						2018-09-21 16:38:20 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								wildscotsmen 
							
						 
					 
					
						
						
						
						
							
						
						
							cf9e4d384a 
							
						 
					 
					
						
						
							
							Updated application to include report page and also added basic component for report form.  
						
						 
						
						
						
						
					 
					
						2018-09-21 15:11:52 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Al Duncanson 
							
						 
					 
					
						
						
						
						
							
						
						
							008d75fe3b 
							
						 
					 
					
						
						
							
							added build folder  
						
						 
						
						
						
						
					 
					
						2018-09-19 17:47:55 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Al Duncanson 
							
						 
					 
					
						
						
						
						
							
						
						
							aa9ab5530d 
							
						 
					 
					
						
						
							
							initial commit  
						
						 
						
						
						
						
					 
					
						2018-09-19 16:42:56 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jacob McCloughan 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							d53a9c7f9d 
							
						 
					 
					
						
						
							
							Update readme.md  
						
						 
						
						
						
						
					 
					
						2018-09-13 22:25:57 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jacob McCloughan 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							f0c7b1712d 
							
						 
					 
					
						
						
							
							Update readme.md  
						
						 
						
						
						
						
					 
					
						2018-08-30 17:38:52 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								wildscotsmen 
							
						 
					 
					
						
						
						
						
							
						
						
							4d20042c05 
							
						 
					 
					
						
						
							
							Added readme.  
						
						 
						
						
						
						
					 
					
						2018-08-30 17:36:52 -04:00