Oliver Marks
							
						 | 
						
							
							
							
							
							
								
							
							
								60c3c8ed8e
								
							
						 | 
						
							
							
								
								markdownx example
							
							
							
							
							
						 | 
						
							2017-02-27 19:07:13 +00:00 | 
						
					
				
					
						
							
							
								 
								Sam Collins
							
						 | 
						
							
							
							
							
							
								
							
							
								9e0ada5f3d
								
							
						 | 
						
							
							
								
								Added Auth to Django REST API
							
							
							
							
							
						 | 
						
							2017-02-26 08:36:59 +00:00 | 
						
					
				
					
						
							
							
								 
								Sam Collins
							
						 | 
						
							
							
							
							
							
								
							
							
								7453c056ae
								
							
						 | 
						
							
							
								
								Removed Refrence to Django Rest Framework
							
							
							
							
							
						 | 
						
							2017-02-26 08:36:59 +00:00 | 
						
					
				
					
						
							
							
								 
								Sam Collins
							
						 | 
						
							
							
							
							
							
								
							
							
								9db20fb458
								
							
						 | 
						
							
							
								
								Added Blog and Feeds API
							
							
							
							
							
						 | 
						
							2017-02-26 08:36:59 +00:00 | 
						
					
				
					
						
							
							
								 
								Sam Collins
							
						 | 
						
							
							
							
							
							
								
							
							
								6c463d3b86
								
							
						 | 
						
							
							
								
								Added Blog page and views
							
							
							
							
							
						 | 
						
							2017-02-26 08:36:59 +00:00 | 
						
					
				
					
						
							
							
								 
								Sam Collins
							
						 | 
						
							
							
							
							
							
								
							
							
								a5f0d97d54
								
							
						 | 
						
							
							
								
								First Start of blog system
							
							
							
							
							
						 | 
						
							2017-02-26 08:36:59 +00:00 | 
						
					
				
					
						
							
							
								
								 Oliver Marks
							
						 | 
						
							
							
							
							
							
								
							
							
								db5d0ff25b
								
							
						 | 
						
							
							
								
								add allowed host for production
							
							
							
							
							
						 | 
						
							2017-02-25 13:31:44 +00:00 | 
						
					
				
					
						
							
							
								
								 Oliver Marks
							
						 | 
						
							
							
							
							
							
								
							
							
								223de57b6b
								
							
						 | 
						
							
							
								
								clean up stage configs, start of live configs
							
							
							
							
							
						 | 
						
							2017-02-21 19:09:15 +00:00 | 
						
					
				
					
						
							
							
								
								 Oliver Marks
							
						 | 
						
							
							
							
							
							
								
							
							
								5c58aff874
								
							
						 | 
						
							
							
								
								Added some tests for subscription sign up, improved drone conf to cache pip packages
							
							
							
							
							
						 | 
						
							2017-02-19 10:50:17 +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
							
						 | 
						
							
							
							
							
							
								
							
							
								134a5b0982
								
							
						 | 
						
							
							
								
								remove s3 config from stage
							
							
							
							
							
						 | 
						
							2017-02-15 19:29:35 +00:00 | 
						
					
				
					
						
							
							
								 
								Sam Collins
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								38cffd11cb
								
							
						 | 
						
							
							
								
								Added password reset, cleaned up nav and added mailing list link
							
							
							
							
							
						 | 
						
							2017-02-15 19:11:22 +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
							
						 | 
						
							
							
							
							
							
								
							
							
								5b5612d550
								
							
						 | 
						
							
							
								
								Started to implement the homepage banner images
							
							
							
							
							
						 | 
						
							2017-02-14 08:34:26 +00:00 | 
						
					
				
					
						
							
							
								
								 Oliver Marks
							
						 | 
						
							
							
							
							
							
								
							
							
								2a9eade76d
								
							
						 | 
						
							
							
								
								Implemented payment success and failure urls
							
							
							
							
							
						 | 
						
							2017-02-09 20:12:59 +00:00 | 
						
					
				
					
						
							
							
								
								 Oliver Marks
							
						 | 
						
							
							
							
							
							
								
							
							
								6fec0e64bd
								
							
						 | 
						
							
							
								
								sass now compiles, cleanup unused files, hooked in sign up form to post to gocardless
							
							
							
							
							
						 | 
						
							2017-02-08 20:32:42 +00:00 | 
						
					
				
					
						
							
							
								
								 Oliver Marks
							
						 | 
						
							
							
							
							
							
								
							
							
								fa5359979d
								
							
						 | 
						
							
							
								
								started work on the membership signup form
							
							
							
							
							
						 | 
						
							2017-02-07 20:25:23 +00:00 | 
						
					
				
					
						
							
							
								
								 Oliver Marks
							
						 | 
						
							
							
							
							
							
								
							
							
								88f5a54bc0
								
							
						 | 
						
							
							
								
								clean up side nav slightly, can now be collapsed
							
							
							
							
							
						 | 
						
							2017-02-06 21:22:03 +00:00 | 
						
					
				
					
						
							
							
								
								 Oliver Marks
							
						 | 
						
							
							
							
							
							
								
							
							
								b55e16009d
								
							
						 | 
						
							
							
								
								Email should now send on stage
							
							
							
							
							
						 | 
						
							2017-02-05 17:04:08 +00:00 | 
						
					
				
					
						
							
							
								
								 Oliver Marks
							
						 | 
						
							
							
							
							
							
								
							
							
								46502c164a
								
							
						 | 
						
							
							
								
								Add django file logging for stage
							
							
							
							
							
						 | 
						
							2017-02-05 14:22:35 +00:00 | 
						
					
				
					
						
							
							
								
								 Oliver Marks
							
						 | 
						
							
							
							
							
							
								
							
							
								3d8c6a24a2
								
							
						 | 
						
							
							
								
								stage config, and contact form setup to send email
							
							
							
							
							
						 | 
						
							2017-02-05 12:59:20 +00:00 | 
						
					
				
					
						
							
							
								
								 Oliver Marks
							
						 | 
						
							
							
							
							
							
								
							
							
								60030f14cd
								
							
						 | 
						
							
							
								
								Integrated feeds on homepage into a new feed
							
							
							
							
							
						 | 
						
							2017-02-02 19:16:09 +00:00 | 
						
					
				
					
						
							
							
								
								 Oliver Marks
							
						 | 
						
							
							
							
							
							
								
							
							
								ad301febf6
								
							
						 | 
						
							
							
								
								Demo autofixture integration
							
							
							
							
							
						 | 
						
							2017-02-02 18:51:54 +00:00 | 
						
					
				
					
						
							
							
								
								 Oliver Marks
							
						 | 
						
							
							
							
							
							
								
							
							
								9faf03f1e7
								
							
						 | 
						
							
							
								
								initial docker setup for staging now works
							
							
							
							
							
						 | 
						
							2017-02-02 14:04:17 +00:00 | 
						
					
				
					
						
							
							
								 
								Oly
							
						 | 
						
							
							
							
							
							
								
							
							
								097a637682
								
							
						 | 
						
							
							
								
								env and settings now loading, need to work on mocking next
							
							
							
							
							
						 | 
						
							2017-01-26 09:10:46 +00:00 | 
						
					
				
					
						
							
							
								 
								Oly
							
						 | 
						
							
							
							
							
							
								
							
							
								a8e8ad80e9
								
							
						 | 
						
							
							
								
								fix env file loading
							
							
							
							
							
						 | 
						
							2017-01-26 08:52:41 +00:00 | 
						
					
				
					
						
							
							
								
								 Oliver Marks
							
						 | 
						
							
							
							
							
							
								
							
							
								11e19fcf66
								
							
						 | 
						
							
							
								
								Separated payment options, for testing
							
							
							
							
							
						 | 
						
							2017-01-25 22:15:43 +00:00 | 
						
					
				
					
						
							
							
								
								 Oliver Marks
							
						 | 
						
							
							
							
							
							
								
							
							
								5f1ec4e065
								
							
						 | 
						
							
							
								
								fix drone file so it works
							
							
							
							
							
						 | 
						
							2017-01-08 18:10: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 | 
						
					
				
					
						
							
							
								
								 Oliver Marks
							
						 | 
						
							
							
							
							
							
								
							
							
								2cef5bf87a
								
							
						 | 
						
							
							
								
								Added in contact, chat and mailing list templates
							
							
							
							
							
						 | 
						
							2017-01-05 21:01:58 +00:00 | 
						
					
				
					
						
							
							
								
								 Oliver Marks
							
						 | 
						
							
							
							
							
							
								
							
							
								3311080fde
								
							
						 | 
						
							
							
								
								Added in feeds django app, can be manged in the admin backend
							
							
							
							
							
						 | 
						
							2017-01-05 18:43:32 +00:00 | 
						
					
				
					
						
							
							
								 
								Sam Collins
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								7e200cf71f
								
							
						 | 
						
							
							
								
								Moved all files up one folder
							
							
							
							
							
						 | 
						
							2017-01-04 18:11:25 +00:00 |