Godwin 
							
						 
					 
					
						
						
						
						
							
						
						
							91708ef81b 
							
						 
					 
					
						
						
							
							Translations  
						
						
						
						
					 
					
						2014-05-04 15:31:36 -06:00 
						 
				 
			
				
					
						
							
							
								Godwin 
							
						 
					 
					
						
						
						
						
							
						
						
							ad2a897ef7 
							
						 
					 
					
						
						
							
							Translations  
						
						
						
						
					 
					
						2014-05-04 15:29:50 -06:00 
						 
				 
			
				
					
						
							
							
								Godwin 
							
						 
					 
					
						
						
						
						
							
						
						
							e5f9dc5666 
							
						 
					 
					
						
						
							
							Translations  
						
						
						
						
					 
					
						2014-05-04 15:22:22 -06:00 
						 
				 
			
				
					
						
							
							
								Godwin 
							
						 
					 
					
						
						
						
						
							
						
						
							52e5e10232 
							
						 
					 
					
						
						
							
							Translations  
						
						
						
						
					 
					
						2014-05-04 14:56:18 -06:00 
						 
				 
			
				
					
						
							
							
								Godwin 
							
						 
					 
					
						
						
						
						
							
						
						
							cc948937bc 
							
						 
					 
					
						
						
							
							Some updates to translation engine, added dotenv but have not yet set it up.  
						
						
						
						
					 
					
						2014-04-29 21:02:02 -06:00 
						 
				 
			
				
					
						
							
							
								Graham Kaplan 
							
						 
					 
					
						
						
						
						
							
						
						
							3759910993 
							
						 
					 
					
						
						
							
							Forgot to fix conflicts, oops  
						
						
						
						
					 
					
						2014-04-05 19:33:22 -07:00 
						 
				 
			
				
					
						
							
							
								Graham Kaplan 
							
						 
					 
					
						
						
						
						
							
						
						
							abaf5b55a4 
							
						 
					 
					
						
						
							
							Merge branch 'master' of  https://github.com/bikebike/BikeBike  
						
						... 
						
						
						
						Conflicts:
	Gemfile
	Gemfile.lock 
						
						
					 
					
						2014-04-05 19:27:05 -07:00 
						 
				 
			
				
					
						
							
							
								Graham Kaplan 
							
						 
					 
					
						
						
						
						
							
						
						
							230295790b 
							
						 
					 
					
						
						
							
							Add Facebook login with Sorcery  
						
						... 
						
						
						
						The facebook key and secret defined in the sorcery config file are for
