Oliver Marks
							
						 | 
						
							
							
							
							
							
								
							
							
								67facc06f1
								
							
						 | 
						
							
							
								
								Fix for martor markdown display.
							
							
							
							
							
						 | 
						
							2018-01-16 22:12:50 +00:00 | 
						
					
				
					
						
							
							
								
								 Oliver Marks
							
						 | 
						
							
							
							
							
							
								
							
							
								9d50b92f40
								
							
						 | 
						
							
							
								
								Fix up user rfid urls
							
							
							
							
							
						 | 
						
							2018-01-15 18:32:19 +00:00 | 
						
					
				
					
						
							
							
								 
								Sam Collins
							
						 | 
						
							
							
							
							
							
								
							
							
								8678c06108
								
							
						 | 
						
							
							
								
								Added basic creation and deletion buttons for RFID
							
							
							
							
							
						 | 
						
							2017-11-01 17:57:10 +00:00 | 
						
					
				
					
						
							
							
								 
								brett
							
						 | 
						
							
							
							
							
							
								
							
							
								7ce5d0dbbf
								
							
						 | 
						
							
							
								
								Added rfid card listing and removed user drop down from rfid create form
							
							
							
							
							
						 | 
						
							2017-10-25 20:19:30 +01:00 | 
						
					
				
					
						
							
							
								 
								Oly
							
						 | 
						
							
							
							
							
							
								
							
							
								3c3f5436b4
								
							
						 | 
						
							
							
								
								Handle members group not existing, change update loop it no longer needs to return
							
							
							
							
							
						 | 
						
							2017-10-03 13:49:18 +01:00 | 
						
					
				
					
						
							
							
								
								 Oliver Marks
							
						 | 
						
							
							
							
							
							
								
							
							
								d642109c13
								
							
						 | 
						
							
							
								
								Rework some of the payment sign up system
							
							
							
							
							
						 | 
						
							2017-10-02 22:38:26 +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
							
						 | 
						
							
							
							
							
							
								
							
							
								bbd72b3a95
								
							
						 | 
						
							
							
								
								Fix up what tests we have so they all pass again
							
							
							
							
							
						 | 
						
							2017-10-01 11:52:58 +01:00 | 
						
					
				
					
						
							
							
								
								 Oliver Marks
							
						 | 
						
							
							
							
							
							
								
							
							
								574286e8e3
								
							
						 | 
						
							
							
								
								Fix duplicate records in membership table.
							
							
							
							
							
						 | 
						
							2017-09-17 10:50:09 +01:00 | 
						
					
				
					
						
							
							
								
								 Oliver Marks
							
						 | 
						
							
							
							
							
							
								
							
							
								ae18e8bf38
								
							
						 | 
						
							
							
								
								Fixes #139 wiki preview error
							
							
							
							
							
						 | 
						
							2017-09-15 22:34:14 +01:00 | 
						
					
				
					
						
							
							
								 
								Oly
							
						 | 
						
							
							
							
							
							
								
							
							
								a7a3311f8d
								
							
						 | 
						
							
							
								
								Better users generated in test data.
							
							
							
							
							
						 | 
						
							2017-09-15 14:05:22 +01:00 | 
						
					
				
					
						
							
							
								
								 Oliver Marks
							
						 | 
						
							
							
							
							
							
								
							
							
								02befa5ddb
								
							
						 | 
						
							
							
								
								Better test data for rfid system
							
							
							
							
							
						 | 
						
							2017-09-14 22:03:26 +01:00 | 
						
					
				
					
						
							
							
								 
								Oly
							
						 | 
						
							
							
							
							
							
								
							
							
								528ad8cade
								
							
						 | 
						
							
							
								
								fixed a few more tests
							
							
							
							
							
						 | 
						
							2017-09-14 13:46:54 +01:00 | 
						
					
				
					
						
							
							
								
								 Oliver Marks
							
						 | 
						
							
							
							
							
							
								
							
							
								4b3f57ea7e
								
							
						 | 
						
							
							
								
								refactored rfid model into user, started on user save form
							
							
							
							
							
						 | 
						
							2017-09-14 13:46:54 +01:00 | 
						
					
				
					
						
							
							
								
								 Oliver Marks
							
						 | 
						
							
							
							
							
							
								
							
							
								fbaa7fb50d
								
							
						 | 
						
							
							
								
								implemented django wiki, created requests page, and added to nav
							
							
							
							
							
						 | 
						
							2017-09-05 20:07:48 +01:00 | 
						
					
				
					
						
							
							
								
								 Oliver Marks
							
						 | 
						
							
							
							
							
							
								
							
							
								10039e0b0e
								
							
						 | 
						
							
							
								
								celery integration tasks now working, improved feed image variation rendering
							
							
							
							
							
						 | 
						
							2017-08-22 22:47:44 +01:00 | 
						
					
				
					
						
							
							
								
								 Oliver Marks
							
						 | 
						
							
							
							
							
							
								
							
							
								633497be6c
								
							
						 | 
						
							
							
								
								celery integration
							
							
							
							
							
						 | 
						
							2017-08-15 07:26:06 +01:00 | 
						
					
				
					
						
							
							
								 
								Oly
							
						 | 
						
							
							
							
							
							
								
							
							
								54e1bce190
								
							
						 | 
						
							
							
								
								change subscription mechanism to use new gocardless api
							
							
							
							
							
						 | 
						
							2017-08-14 14:00:59 +01:00 | 
						
					
				
					
						
							
							
								
								 Oliver Marks
							
						 | 
						
							
							
							
							
							
								
							
							
								22cd6c2397
								
							
						 | 
						
							
							
								
								Add refresh subscription button to admin backend
							
							
							
							
							
						 | 
						
							2017-04-23 10:39:04 +01:00 | 
						
					
				
					
						
							
							
								
								 Oliver Marks
							
						 | 
						
							
							
							
							
							
								
							
							
								cdb939f233
								
							
						 | 
						
							
							
								
								resolve migratioon conflicts
							
							
							
							
							
						 | 
						
							2017-02-26 08:48:29 +00:00 | 
						
					
				
					
						
							
							
								 
								Sam Collins
							
						 | 
						
							
							
							
							
							
								
							
							
								a5f0d97d54
								
							
						 | 
						
							
							
								
								First Start of blog system
							
							
							
							
							
						 | 
						
							2017-02-26 08:36:59 +00:00 | 
						
					
				
					
						
							
							
								
								 Oliver Marks
							
						 | 
						
							
							
							
							
							
								
							
							
								b8952f6452
								
							
						 | 
						
							
							
								
								remove s from banner model, tweak permissions on gunicorn folder
							
							
							
							
							
						 | 
						
							2017-02-22 22:45:44 +00:00 | 
						
					
				
					
						
							
							
								
								 Oliver Marks
							
						 | 
						
							
							
							
							
							
								
							
							
								eac0e88596
								
							
						 | 
						
							
							
								
								implemented cancel subscription, will likely need some more work and testing
							
							
							
							
							
						 | 
						
							2017-02-16 21:35:46 +00:00 | 
						
					
				
					
						
							
							
								 
								Oly
							
						 | 
						
							
							
							
							
							
								
							
							
								02f946b7a2
								
							
						 | 
						
							
							
								
								use picture tag for banners, add in image size
							
							
							
							
							
						 | 
						
							2017-02-15 13:53:19 +00:00 | 
						
					
				
					
						
							
							
								
								 Oliver Marks
							
						 | 
						
							
							
							
							
							
								
							
							
								fa5359979d
								
							
						 | 
						
							
							
								
								started work on the membership signup form
							
							
							
							
							
						 | 
						
							2017-02-07 20:25:23 +00:00 | 
						
					
				
					
						
							
							
								 
								Oly
							
						 | 
						
							
							
							
							
							
								
							
							
								411dedf00d
								
							
						 | 
						
							
							
								
								clean up refresg commands and start on docker-compose files for stage
							
							
							
							
							
						 | 
						
							2017-02-01 14:02:20 +00:00 | 
						
					
				
					
						
							
							
								
								 Oliver Marks
							
						 | 
						
							
							
							
							
							
								
							
							
								5b223d23cd
								
							
						 | 
						
							
							
								
								new command works needs improvement, fix fixtures file thanks for pointing that out @mightyscollins
							
							
							
							
							
						 | 
						
							2017-01-30 22:39:15 +00:00 | 
						
					
				
					
						
							
							
								 
								Oly
							
						 | 
						
							
							
							
							
							
								
							
							
								e5c1e15010
								
							
						 | 
						
							
							
								
								more work on payment gateway
							
							
							
							
							
						 | 
						
							2017-01-30 17:08:37 +00:00 | 
						
					
				
					
						
							
							
								 
								Oly
							
						 | 
						
							
							
							
							
							
								
							
							
								fb271941bb
								
							
						 | 
						
							
							
								
								Cleaned up migrations, added refresh subscriptions command to update members status
							
							
							
							
							
						 | 
						
							2017-01-28 22:34:47 +00:00 | 
						
					
				
					
						
							
							
								 
								Sam Collins
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								a3e44d640a
								
							
						 | 
						
							
							
								
								Made Articles get stored in the DB and added image fetching
							
							
							
							
							
						 | 
						
							2017-01-08 03:49:33 +00:00 | 
						
					
				
					
						
							
							
								
								 Oliver Marks
							
						 | 
						
							
							
							
							
							
								
							
							
								0a2ad28b7c
								
							
						 | 
						
							
							
								
								add in stdimage to scale the images
							
							
							
							
							
						 | 
						
							2017-01-07 21:52:03 +00:00 | 
						
					
				
					
						
							
							
								
								 Oliver Marks
							
						 | 
						
							
							
							
							
							
								
							
							
								21da62b31c
								
							
						 | 
						
							
							
								
								Initial member list page, need a group called member and users added to function
							
							
							
							
							
						 | 
						
							2017-01-07 19:21:53 +00:00 | 
						
					
				
					
						
							
							
								
								 Oliver Marks
							
						 | 
						
							
							
							
							
							
								
							
							
								9abd81245e
								
							
						 | 
						
							
							
								
								Initial profile management page
							
							
							
							
							
						 | 
						
							2017-01-06 20:35:56 +00:00 | 
						
					
				
					
						
							
							
								 
								Sam Collins
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								7e200cf71f
								
							
						 | 
						
							
							
								
								Moved all files up one folder
							
							
							
							
							
						 | 
						
							2017-01-04 18:11:25 +00:00 |