Godwin 
							
						 
					 
					
						
						
						
						
							
						
						
							dd3caa1161 
							
						 
					 
					
						
						
							
							A small fix  
						
						
						
						
					 
					
						2014-07-06 20:02:15 -06:00 
						 
				 
			
				
					
						
							
							
								Godwin 
							
						 
					 
					
						
						
						
						
							
						
						
							a3468274ff 
							
						 
					 
					
						
						
							
							A small fix  
						
						
						
						
					 
					
						2014-07-06 19:41:44 -06:00 
						 
				 
			
				
					
						
							
							
								Godwin 
							
						 
					 
					
						
						
						
						
							
						
						
							18b0cd72be 
							
						 
					 
					
						
						
							
							A small fix  
						
						
						
						
					 
					
						2014-07-06 19:37:57 -06:00 
						 
				 
			
				
					
						
							
							
								Godwin 
							
						 
					 
					
						
						
						
						
							
						
						
							d171b90c2f 
							
						 
					 
					
						
						
							
							A small fix  
						
						
						
						
					 
					
						2014-07-06 19:34:27 -06:00 
						 
				 
			
				
					
						
							
							
								Godwin 
							
						 
					 
					
						
						
						
						
							
						
						
							2b8d2638b7 
							
						 
					 
					
						
						
							
							A small fix  
						
						
						
						
					 
					
						2014-07-06 19:30:56 -06:00 
						 
				 
			
				
					
						
							
							
								Godwin 
							
						 
					 
					
						
						
						
						
							
						
						
							1c64a02ffc 
							
						 
					 
					
						
						
							
							A small fix  
						
						
						
						
					 
					
						2014-07-06 19:27:38 -06:00 
						 
				 
			
				
					
						
							
							
								Godwin 
							
						 
					 
					
						
						
						
						
							
						
						
							1794adaf98 
							
						 
					 
					
						
						
							
							A small fix  
						
						
						
						
					 
					
						2014-07-06 19:25:31 -06:00 
						 
				 
			
				
					
						
							
							
								Godwin 
							
						 
					 
					
						
						
						
						
							
						
						
							de1ece59a0 
							
						 
					 
					
						
						
							
							A small fix  
						
						
						
						
					 
					
						2014-07-06 19:21:26 -06:00 
						 
				 
			
				
					
						
							
							
								Godwin 
							
						 
					 
					
						
						
						
						
							
						
						
							ca301f9876 
							
						 
					 
					
						
						
							
							A small fix  
						
						
						
						
					 
					
						2014-07-06 19:19:16 -06:00 
						 
				 
			
				
					
						
							
							
								Godwin 
							
						 
					 
					
						
						
						
						
							
						
						
							d5de21429e 
							
						 
					 
					
						
						
							
							Regenerate images rake task (fix)  
						
						
						
						
					 
					
						2014-07-06 19:12:44 -06:00 
						 
				 
			
				
					
						
							
							
								Godwin 
							
						 
					 
					
						
						
						
						
							
						
						
							e204ef039f 
							
						 
					 
					
						
						
							
							Regenerate images rake task  
						
						
						
						
					 
					
						2014-07-06 19:09:52 -06:00 
						 
				 
			
				
					
						
							
							
								Godwin 
							
						 
					 
					
						
						
						
						
							
						
						
							1907122880 
							
						 
					 
					
						
						
							
							A lot of updates so far today...  
						
						
						
						
					 
					
						2014-07-06 19:02:23 -06:00 
						 
				 
			
				
					
						
							
							
								Godwin 
							
						 
					 
					
						
						
						
						
							
						
						
							546f1d4cbd 
							
						 
					 
					
						
						
							
							Fixes for orgs-json  
						
						
						
						
					 
					
						2014-07-05 17:17:47 -06:00 
						 
				 
			
				
					
						
							
							
								Godwin 
							
						 
					 
					
						
						
						
						
							
						
						
							73b0893b71 
							
						 
					 
					
						
						
							
							Testing...  
						
						
						
						
					 
					
						2014-07-05 14:49:50 -06:00 
						 
				 
			
				
					
						
							
							
								Godwin 
							
						 
					 
					
						
						
						
						
							
						
						
							2b319fe94b 
							
						 
					 
					
						
						
							
							Asset pipeline change  
						
						
						
						
					 
					
						2014-07-05 14:45:55 -06:00 
						 
				 
			
				
					
						
							
							
								Godwin 
							
						 
					 
					
						
						
						
						
							
						
						
							853aa63df0 
							
						 
					 
					
						
						
							
							Another test  
						
						
						
						
					 
					
						2014-07-05 14:32:21 -06:00 
						 
				 
			
				
					
						
							
							
								Godwin 
							
						 
					 
					
						
						
						
						
							
						
						
							7663917dfe 
							
						 
					 
					
						
						
							
							a TEST  
						
						
						
						
					 
					
						2014-07-05 14:22:07 -06:00 
						 
				 
			
				
					
						
							
							
								Godwin 
							
						 
					 
					
						
						
						
						
							
						
						
							200f3ad723 
							
						 
					 
					
						
						
							
							Conference select issue  
						
						
						
						
					 
					
						2014-07-05 14:15:25 -06:00 
						 
				 
			
				
					
						
							
							
								Godwin 
							
						 
					 
					
						
						
						
						
							
						
						
							c40a7b65ba 
							
						 
					 
					
						
						
							
							Gemfile change  
						
						
						
						
					 
					
						2014-07-05 11:13:41 -06:00 
						 
				 
			
				
					
						
							
							
								Godwin 
							
						 
					 
					
						
						
						
						
							
						
						
							f66f456cc4 
							
						 
					 
					
						
						
							
							New look  
						
						
						
						
					 
					
						2014-07-05 10:27:49 -06:00 
						 
				 
			
				
					
						
							
							
								momoko saunders 
							
						 
					 
					
						
						
						
						
							
						
						
							a04a72d776 
							
						 
					 
					
						
						
							
							Add the default cucumber bootstrap files  
						
						
						
						
					 
					
						2014-06-11 19:47:29 -07:00 
						 
				 
			
				
					
						
							
							
								momoko saunders 
							
						 
					 
					
						
						
						
						
							
						
						
							4c7a1f84bd 
							
						 
					 
					
						
						
							
							Add cucumber to the Gemfile  
						
						
						
						
					 
					
						2014-06-11 19:39:35 -07:00 
						 
				 
			
				
					
						
							
							
								momoko saunders 
							
						 
					 
					
						
						
						
						
							
						
						
							d2290af3db 
							
						 
					 
					
						
						
							
							Add platforms to the Gemfile  
						
						
						
						
					 
					
						2014-06-11 19:38:00 -07:00 
						 
				 
			
				
					
						
							
							
								Godwin 
							
						 
					 
					
						
						
						
						
							
						
						
							930aa130d6 
							
						 
					 
					
						
						
							
							Preparing for deployment to new server  
						
						
						
						
					 
					
						2014-06-02 18:45:26 -06:00 
						 
				 
			
				
					
						
							
							
								Godwin 
							
						 
					 
					
						
						
						
						
							
						
						
							8bcc1852b5 
							
						 
					 
					
						
						
							
							Migrations complete  
						
						
						
						
					 
					
						2014-06-01 11:28:15 -06:00 
						 
				 
			
				
					
						
							
							
								Godwin 
							
						 
					 
					
						
						
						
						
							
						
						
							87fbd50af1 
							
						 
					 
					
						
						
							
							Changed default port and added migration tasks  
						
						
						
						
					 
					
						2014-05-26 18:01:28 -06:00 
						 
				 
			
				
					
						
							
							
								Godwin 
							
						 
					 
					
						
						
						
						
							
						
						
							8caad2a009 
							
						 
					 
					
						
						
							
							Merging with wotk done in PDX  
						
						
						
						
					 
					
						2014-05-22 19:10:30 -06:00 
						 
				 
			
				
					
						
							
							
								Godwin 
							
						 
					 
					
						
						
						
						
							
						
						
							f7809518aa 
							
						 
					 
					
						
						
							
							Merging with wotk done in PDX  
						
						
						
						
					 
					
						2014-05-22 19:08:41 -06:00 
						 
				 
			
				
					
						
							
							
								G0dwin 
							
						 
					 
					
						
						
						
						
							
						
						
							4f448df63a 
							
						 
					 
					
						
						
							
							Tests fixed  
						
						
						
						
					 
					
						2014-05-17 19:00:39 -06:00 
						 
				 
			
				
					
						
							
							
								G0dwin 
							
						 
					 
					
						
						
						
						
							
						
						
							f6b39ea93f 
							
						 
					 
					
						
						
							
							User login error fixed  
						
						
						
						
					 
					
						2014-05-17 18:25:43 -06:00 
						 
				 
			
				
					
						
							
							
								G0dwin 
							
						 
					 
					
						
						
						
						
							
						
						
							20c9791f52 
							
						 
					 
					
						
						
							
							User login error fixed  
						
						
						
						
					 
					
						2014-05-17 18:20:13 -06:00 
						 
				 
			
				
					
						
							
							
								Graham Kaplan 
							
						 
					 
					
						
						
						
						
							
						
						
							3d9650f531 
							
						 
					 
					
						
						
							
							Fix gemfile for openshift  
						
						
						
						
					 
					
						2014-05-17 16:31:10 -07:00 
						 
				 
			
				
					
						
							
							
								Graham Kaplan 
							
						 
					 
					
						
						
						
						
							
						
						
							a2f2f630a4 
							
						 
					 
					
						
						
							
							Add OpenShift hooks  
						
						
						
						
					 
					
						2014-05-17 13:34:42 -07:00 
						 
				 
			
				
					
						
							
							
								G0dwin 
							
						 
					 
					
						
						
						
						
							
						
						
							e5bf3f5a5c 
							
						 
					 
					
						
						
							
							Fixed a problem preventing login  
						
						
						
						
					 
					
						2014-05-17 12:54:39 -06:00 
						 
				 
			
				
					
						
							
							
								Godwin 
							
						 
					 
					
						
						
						
						
							
						
						
							ffa8239e42 
							
						 
					 
					
						
						
							
							Moved form helpers from application_helper to a real FormHelper  
						
						
						
						
					 
					
						2014-05-12 20:09:19 -06:00 
						 
				 
			
				
					
						
							
							
								Godwin 
							
						 
					 
					
						
						
						
						
							
						
						
							9ae7135c6a 
							
						 
					 
					
						
						
							
							Trying to fix travis errors  
						
						
						
						
					 
					
						2014-05-04 21:21:55 -06:00 
						 
				 
			
				
					
						
							
							
								Godwin 
							
						 
					 
					
						
						
						
						
							
						
						
							b004b7b7d0 
							
						 
					 
					
						
						
							
							Custom password hashing for migrating data  
						
						
						
						
					 
					
						2014-05-04 21:13:05 -06:00 
						 
				 
			
				
					
						
							
							
								Godwin 
							
						 
					 
					
						
						
						
						
							
						
						
							9516ce11ab 
							
						 
					 
					
						
						
							
							Custom password hashing for migrating data  
						
						
						
						
					 
					
						2014-05-04 21:02:49 -06:00 
						 
				 
			
				
					
						
							
							
								Godwin 
							
						 
					 
					
						
						
						
						
							
						
						
							7a768068ec 
							
						 
					 
					
						
						
							
							Custom password hashing for migrating data  
						
						
						
						
					 
					
						2014-05-04 21:01:27 -06:00 
						 
				 
			
				
					
						
							
							
								Godwin 
							
						 
					 
					
						
						
						
						
							
						
						
							1aee8c09da 
							
						 
					 
					
						
						
							
							Translation migrations  
						
						
						
						
					 
					
						2014-05-04 15:39:08 -06:00 
						 
				 
			
				
					
						
							
							
								Godwin 
							
						 
					 
					
						
						
						
						
							
						
						
							f5c7cca626 
							
						 
					 
					
						
						
							
							Translations  
						
						
						
						
					 
					
						2014-05-04 15:33:59 -06:00 
						 
				 
			
				
					
						
							
							
								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