testing only and need to be changed and not committed to source when
app is ready to go live 
						
						
					 
					
						2014-04-05 19:18:57 -07:00 
						 
				 
			
				
					
						
							
							
								Graham Kaplan 
							
						 
					 
					
						
						
						
						
							
						
						
							a6da30dc08 
							
						 
					 
					
						
						
							
							Needed to comment this out to get app working  
						
						
						
						
					 
					
						2014-04-05 19:17:19 -07:00 
						 
				 
			
				
					
						
							
							
								Graham Kaplan 
							
						 
					 
					
						
						
						
						
							
						
						
							c9a09de740 
							
						 
					 
					
						
						
							
							Add flash message display  
						
						
						
						
					 
					
						2014-04-05 19:16:15 -07:00 
						 
				 
			
				
					
						
							
							
								Graham Kaplan 
							
						 
					 
					
						
						
						
						
							
						
						
							ab42618bbd 
							
						 
					 
					
						
						
							
							Add rails-footnotes to make development debugging easier  
						
						
						
						
					 
					
						2014-04-05 19:15:37 -07:00 
						 
				 
			
				
					
						
							
							
								Godwin 
							
						 
					 
					
						
						
						
						
							
						
						
							b0c0e029fd 
							
						 
					 
					
						
						
							
							Testing tests 8  
						
						
						
						
					 
					
						2014-03-23 16:23:29 -06:00 
						 
				 
			
				
					
						
							
							
								Godwin 
							
						 
					 
					
						
						
						
						
							
						
						
							973a2ba4d2 
							
						 
					 
					
						
						
							
							Testing tests 7  
						
						
						
						
					 
					
						2014-03-23 14:51:10 -06:00 
						 
				 
			
				
					
						
							
							
								Godwin 
							
						 
					 
					
						
						
						
						
							
						
						
							53d26c62a8 
							
						 
					 
					
						
						
							
							Testing tests 7  
						
						
						
						
					 
					
						2014-03-23 14:41:29 -06:00 
						 
				 
			
				
					
						
							
							
								Godwin 
							
						 
					 
					
						
						
						
						
							
						
						
							f409825838 
							
						 
					 
					
						
						
							
							Testing tests 6  
						
						
						
						
					 
					
						2014-03-23 14:37:03 -06:00 
						 
				 
			
				
					
						
							
							
								Godwin 
							
						 
					 
					
						
						
						
						
							
						
						
							4084669d0c 
							
						 
					 
					
						
						
							
							Testing tests 6  
						
						
						
						
					 
					
						2014-03-23 14:28:53 -06:00 
						 
				 
			
				
					
						
							
							
								Godwin 
							
						 
					 
					
						
						
						
						
							
						
						
							58e948f946 
							
						 
					 
					
						
						
							
							Testing tests 5  
						
						
						
						
					 
					
						2014-03-23 14:21:23 -06:00 
						 
				 
			
				
					
						
							
							
								Godwin 
							
						 
					 
					
						
						
						
						
							
						
						
							5edc596f33 
							
						 
					 
					
						
						
							
							Testing tests 4  
						
						
						
						
					 
					
						2014-03-23 14:14:52 -06:00 
						 
				 
			
				
					
						
							
							
								Godwin 
							
						 
					 
					
						
						
						
						
							
						
						
							fb19bb1220 
							
						 
					 
					
						
						
							
							Testing tests 3  
						
						
						
						
					 
					
						2014-03-23 14:09:19 -06:00 
						 
				 
			
				
					
						
							
							
								Godwin 
							
						 
					 
					
						
						
						
						
							
						
						
							078b65813e 
							
						 
					 
					
						
						
							
							Testing tests 3  
						
						
						
						
					 
					
						2014-03-23 13:49:06 -06:00 
						 
				 
			
				
					
						
							
							
								Godwin 
							
						 
					 
					
						
						
						
						
							
						
						
							f5ec601fac 
							
						 
					 
					
						
						
							
							Testing tests 2  
						
						
						
						
					 
					
						2014-03-23 13:40:09 -06:00 
						 
				 
			
				
					
						
							
							
								Godwin 
							
						 
					 
					
						
						
						
						
							
						
						
							fda5646974 
							
						 
					 
					
						
						
							
							Testing tests  
						
						
						
						
					 
					
						2014-03-23 13:31:08 -06:00 
						 
				 
			
				
					
						
							
							
								Godwin 
							
						 
					 
					
						
						
						
						
							
						
						
							55d47180e0 
							
						 
					 
					
						
						
							
							Fixed some issues with registration  
						
						
						
						
					 
					
						2014-03-15 20:43:16 -06:00 
						 
				 
			
				
					
						
							
							
								Godwin 
							
						 
					 
					
						
						
						
						
							
						
						
							243c47a6e7 
							
						 
					 
					
						
						
							
							Messed up event migration  
						
						
						
						
					 
					
						2014-03-15 13:46:24 -06:00 
						 
				 
			
				
					
						
							
							
								Godwin 
							
						 
					 
					
						
						
						
						
							
						
						
							8e26bb1797 
							
						 
					 
					
						
						
							
							Workshop and event scaffolds  
						
						
						
						
					 
					
						2014-03-15 13:40:38 -06:00 
						 
				 
			
				
					
						
							
							
								Godwin 
							
						 
					 
					
						
						
						
						
							
						
						
							3d6ad3b432 
							
						 
					 
					
						
						
							
							Registration form more-or-less working, workshop scaffold is up  
						
						
						
						
					 
					
						2014-03-13 21:20:17 -06:00 
						 
				 
			
				
					
						
							
							
								Godwin 
							
						 
					 
					
						
						
						
						
							
						
						
							4b79de7a24 
							
						 
					 
					
						
						
							
							Registration form working  
						
						
						
						
					 
					
						2014-03-09 21:18:31 -06:00 
						 
				 
			
				
					
						
							
							
								Godwin 
							
						 
					 
					
						
						
						
						
							
						
						
							5e9e3d5fec 
							
						 
					 
					
						
						
							
							Added to the readme  
						
						
						
						
					 
					
						2014-03-09 19:05:49 -06:00 
						 
				 
			
				
					
						
							
							
								Godwin 
							
						 
					 
					
						
						
						
						
							
						
						
							a70d15ee3c 
							
						 
					 
					
						
						
							
							Added to the readme  
						
						
						
						
					 
					
						2014-03-09 19:03:27 -06:00 
						 
				 
			
				
					
						
							
							
								Godwin 
							
						 
					 
					
						
						
						
						
							
						
						
							38ed0c7c53 
							
						 
					 
					
						
						
							
							The working basics  
						
						
						
						
					 
					
						2014-03-09 16:05:46 -06:00 
						 
				 
			
				
					
						
							
							
								Godwin 
							
						 
					 
					
						
						
						
						
							
						
						
							76bf7164e8 
							
						 
					 
					
						
						
							
							The working basics  
						
						
						
						
					 
					
						2014-03-09 15:50:56 -06:00 
						 
				 
			
				
					
						
							
							
								Godwin 
							
						 
					 
					
						
						
						
						
							
						
						
							1a5af29d14 
							
						 
					 
					
						
						
							
							The working basics  
						
						
						
						
					 
					
						2014-03-09 15:47:42 -06:00 
						 
				 
			
				
					
						
							
							
								Godwin 
							
						 
					 
					
						
						
						
						
							
						
						
							91b427ba58 
							
						 
					 
					
						
						
							
							The working basics  
						
						
						
						
					 
					
						2014-03-09 15:37:11 -06:00 
						 
				 
			
				
					
						
							
							
								Godwin 
							
						 
					 
					
						
						
						
						
							
						
						
							96bc841e7b 
							
						 
					 
					
						
						
							
							The working basics  
						
						
						
						
					 
					
						2014-03-09 15:06:26 -06:00 
						 
				 
			
				
					
						
							
							
								Godwin 
							
						 
					 
					
						
						
						
						
							
						
						
							bbec690e2f 
							
						 
					 
					
						
						
							
							The working basics  
						
						
						
						
					 
					
						2014-03-09 14:56:24 -06:00 
						 
				 
			
				
					
						
							
							
								Godwin 
							
						 
					 
					
						
						
						
						
							
						
						
							db60933506 
							
						 
					 
					
						
						
							
							The working basics  
						
						
						
						
					 
					
						2014-03-09 14:43:33 -06:00 
						 
				 
			
				
					
						
							
							
								Godwin 
							
						 
					 
					
						
						
						
						
							
						
						
							b490a97852 
							
						 
					 
					
						
						
							
							Attempt  #6  
						
						
						
						
					 
					
						2013-10-28 23:30:42 -06:00 
						 
				 
			
				
					
						
							
							
								Godwin 
							
						 
					 
					
						
						
						
						
							
						
						
							7a7fbc62c6 
							
						 
					 
					
						
						
							
							Attempt  #5  
						
						
						
						
					 
					
						2013-10-28 23:27:42 -06:00 
						 
				 
			
				
					
						
							
							
								Godwin 
							
						 
					 
					
						
						
						
						
							
						
						
							0cc81bf38d 
							
						 
					 
					
						
						
							
							Attempt  #5  
						
						
						
						
					 
					
						2013-10-28 23:27:02 -06:00 
						 
				 
			
				
					
						
							
							
								Godwin 
							
						 
					 
					
						
						
						
						
							
						
						
							212d8e1294 
							
						 
					 
					
						
						
							
							Attempt  #4  
						
						
						
						
					 
					
						2013-10-28 23:23:57 -06:00 
						 
				 
			
				
					
						
							
							
								Godwin 
							
						 
					 
					
						
						
						
						
							
						
						
							86d92b7559 
							
						 
					 
					
						
						
							
							Turning off config.assets.initialize_on_precompile  
						
						
						
						
					 
					
						2013-10-28 23:22:19 -06:00 
						 
				 
			
				
					
						
							
							
								Godwin 
							
						 
					 
					
						
						
						
						
							
						
						
							40f3f7fd0c 
							
						 
					 
					
						
						
							
							Attempt  #2  
						
						
						
						
					 
					
						2013-10-28 23:17:45 -06:00 
						 
				 
			
				
					
						
							
							
								Godwin 
							
						 
					 
					
						
						
						
						
							
						
						
							7a556ee126 
							
						 
					 
					
						
						
							
							Attempting to fix heroku not serving static assets  
						
						
						
						
					 
					
						2013-10-28 23:15:59 -06:00 
						 
				 
			
				
					
						
							
							
								Godwin 
							
						 
					 
					
						
						
						
						
							
						
						
							693dcc31aa 
							
						 
					 
					
						
						
							
							Looking a little more like a real site  
						
						
						
						
					 
					
						2013-10-27 19:07:56 -06:00 
						 
				 
			
				
					
						
							
							
								Godwin 
							
						 
					 
					
						
						
						
						
							
						
						
							5681ff1dc5 
							
						 
					 
					
						
						
							
							Foundation is now functional  
						
						
						
						
					 
					
						2013-10-26 19:08:31 -06:00 
						 
				 
			
				
					
						
							
							
								Godwin 
							
						 
					 
					
						
						
						
						
							
						
						
							25664fe55d 
							
						 
					 
					
						
						
							
							Removed Bootstrap and converted to scss  
						
						
						
						
					 
					
						2013-10-26 18:40:06 -06:00 
						 
				 
			
				
					
						
							
							
								Godwin 
							
						 
					 
					
						
						
						
						
							
						
						
							8df05b288f 
							
						 
					 
					
						
						
							
							added thin  
						
						
						
						
					 
					
						2013-10-20 20:54:52 -06:00 
						 
				 
			
				
					
						
							
							
								Godwin 
							
						 
					 
					
						
						
						
						
							
						
						
							7aee52c54b 
							
						 
					 
					
						
						
							
							Added compass  
						
						
						
						
					 
					
						2013-10-20 20:43:11 -06:00 
						 
				 
			
				
					
						
							
							
								Godwin 
							
						 
					 
					
						
						
						
						
							
						
						
							99965c0819 
							
						 
					 
					
						
						
							
							Readded the ruby racer  
						
						
						
						
					 
					
						2013-10-20 20:41:05 -06:00 
						 
				 
			
				
					
						
							
							
								Godwin 
							
						 
					 
					
						
						
						
						
							
						
						
							3f0ed58b70 
							
						 
					 
					
						
						
							
							???  
						
						
						
						
					 
					
						2013-10-20 20:37:29 -06:00