Godwin 
							
						 
					 
					
						
						
						
						
							
						
						
							c474d0be1a 
							
						 
					 
					
						
						
							
							Restyled workshop previews and added interest buttons to home page  
						
						
						
						
					 
					
						2016-07-17 13:20:41 -07:00 
						 
				 
			
				
					
						
							
							
								Godwin 
							
						 
					 
					
						
						
						
						
							
						
						
							22b7dc2129 
							
						 
					 
					
						
						
							
							Contact us page and popup  
						
						
						
						
					 
					
						2016-07-09 23:29:46 -07:00 
						 
				 
			
				
					
						
							
							
								Godwin 
							
						 
					 
					
						
						
						
						
							
						
						
							c6f8d4ed58 
							
						 
					 
					
						
						
							
							Added comments  
						
						
						
						
					 
					
						2016-07-09 15:25:27 -07:00 
						 
				 
			
				
					
						
							
							
								Godwin 
							
						 
					 
					
						
						
						
						
							
						
						
							26f9dfde89 
							
						 
					 
					
						
						
							
							Schedule maker, stats, and minor fixes  
						
						
						
						
					 
					
						2016-07-05 22:40:53 -07:00 
						 
				 
			
				
					
						
							
							
								Godwin 
							
						 
					 
					
						
						
						
						
							
						
						
							b719b2c8ef 
							
						 
					 
					
						
						
							
							Added semi-functional administration pages  
						
						
						
						
					 
					
						2016-06-22 00:04:57 -07:00 
						 
				 
			
				
					
						
							
							
								Godwin 
							
						 
					 
					
						
						
						
						
							
						
						
							30954e7907 
							
						 
					 
					
						
						
							
							Updated interest buttons to use ajax instead of a round-trip post  
						
						
						
						
					 
					
						2016-06-11 16:45:22 -07:00 
						 
				 
			
				
					
						
							
							
								Godwin 
							
						 
					 
					
						
						
						
						
							
						
						
							718d77a3fc 
							
						 
					 
					
						
						
							
							Added confirmation modals, fixed reply to emails, and added premailer  
						
						
						
						
					 
					
						2016-06-10 18:57:10 -07:00 
						 
				 
			
				
					
						
							
							
								Godwin 
							
						 
					 
					
						
						
						
						
							
						
						
							7a7bb7b579 
							
						 
					 
					
						
						
							
							Resoved issues for managing workshop facilitators  
						
						
						
						
					 
					
						2016-06-05 12:45:02 -07:00 
						 
				 
			
				
					
						
							
							
								Godwin 
							
						 
					 
					
						
						
						
						
							
						
						
							633219b003 
							
						 
					 
					
						
						
							
							Fixed workshop saving  
						
						
						
						
					 
					
						2016-06-03 23:01:33 -07:00 
						 
				 
			
				
					
						
							
							
								Godwin 
							
						 
					 
					
						
						
						
						
							
						
						
							dfdb44b5ae 
							
						 
					 
					
						
						
							
							Fixed broken workshop links and fixed awkward styles  
						
						
						
						
					 
					
						2016-06-03 17:23:32 -07:00 
						 
				 
			
				
					
						
							
							
								Godwin 
							
						 
					 
					
						
						
						
						
							
						
						
							844fe3d467 
							
						 
					 
					
						
						
							
							Fixed facbook login and added missing page titiles  
						
						
						
						
					 
					
						2016-06-01 17:15:02 -07:00 
						 
				 
			
				
					
						
							
							
								Godwin 
							
						 
					 
					
						
						
						
						
							
						
						
							c8d6140ed8 
							
						 
					 
					
						
						
							
							Pre registration  
						
						
						
						
					 
					
						2016-05-30 18:24:07 -07:00 
						 
				 
			
				
					
						
							
							
								Godwin 
							
						 
					 
					
						
						
						
						
							
						
						
							1bf6faf54b 
							
						 
					 
					
						
						
							
							Fixed deployment and added Spanish translations  
						
						
						
						
					 
					
						2016-05-21 14:02:22 -07:00 
						 
				 
			
				
					
						
							
							
								Godwin 
							
						 
					 
					
						
						
						
						
							
						
						
							5d25e09bc4 
							
						 
					 
					
						
						
							
							2016 design  
						
						
						
						
					 
					
						2016-05-09 21:45:23 -07:00 
						 
				 
			
				
					
						
							
							
								Godwin 
							
						 
					 
					
						
						
						
						
							
						
						
							bc80c09938 
							
						 
					 
					
						
						
							
							Schedules!  
						
						
						
						
					 
					
						2015-09-26 20:05:55 -07:00 
						 
				 
			
				
					
						
							
							
								Godwin 
							
						 
					 
					
						
						
						
						
							
						
						
							2fdfc57c49 
							
						 
					 
					
						
						
							
							Fix for workshop translation permissions  
						
						
						
						
					 
					
						2015-09-21 19:24:52 -07:00 
						 
				 
			
				
					
						
							
							
								Godwin 
							
						 
					 
					
						
						
						
						
							
						
						
							0ffee810dd 
							
						 
					 
					
						
						
							
							Workshop facilitators  
						
						
						
						
					 
					
						2015-09-19 16:30:39 -07:00 
						 
				 
			
				
					
						
							
							
								Godwin 
							
						 
					 
					
						
						
						
						
							
						
						
							01d8679c9d 
							
						 
					 
					
						
						
							
							Added localization to workshops, made login persist through subdomains  
						
						
						
						
					 
					
						2015-09-14 21:16:22 -07:00 
						 
				 
			
				
					
						
							
							
								Godwin 
							
						 
					 
					
						
						
						
						
							
						
						
							a63b5e1dc2 
							
						 
					 
					
						
						
							
							Allow conference hosts to edit workshops  
						
						
						
						
					 
					
						2015-09-13 19:05:56 -07:00 
						 
				 
			
				
					
						
							
							
								Godwin 
							
						 
					 
					
						
						
						
						
							
						
						
							a0fbbc9f4f 
							
						 
					 
					
						
						
							
							Workshop interest  
						
						
						
						
					 
					
						2015-09-13 18:30:50 -07:00 
						 
				 
			
				
					
						
							
							
								Godwin 
							
						 
					 
					
						
						
						
						
							
						
						
							a0e8563d9d 
							
						 
					 
					
						
						
							
							Registration thank you email and proposed workshops on front page  
						
						
						
						
					 
					
						2015-09-11 17:31:14 -07:00 
						 
				 
			
				
					
						
							
							
								Godwin 
							
						 
					 
					
						
						
						
						
							
						
						
							c3aec0b71e 
							
						 
					 
					
						
						
							
							Almost ready to merge  
						
						
						
						
					 
					
						2015-08-18 22:18:29 -07:00 
						 
				 
			
				
					
						
							
							
								Godwin 
							
						 
					 
					
						
						
						
						
							
						
						
							9da5f6a223 
							
						 
					 
					
						
						
							
							Registration working until workshops  
						
						
						
						
					 
					
						2015-08-04 21:54:04 -07:00 
						 
				 
			
				
					
						
							
							
								Godwin 
							
						 
					 
					
						
						
						
						
							
						
						
							d151e37e2e 
							
						 
					 
					
						
						
							
							Adding preview environment  
						
						
						
						
					 
					
						2015-05-02 17:41:41 -07:00 
						 
				 
			
				
					
						
							
							
								Godwin 
							
						 
					 
					
						
						
						
						
							
						
						
							14205f4586 
							
						 
					 
					
						
						
							
							Updates from the past fortnight  
						
						
						
						
					 
					
						2015-04-14 19:41:46 -07:00 
						 
				 
			
				
					
						
							
							
								Godwin 
							
						 
					 
					
						
						
						
						
							
						
						
							e476457ea3 
							
						 
					 
					
						
						
							
							Updated style and layout  
						
						
						
						
					 
					
						2015-03-17 20:29:17 -07:00 
						 
				 
			
				
					
						
							
							
								Godwin 
							
						 
					 
					
						
						
						
						
							
						
						
							1430e505a0 
							
						 
					 
					
						
						
							
							Paypal Registration  
						
						
						
						
					 
					
						2014-07-24 00:16:33 -06:00 
						 
				 
			
				
					
						
							
							
								Godwin 
							
						 
					 
					
						
						
						
						
							
						
						
							1efe20fe42 
							
						 
					 
					
						
						
							
							Fixed merge conflicts  
						
						
						
						
					 
					
						2014-07-18 20:35:15 -06:00 
						 
				 
			
				
					
						
							
							
								Godwin 
							
						 
					 
					
						
						
						
						
							
						
						
							f66f456cc4 
							
						 
					 
					
						
						
							
							New look  
						
						
						
						
					 
					
						2014-07-05 10:27:49 -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 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
						 
				 
			
				
					
						
							
							
								Godwin 
							
						 
					 
					
						
						
						
						
							
						
						
							fda5646974 
							
						 
					 
					
						
						
							
							Testing tests  
						
						
						
						
					 
					
						2014-03-23 13:31:08 -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 
							
						 
					 
					
						
						
						
						
							
						
						
							96bc841e7b 
							
						 
					 
					
						
						
							
							The working basics  
						
						
						
						
					 
					
						2014-03-09 15:06:26 -06:00 
						 
				 
			
				
					
						
							
							
								Godwin 
							
						 
					 
					
						
						
						
						
							
						
						
							db60933506 
							
						 
					 
					
						
						
							
							The working basics  
						
						
						
						
					 
					
						2014-03-09 14:43:33 -06:00