brett
							
						 | 
						
							
							
							
							
							
								
							
							
								de4f11878b
								
							
						 | 
						
							
							
								
								Merge from upstream/master
							
							
							
							
							
						 | 
						
							2017-10-04 17:55:34 +01:00 | 
						
					
				
					
						
							
							
								 
								brett
							
						 | 
						
							
							
							
							
							
								
							
							
								bd87789d88
								
							
						 | 
						
							
							
								
								Temp commit for register feature
							
							
							
							
							
						 | 
						
							2017-10-04 17:31:16 +01:00 | 
						
					
				
					
						
							
							
								
								 Oliver Marks
							
						 | 
						
							
							
							
							
							
								
							
							
								c1ed938b04
								
							
						 | 
						
							
							
								
								Cleanup, and better handling in the cancellation flow more work to come
							
							
							
							
							
						 | 
						
							2017-10-01 23:16:32 +01:00 | 
						
					
				
					
						
							
							
								
								 Oliver Marks
							
						 | 
						
							
							
							
							
							
								
							
							
								e75fc35db1
								
							
						 | 
						
							
							
								
								Merge branch 'rfid'
							
							
							
							
							
						 | 
						
							2017-10-01 11:55:31 +01:00 | 
						
					
				
					
						
							
							
								 
								brett
							
						 | 
						
							
							
							
							
							
								
							
							
								849b9bdbb7
								
							
						 | 
						
							
							
								
								Requests list now also requires login
							
							
							
							
							
						 | 
						
							2017-09-23 10:24:40 +01:00 | 
						
					
				
					
						
							
							
								
								 Oliver Marks
							
						 | 
						
							
							
							
							
							
								
							
							
								574286e8e3
								
							
						 | 
						
							
							
								
								Fix duplicate records in membership table.
							
							
							
							
							
						 | 
						
							2017-09-17 10:50:09 +01:00 | 
						
					
				
					
						
							
							
								
								 Oliver Marks
							
						 | 
						
							
							
							
							
							
								
							
							
								4b3f57ea7e
								
							
						 | 
						
							
							
								
								refactored rfid model into user, started on user save form
							
							
							
							
							
						 | 
						
							2017-09-14 13:46:54 +01:00 | 
						
					
				
					
						
							
							
								 
								Oly
							
						 | 
						
							
							
							
							
							
								
							
							
								28e0cd8f94
								
							
						 | 
						
							
							
								
								Updated notifications and open grpah for forums and wiki, should now email new
							
							
							
							
							
							
							
							topics to the mailing list. 
							
						 | 
						
							2017-09-14 13:34:13 +01:00 | 
						
					
				
					
						
							
							
								
								 Oliver Marks
							
						 | 
						
							
							
							
							
							
								
							
							
								031a85c9ab
								
							
						 | 
						
							
							
								
								Merge branch 'matrix'
							
							
							
							
							
						 | 
						
							2017-09-12 19:56:05 +01:00 | 
						
					
				
					
						
							
							
								
								 Oliver Marks
							
						 | 
						
							
							
							
							
							
								
							
							
								79a8faf592
								
							
						 | 
						
							
							
								
								change from svg to png image for og:image meta tag
							
							
							
							
							
						 | 
						
							2017-09-12 19:48:59 +01:00 | 
						
					
				
					
						
							
							
								 
								Oly
							
						 | 
						
							
							
							
							
							
								
							
							
								985782a3f4
								
							
						 | 
						
							
							
								
								move meta tags outside block so they are always available
							
							
							
							
							
						 | 
						
							2017-09-12 13:49:09 +01:00 | 
						
					
				
					
						
							
							
								 
								Oly
							
						 | 
						
							
							
							
							
							
								
							
							
								97e8397d38
								
							
						 | 
						
							
							
								
								Added requests to admin area, added meta data to homepage.
							
							
							
							
							
						 | 
						
							2017-09-12 13:39:15 +01:00 | 
						
					
				
					
						
							
							
								 
								Sam Collins
							
						 | 
						
							
							
							
							
							
								
							
							
								da67d703a1
								
							
						 | 
						
							
							
								
								Fixed styling on home link
							
							
							
							
							
						 | 
						
							2017-09-06 17:35:11 +01:00 | 
						
					
				
					
						
							
							
								 
								Oly
							
						 | 
						
							
							
							
							
							
								
							
							
								fdef48041d
								
							
						 | 
						
							
							
								
								Added title, and changed layout
							
							
							
							
							
						 | 
						
							2017-09-06 14:03:02 +01:00 | 
						
					
				
					
						
							
							
								
								 Oliver Marks
							
						 | 
						
							
							
							
							
							
								
							
							
								fbaa7fb50d
								
							
						 | 
						
							
							
								
								implemented django wiki, created requests page, and added to nav
							
							
							
							
							
						 | 
						
							2017-09-05 20:07:48 +01:00 | 
						
					
				
					
						
							
							
								 
								Oly
							
						 | 
						
							
							
							
							
							
								
							
							
								c741232356
								
							
						 | 
						
							
							
								
								Update text on chat page explaining how to connect
							
							
							
							
							
						 | 
						
							2017-08-23 13:17:54 +01:00 | 
						
					
				
					
						
							
							
								
								 Oliver Marks
							
						 | 
						
							
							
							
							
							
								
							
							
								10039e0b0e
								
							
						 | 
						
							
							
								
								celery integration tasks now working, improved feed image variation rendering
							
							
							
							
							
						 | 
						
							2017-08-22 22:47:44 +01:00 | 
						
					
				
					
						
							
							
								 
								Oly
							
						 | 
						
							
							
							
							
							
								
							
							
								54e1bce190
								
							
						 | 
						
							
							
								
								change subscription mechanism to use new gocardless api
							
							
							
							
							
						 | 
						
							2017-08-14 14:00:59 +01:00 | 
						
					
				
					
						
							
							
								 
								Oly
							
						 | 
						
							
							
							
							
							
								
							
							
								3ca6cc4702
								
							
						 | 
						
							
							
								
								Fixes #133 Updated blurb on homepage, and amended the about page
							
							
							
							
							
						 | 
						
							2017-07-05 13:49:00 +01:00 | 
						
					
				
					
						
							
							
								
								 Oliver Marks
							
						 | 
						
							
							
							
							
							
								
							
							
								22cd6c2397
								
							
						 | 
						
							
							
								
								Add refresh subscription button to admin backend
							
							
							
							
							
						 | 
						
							2017-04-23 10:39:04 +01:00 | 
						
					
				
					
						
							
							
								
								 Oliver Marks
							
						 | 
						
							
							
							
							
							
								
							
							
								7737058f0f
								
							
						 | 
						
							
							
								
								fixes #96 you can now view users or members when clicking the tabs
							
							
							
							
							
						 | 
						
							2017-04-22 15:55:40 +01:00 | 
						
					
				
					
						
							
							
								 
								Sam Collins
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								488ea1ad4d
								
							
						 | 
						
							
							
								
								Added description for category on blog list and fixed single post
							
							
							
							
							
						 | 
						
							2017-03-29 20:27:51 +01:00 | 
						
					
				
					
						
							
							
								 
								Sam Collins
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								eb46f9fcb3
								
							
						 | 
						
							
							
								
								Switched to thumbnail images in post list view
							
							
							
							
							
						 | 
						
							2017-03-29 19:49:36 +01:00 | 
						
					
				
					
						
							
							
								 
								Sam Collins
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								c1f6d3f22e
								
							
						 | 
						
							
							
								
								Switched to class based views for blog
							
							
							
							
							
						 | 
						
							2017-03-22 23:47:14 +00:00 | 
						
					
				
					
						
							
							
								 
								Sam Collins
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								12e308e927
								
							
						 | 
						
							
							
								
								Updated Schema to include url for contact
							
							
							
							
							
						 | 
						
							2017-03-15 18:33:37 +00:00 | 
						
					
				
					
						
							
							
								 
								Sam Collins
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								423adfb7b6
								
							
						 | 
						
							
							
								
								Fixed missing div in footer
							
							
							
							
							
						 | 
						
							2017-03-15 17:49:44 +00:00 | 
						
					
				
					
						
							
							
								 
								Sam Collins
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								b31d6397e6
								
							
						 | 
						
							
							
								
								Improved page styling for members page
							
							
							
							
							
						 | 
						
							2017-03-15 09:01:42 +00:00 | 
						
					
				
					
						
							
							
								 
								Sam Collins
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								7a5d515661
								
							
						 | 
						
							
							
								
								Added fallback images to feed cards
							
							
							
							
							
						 | 
						
							2017-03-15 08:35:26 +00:00 | 
						
					
				
					
						
							
							
								
								 Oliver Marks
							
						 | 
						
							
							
							
							
							
								
							
							
								d690737753
								
							
						 | 
						
							
							
								
								some quick fixes for contact form, intro and members page
							
							
							
							
							
						 | 
						
							2017-03-07 19:54:43 +00:00 | 
						
					
				
					
						
							
							
								 
								Oly
							
						 | 
						
							
							
							
							
							
								
							
							
								de91937ab0
								
							
						 | 
						
							
							
								
								Update intro to resolve #53
							
							
							
							
							
						 | 
						
							2017-03-06 08:37:56 +00:00 | 
						
					
				
					
						
							
							
								
								 Oliver Marks
							
						 | 
						
							
							
							
							
							
								
							
							
								43d6a1ca62
								
							
						 | 
						
							
							
								
								made the banner text a link
							
							
							
							
							
						 | 
						
							2017-03-04 15:23:32 +00:00 | 
						
					
				
					
						
							
							
								 
								Oly
							
						 | 
						
							
							
							
							
							
								
							
							
								77e6d589c5
								
							
						 | 
						
							
							
								
								javascript analytics
							
							
							
							
							
						 | 
						
							2017-03-01 13:15:56 +00:00 | 
						
					
				
					
						
							
							
								 
								Oly
							
						 | 
						
							
							
							
							
							
								
							
							
								3882979af0
								
							
						 | 
						
							
							
								
								add in basic analytics
							
							
							
							
							
						 | 
						
							2017-03-01 09:01:26 +00:00 | 
						
					
				
					
						
							
							
								 
								Sam Collins
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								c1f806e436
								
							
						 | 
						
							
							
								
								Added SEO Schema and Meta Description
							
							
							
							
							
						 | 
						
							2017-03-01 08:55:15 +00:00 | 
						
					
				
					
						
							
							
								 
								Sam Collins
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								45c59f0707
								
							
						 | 
						
							
							
								
								Improved Schema notation to hopefully improve SEO
							
							
							
							
							
						 | 
						
							2017-03-01 00:43:51 +00:00 | 
						
					
				
					
						
							
							
								 
								Sam Collins
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								5d9096a86c
								
							
						 | 
						
							
							
								
								Fixed Feed Styling and improved Responsive Banners
							
							
							
							
							
						 | 
						
							2017-02-28 23:49:56 +00:00 | 
						
					
				
					
						
							
							
								 
								Oly
							
						 | 
						
							
							
							
							
							
								
							
							
								312a29e8ee
								
							
						 | 
						
							
							
								
								disable redis for now, add markdown tag for blog display
							
							
							
							
							
						 | 
						
							2017-02-28 09:03:01 +00:00 | 
						
					
				
					
						
							
							
								 
								Sam Collins
							
						 | 
						
							
							
							
							
							
								
							
							
								7453c056ae
								
							
						 | 
						
							
							
								
								Removed Refrence to Django Rest Framework
							
							
							
							
							
						 | 
						
							2017-02-26 08:36:59 +00:00 | 
						
					
				
					
						
							
							
								 
								Sam Collins
							
						 | 
						
							
							
							
							
							
								
							
							
								6c463d3b86
								
							
						 | 
						
							
							
								
								Added Blog page and views
							
							
							
							
							
						 | 
						
							2017-02-26 08:36:59 +00:00 | 
						
					
				
					
						
							
							
								
								 Oliver Marks
							
						 | 
						
							
							
							
							
							
								
							
							
								223de57b6b
								
							
						 | 
						
							
							
								
								clean up stage configs, start of live configs
							
							
							
							
							
						 | 
						
							2017-02-21 19:09:15 +00:00 | 
						
					
				
					
						
							
							
								
								 Oliver Marks
							
						 | 
						
							
							
							
							
							
								
							
							
								eac0e88596
								
							
						 | 
						
							
							
								
								implemented cancel subscription, will likely need some more work and testing
							
							
							
							
							
						 | 
						
							2017-02-16 21:35:46 +00:00 | 
						
					
				
					
						
							
							
								 
								Sam Collins
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								38cffd11cb
								
							
						 | 
						
							
							
								
								Added password reset, cleaned up nav and added mailing list link
							
							
							
							
							
						 | 
						
							2017-02-15 19:11:22 +00:00 | 
						
					
				
					
						
							
							
								 
								Sam Collins
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								f8729a5453
								
							
						 | 
						
							
							
								
								Improved Chat page text and added Hangouts link
							
							
							
							
							
						 | 
						
							2017-02-15 18:06:27 +00:00 | 
						
					
				
					
						
							
							
								 
								Sam Collins
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								e1dc5b2e0f
								
							
						 | 
						
							
							
								
								Reduced duplicate queries on Home Page and made Copyright year dynamic
							
							
							
							
							
						 | 
						
							2017-02-15 18:05:57 +00:00 | 
						
					
				
					
						
							
							
								 
								Oly
							
						 | 
						
							
							
							
							
							
								
							
							
								02f946b7a2
								
							
						 | 
						
							
							
								
								use picture tag for banners, add in image size
							
							
							
							
							
						 | 
						
							2017-02-15 13:53:19 +00:00 | 
						
					
				
					
						
							
							
								
								 Oliver Marks
							
						 | 
						
							
							
							
							
							
								
							
							
								3a4e438f31
								
							
						 | 
						
							
							
								
								Better image auto fixtures, now has a fixed larger size
							
							
							
							
							
						 | 
						
							2017-02-14 20:29:45 +00:00 | 
						
					
				
					
						
							
							
								 
								Oly
							
						 | 
						
							
							
							
							
							
								
							
							
								612cd5c779
								
							
						 | 
						
							
							
								
								Banner on homepage now enabled
							
							
							
							
							
						 | 
						
							2017-02-14 14:00:37 +00:00 | 
						
					
				
					
						
							
							
								 
								Oly
							
						 | 
						
							
							
							
							
							
								
							
							
								c38d6916ef
								
							
						 | 
						
							
							
								
								missing banner files
							
							
							
							
							
						 | 
						
							2017-02-14 08:34:26 +00:00 | 
						
					
				
					
						
							
							
								 
								Oly
							
						 | 
						
							
							
							
							
							
								
							
							
								5b5612d550
								
							
						 | 
						
							
							
								
								Started to implement the homepage banner images
							
							
							
							
							
						 | 
						
							2017-02-14 08:34:26 +00:00 | 
						
					
				
					
						
							
							
								
								 Oliver Marks
							
						 | 
						
							
							
							
							
							
								
							
							
								6bedf06f1b
								
							
						 | 
						
							
							
								
								Some styling tweaks on homepage and member list page, spacing and layout
							
							
							
							
							
						 | 
						
							2017-02-12 10:40:20 +00:00 |