Godwin
							
						 
					 | 
					
						
						
						
						
							
						
						
							5d25e09bc4
							
						
					 | 
					
						
						
							
							2016 design
						
						
						
						
						
						
					 | 
					
						2016-05-09 21:45:23 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Godwin
							
						 
					 | 
					
						
						
						
						
							
						
						
							a83bd6e800
							
						
					 | 
					
						
						
							
							Removed old files and fixed asset precompilation
						
						
						
						
						
						
					 | 
					
						2016-01-17 16:50:46 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Godwin
							
						 
					 | 
					
						
						
						
						
							
						
						
							5dbe43f42d
							
						
					 | 
					
						
						
							
							[merge]
						
						
						
						
						
						
					 | 
					
						2016-01-17 11:48:23 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Godwin
							
						 
					 | 
					
						
						
						
						
							
						
						
							cefb648699
							
						
					 | 
					
						
						
							
							Fixed assets issues
						
						
						
						
						
						
					 | 
					
						2016-01-16 22:24:20 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Godwin
							
						 
					 | 
					
						
						
						
						
							
						
						
							851ac53f09
							
						
					 | 
					
						
						
							
							Minor fixes for show schedule page
						
						
						
						
						
						
					 | 
					
						2015-09-27 08:07:14 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Godwin
							
						 
					 | 
					
						
						
						
						
							
						
						
							bec2e73fa7
							
						
					 | 
					
						
						
							
							Not interested opacity fix
						
						
						
						
						
						
					 | 
					
						2015-09-26 20:34:17 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Godwin
							
						 
					 | 
					
						
						
						
						
							
						
						
							bc80c09938
							
						
					 | 
					
						
						
							
							Schedules!
						
						
						
						
						
						
					 | 
					
						2015-09-26 20:05:55 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Godwin
							
						 
					 | 
					
						
						
						
						
							
						
						
							3998a9ed4f
							
						
					 | 
					
						
						
							
							Fix for + button
						
						
						
						
						
						
					 | 
					
						2015-09-21 19:48:34 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Godwin
							
						 
					 | 
					
						
						
						
						
							
						
						
							0ffee810dd
							
						
					 | 
					
						
						
							
							Workshop facilitators
						
						
						
						
						
						
					 | 
					
						2015-09-19 16:30:39 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Godwin
							
						 
					 | 
					
						
						
						
						
							
						
						
							438e2ebfdf
							
						
					 | 
					
						
						
							
							Style updates for workshops
						
						
						
						
						
						
					 | 
					
						2015-09-18 16:28:01 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Godwin
							
						 
					 | 
					
						
						
						
						
							
						
						
							01d8679c9d
							
						
					 | 
					
						
						
							
							Added localization to workshops, made login persist through subdomains
						
						
						
						
						
						
					 | 
					
						2015-09-14 21:16:22 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Godwin
							
						 
					 | 
					
						
						
						
						
							
						
						
							a0fbbc9f4f
							
						
					 | 
					
						
						
							
							Workshop interest
						
						
						
						
						
						
					 | 
					
						2015-09-13 18:30:50 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Godwin
							
						 
					 | 
					
						
						
						
						
							
						
						
							bbee04dce5
							
						
					 | 
					
						
						
							
							Default conference images
						
						
						
						
						
						
					 | 
					
						2015-09-12 19:23:31 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Godwin
							
						 
					 | 
					
						
						
						
						
							
						
						
							a0e8563d9d
							
						
					 | 
					
						
						
							
							Registration thank you email and proposed workshops on front page
						
						
						
						
						
						
					 | 
					
						2015-09-11 17:31:14 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Godwin
							
						 
					 | 
					
						
						
						
						
							
						
						
							f33e15c6e6
							
						
					 | 
					
						
						
							
							Added skip button to payment page
						
						
						
						
						
						
					 | 
					
						2015-09-09 21:36:14 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Godwin
							
						 
					 | 
					
						
						
						
						
							
						
						
							f949278df0
							
						
					 | 
					
						
						
							
							Fix for login failures, better translation previews
						
						
						
						
						
						
					 | 
					
						2015-09-09 20:27:58 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Godwin
							
						 
					 | 
					
						
						
						
						
							
						
						
							83986fe51c
							
						
					 | 
					
						
						
							
							Email testing support, added Gemfile.lock and compiled bumbleberry assets to gitignore.
						
						
						
						
						
						
					 | 
					
						2015-09-07 12:25:17 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Godwin
							
						 
					 | 
					
						
						
						
						
							
						
						
							5429aa3e71
							
						
					 | 
					
						
						
							
							More translation improvements
						
						
						
						
						
						
					 | 
					
						2015-09-01 21:54:53 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Godwin
							
						 
					 | 
					
						
						
						
						
							
						
						
							dcfdc5e5ad
							
						
					 | 
					
						
						
							
							Translation improvements
						
						
						
						
						
						
					 | 
					
						2015-09-01 20:50:45 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Godwin
							
						 
					 | 
					
						
						
						
						
							
						
						
							e2af723370
							
						
					 | 
					
						
						
							
							Upgraded z-index of translation control so it is viewable on mobile
						
						
						
						
						
						
					 | 
					
						2015-08-31 15:53:57 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Godwin
							
						 
					 | 
					
						
						
						
						
							
						
						
							db4af3ff77
							
						
					 | 
					
						
						
							
							Added conference edit page
						
						
						
						
						
						
					 | 
					
						2015-08-30 21:31:09 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Godwin
							
						 
					 | 
					
						
						
						
						
							
						
						
							988acc4c7c
							
						
					 | 
					
						
						
							
							Translation control updates
						
						
						
						
						
						
					 | 
					
						2015-08-30 17:54:31 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Godwin
							
						 
					 | 
					
						
						
						
						
							
						
						
							81602650ea
							
						
					 | 
					
						
						
							
							Do not compile translations.scss directly
						
						
						
						
						
						
					 | 
					
						2015-08-30 14:46:36 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Godwin
							
						 
					 | 
					
						
						
						
						
							
						
						
							1dbadfb375
							
						
					 | 
					
						
						
							
							Made application.scss not compilable
						
						
						
						
						
						
					 | 
					
						2015-08-30 13:13:03 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Godwin
							
						 
					 | 
					
						
						
						
						
							
						
						
							4f14f53b7a
							
						
					 | 
					
						
						
							
							Made application.scss not compile directly
						
						
						
						
						
						
					 | 
					
						2015-08-30 11:04:29 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Godwin
							
						 
					 | 
					
						
						
						
						
							
						
						
							43ab36071b
							
						
					 | 
					
						
						
							
							Ready to merge
						
						
						
						
						
						
					 | 
					
						2015-08-21 19:29:43 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Godwin
							
						 
					 | 
					
						
						
						
						
							
						
						
							8a05ac6e31
							
						
					 | 
					
						
						
							
							Fixed IE issue and finished English translations
						
						
						
						
						
						
					 | 
					
						2015-08-19 21:49:45 -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
							
						 
					 | 
					
						
						
						
						
							
						
						
							b01ecefd76
							
						
					 | 
					
						
						
							
							Fixed default-shadow mixin
						
						
						
						
						
						
					 | 
					
						2015-05-02 11:47:47 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Godwin
							
						 
					 | 
					
						
						
						
						
							
						
						
							14205f4586
							
						
					 | 
					
						
						
							
							Updates from the past fortnight
						
						
						
						
						
						
					 | 
					
						2015-04-14 19:41:46 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Godwin
							
						 
					 | 
					
						
						
						
						
							
						
						
							37ee6cfee7
							
						
					 | 
					
						
						
							
							Updates styles, translations page, links, etc
						
						
						
						
						
						
					 | 
					
						2015-04-01 18:02:51 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Godwin
							
						 
					 | 
					
						
						
						
						
							
						
						
							e476457ea3
							
						
					 | 
					
						
						
							
							Updated style and layout
						
						
						
						
						
						
					 | 
					
						2015-03-17 20:29:17 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Godwin
							
						 
					 | 
					
						
						
						
						
							
						
						
							caac48c3c0
							
						
					 | 
					
						
						
							
							Added some files
						
						
						
						
						
						
					 | 
					
						2014-12-18 21:36:26 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Godwin
							
						 
					 | 
					
						
						
						
						
							
						
						
							f28a6b3ed8
							
						
					 | 
					
						
						
							
							Working on a bunch of new changes
						
						
						
						
						
						
					 | 
					
						2014-12-18 21:29:53 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Godwin
							
						 
					 | 
					
						
						
						
						
							
						
						
							f3219e268f
							
						
					 | 
					
						
						
							
							Registrations page fix
						
						
						
						
						
						
					 | 
					
						2014-07-27 23:48:13 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Godwin
							
						 
					 | 
					
						
						
						
						
							
						
						
							fe107076af
							
						
					 | 
					
						
						
							
							Registrations page
						
						
						
						
						
						
					 | 
					
						2014-07-27 23:14:54 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Godwin
							
						 
					 | 
					
						
						
						
						
							
						
						
							5b300a016c
							
						
					 | 
					
						
						
							
							Workshop test 2.
						
						
						
						
						
						
					 | 
					
						2014-07-27 13:09:40 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Godwin
							
						 
					 | 
					
						
						
						
						
							
						
						
							cfcf41c766
							
						
					 | 
					
						
						
							
							Just a minor spacing issue
						
						
						
						
						
						
					 | 
					
						2014-07-25 00:04:42 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Godwin
							
						 
					 | 
					
						
						
						
						
							
						
						
							534b9303e9
							
						
					 | 
					
						
						
							
							Paypal is now working
						
						
						
						
						
						
					 | 
					
						2014-07-24 21:12:39 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Godwin
							
						 
					 | 
					
						
						
						
						
							
						
						
							ebe1c56f10
							
						
					 | 
					
						
						
							
							Another attempt to fix font-awesome
						
						
						
						
						
						
					 | 
					
						2014-07-24 01:47:52 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Godwin
							
						 
					 | 
					
						
						
						
						
							
						
						
							09b27f3881
							
						
					 | 
					
						
						
							
							Another attempt to fix font-awesome
						
						
						
						
						
						
					 | 
					
						2014-07-24 01:45:28 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Godwin
							
						 
					 | 
					
						
						
						
						
							
						
						
							733ef94f44
							
						
					 | 
					
						
						
							
							Another attempt to fix font-awesome
						
						
						
						
						
						
					 | 
					
						2014-07-24 01:38:56 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Godwin
							
						 
					 | 
					
						
						
						
						
							
						
						
							015602d720
							
						
					 | 
					
						
						
							
							Attempting to fix font-awesome
						
						
						
						
						
						
					 | 
					
						2014-07-24 01:35:37 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Godwin
							
						 
					 | 
					
						
						
						
						
							
						
						
							971a8bb625
							
						
					 | 
					
						
						
							
							Font Awesome issue
						
						
						
						
						
						
					 | 
					
						2014-07-24 00:36:16 -06: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
							
						 
					 | 
					
						
						
						
						
							
						
						
							e64eb1f153
							
						
					 | 
					
						
						
							
							Analytics and jquery fallback
						
						
						
						
						
						
					 | 
					
						2014-07-13 21:27:59 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Godwin
							
						 
					 | 
					
						
						
						
						
							
						
						
							752c1d8f11
							
						
					 | 
					
						
						
							
							Fix for sidebar list
						
						
						
						
						
						
					 | 
					
						2014-07-13 17:47:04 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Godwin
							
						 
					 | 
					
						
						
						
						
							
						
						
							62b0bea131
							
						
					 | 
					
						
						
							
							Minor adjustments
						
						
						
						
						
						
					 | 
					
						2014-07-13 17:23:28 -06:00 | 
					
					
						
						
							
							
							
						
					 |