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 | 
						
					
				
					
						
							
							
								
								 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 | 
						
					
				
					
						
							
							
								 
								Oly
							
						 | 
						
							
							
							
							
							
								
							
							
								0d538df97e
								
							
						 | 
						
							
							
								
								add spacing under introduction
							
							
							
							
							
						 | 
						
							2017-02-06 14:10:35 +00:00 | 
						
					
				
					
						
							
							
								
								 Oliver Marks
							
						 | 
						
							
							
							
							
							
								
							
							
								b55e16009d
								
							
						 | 
						
							
							
								
								Email should now send on stage
							
							
							
							
							
						 | 
						
							2017-02-05 17:04:08 +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
							
						 | 
						
							
							
							
							
							
								
							
							
								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 | 
						
					
				
					
						
							
							
								
								 Oliver Marks
							
						 | 
						
							
							
							
							
							
								
							
							
								6042d68b66
								
							
						 | 
						
							
							
								
								start of test for unsubscribe button
							
							
							
							
							
						 | 
						
							2017-01-26 22:36:25 +00:00 | 
						
					
				
					
						
							
							
								 
								Oly
							
						 | 
						
							
							
							
							
							
								
							
							
								3f4150b176
								
							
						 | 
						
							
							
								
								fix existing tests
							
							
							
							
							
						 | 
						
							2017-01-26 17:38:44 +00:00 | 
						
					
				
					
						
							
							
								 
								Sam Collins
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								e873328404
								
							
						 | 
						
							
							
								
								Added Init for feeds
							
							
							
							
							
						 | 
						
							2017-01-26 13:27:33 +00:00 | 
						
					
				
					
						
							
							
								 
								Oly
							
						 | 
						
							
							
							
							
							
								
							
							
								0622d842ba
								
							
						 | 
						
							
							
								
								all tests now run
							
							
							
							
							
						 | 
						
							2017-01-26 13:13:42 +00:00 | 
						
					
				
					
						
							
							
								 
								Oly
							
						 | 
						
							
							
							
							
							
								
							
							
								097a637682
								
							
						 | 
						
							
							
								
								env and settings now loading, need to work on mocking next
							
							
							
							
							
						 | 
						
							2017-01-26 09:10:46 +00:00 | 
						
					
				
					
						
							
							
								
								 Oliver Marks
							
						 | 
						
							
							
							
							
							
								
							
							
								11e19fcf66
								
							
						 | 
						
							
							
								
								Separated payment options, for testing
							
							
							
							
							
						 | 
						
							2017-01-25 22:15:43 +00:00 | 
						
					
				
					
						
							
							
								
								 Oliver Marks
							
						 | 
						
							
							
							
							
							
								
							
							
								be559501e1
								
							
						 | 
						
							
							
								
								feed id fix, feed_reader will now store an id and return it in the results
							
							
							
							
							
						 | 
						
							2017-01-08 13:33:00 +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
							
						 | 
						
							
							
							
							
							
								
							
							
								a6ba1f984b
								
							
						 | 
						
							
							
								
								Merge pull request #1 from maidstone-hackspace/site-styling
							
							
							
							
							
							
							
							Site styling improvments 
							
						 | 
						
							2017-01-07 21:31:54 +00:00 | 
						
					
				
					
						
							
							
								 
								Sam Collins
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								67e53644ba
								
							
						 | 
						
							
							
								
								Improved card styling from feeds
							
							
							
							
							
						 | 
						
							2017-01-07 21:15:27 +00:00 | 
						
					
				
					
						
							
							
								 
								Sam Collins
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								8a652fa20a
								
							
						 | 
						
							
							
								
								Re minifed and added sticky footer
							
							
							
							
							
						 | 
						
							2017-01-07 20:23:44 +00:00 | 
						
					
				
					
						
							
							
								 
								Sam Collins
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								47ff473123
								
							
						 | 
						
							
							
								
								Added better favicons for all devices
							
							
							
							
							
						 | 
						
							2017-01-07 20:13:20 +00:00 | 
						
					
				
					
						
							
							
								 
								Sam Collins
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								25dd644c16
								
							
						 | 
						
							
							
								
								Switched to Bootstrap 4 Alpha 6 and converted Navbar
							
							
							
							
							
						 | 
						
							2017-01-07 19:48:04 +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
							
						 | 
						
							
							
							
							
							
								
							
							
								f7197f59f7
								
							
						 | 
						
							
							
								
								payment library and tests
							
							
							
							
							
						 | 
						
							2017-01-05 19:25:23 +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 | 
						
					
				
					
						
							
							
								 
								Oly
							
						 | 
						
							
							
							
							
							
								
							
							
								f7f8b5cf45
								
							
						 | 
						
							
							
								
								Initial commit, default project created with cookiecutter for django 1.10 and python 3
							
							
							
							
							
						 | 
						
							2017-01-04 09:22:12 +00:00 |