ed9958b2ad 
								
							 
						 
						
							
							
								
								setting up test data  
							
							
							
						 
						
							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  
				
					
						
							
							
								 
						
							
								66e012f994 
								
							 
						 
						
							
							
								
								switched to mapping model, lookup in the api does not yet work  
							
							
							
						 
						
							2017-09-14 13:46:54 +01:00  
				
					
						
							
							
								 
						
							
								54f89e8b5b 
								
							 
						 
						
							
							
								
								Basic Working tests to build on  
							
							
							
						 
						
							2017-09-14 13:46:54 +01:00  
				
					
						
							
							
								 
						
							
								48c90c95f5 
								
							 
						 
						
							
							
								
								you can now request a device, thinking we need a mapping table again :p  
							
							
							
						 
						
							2017-09-14 13:46:54 +01:00  
				
					
						
							
							
								
								Oliver Marks 
							
						 
						
							
								69af967ae6 
								
							 
						 
						
							
							
								
								Initial rfid models, to think about any thoughts ?  
							
							... 
							
							
							
							remove mapping model on base on @scollins suggestion
Updated models, enabled it in the admin backup to get an idea of the structure.
will need to rebuild, updating restframework
current state of experiment into rfid api
Change docs url
started looking into web tokens
Refactor models
More experimenting
Custom view now works, needs tiding up and data to test 
							
						 
						
							2017-09-14 13:46:54 +01:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								8c99019476 
								
							 
						 
						
							
							
								
								Added back old password hashing algorithms  
							
							
							
						 
						
							2017-09-13 19:37:59 +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  
				
					
						
							
							
								 
						
							
								985782a3f4 
								
							 
						 
						
							
							
								
								move meta tags outside block so they are always available  
							
							
							
						 
						
							2017-09-12 13:49:09 +01:00  
				
					
						
							
							
								 
						
							
								97e8397d38 
								
							 
						 
						
							
							
								
								Added requests to admin area, added meta data to homepage.  
							
							
							
						 
						
							2017-09-12 13:39:15 +01:00  
				
					
						
							
							
								
								Oliver Marks 
							
						 
						
							
								d1d7ae7365 
								
							 
						 
						
							
							
								
								update message text, ignore errors for now  
							
							
							
						 
						
							2017-09-08 21:49:59 +01:00  
				
					
						
							
							
								 
						
							
								409f6651c3 
								
							 
						 
						
							
							
								
								bump site version to use correct domain  
							
							
							
						 
						
							2017-09-08 13:50:22 +01:00  
				
					
						
							
							
								 
						
							
								80601ce000 
								
							 
						 
						
							
							
								
								matrix tasks for spirit and wiki  
							
							
							
						 
						
							2017-09-08 13:35:36 +01:00  
				
					
						
							
							
								 
						
							
								5e5312fe74 
								
							 
						 
						
							
							
								
								testing new celery task for auto notifications  
							
							
							
						 
						
							2017-09-07 22:03:05 +01:00  
				
					
						
							
							
								 
						
							
								da67d703a1 
								
							 
						 
						
							
							
								
								Fixed styling on home link  
							
							
							
						 
						
							2017-09-06 17:35:11 +01:00  
				
					
						
							
							
								 
						
							
								fdef48041d 
								
							 
						 
						
							
							
								
								Added title, and changed layout  
							
							
							
						 
						
							2017-09-06 14:03:02 +01:00  
				
					
						
							
							
								 
						
							
								c2efc2cae0 
								
							 
						 
						
							
							
								
								Fixes   #56  use newer password hasher  
							
							
							
						 
						
							2017-09-06 09:05:24 +01:00  
				
					
						
							
							
								
								Oliver Marks 
							
						 
						
							
								fbaa7fb50d 
								
							 
						 
						
							
							
								
								implemented django wiki, created requests page, and added to nav  
							
							
							
						 
						
							2017-09-05 20:07:48 +01:00  
				
					
						
							
							
								 
						
							
								10024c6646 
								
							 
						 
						
							
							
								
								clean static before regenerating  
							
							
							
						 
						
							2017-08-23 13:47:55 +01:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								
								Oliver Marks 
							
						 
						
							
								633497be6c 
								
							 
						 
						
							
							
								
								celery integration  
							
							
							
						 
						
							2017-08-15 07:26:06 +01:00  
				
					
						
							
							
								 
						
							
								54e1bce190 
								
							 
						 
						
							
							
								
								change subscription mechanism to use new gocardless api  
							
							
							
						 
						
							2017-08-14 14:00:59 +01:00  
				
					
						
							
							
								
								Oliver Marks 
							
						 
						
							
								b3d580d49c 
								
							 
						 
						
							
							
								
								Add missing brackets to as_view, to  fix   #135  
							
							
							
						 
						
							2017-07-12 22:07:47 +01:00  
				
					
						
							
							
								
								Oliver Marks 
							
						 
						
							
								c33f4796cb 
								
							 
						 
						
							
							
								
								Merge pull request  #94  from maidstone-hackspace/pyup-update-django-environ-0.4.2-to-0.4.3  
							
							... 
							
							
							
							Update django-environ to 0.4.3 
							
						 
						
							2017-07-05 14:02:39 +01:00  
				
					
						
							
							
								
								Oliver Marks 
							
						 
						
							
								88da8cfb07 
								
							 
						 
						
							
							
								
								Merge pull request  #97  from maidstone-hackspace/pyup-update-django-redis-4.7.0-to-4.8.0  
							
							... 
							
							
							
							Update django-redis to 4.8.0 
							
						 
						
							2017-07-05 14:02:14 +01:00  
				
					
						
							
							
								
								Oliver Marks 
							
						 
						
							
								8ac2025428 
								
							 
						 
						
							
							
								
								Merge pull request  #118  from maidstone-hackspace/pyup-update-django-anymail-0.9-to-0.10  
							
							... 
							
							
							
							Update django-anymail to 0.10 
							
						 
						
							2017-07-05 14:01:02 +01:00  
				
					
						
							
							
								
								Oliver Marks 
							
						 
						
							
								fff460a903 
								
							 
						 
						
							
							
								
								Merge pull request  #123  from maidstone-hackspace/pyup-update-gevent-1.2.0-to-1.2.2  
							
							... 
							
							
							
							Update gevent to 1.2.2 
							
						 
						
							2017-07-05 14:00:48 +01:00  
				
					
						
							
							
								
								Oliver Marks 
							
						 
						
							
								11e4d5667d 
								
							 
						 
						
							
							
								
								Merge pull request  #119  from maidstone-hackspace/pyup-update-boto-2.46.1-to-2.47.0  
							
							... 
							
							
							
							Update boto to 2.47.0 
							
						 
						
							2017-07-05 13:58:49 +01:00  
				
					
						
							
							
								
								Oliver Marks 
							
						 
						
							
								9e11b3361e 
								
							 
						 
						
							
							
								
								Merge pull request  #106  from maidstone-hackspace/pyup-update-django-debug-toolbar-1.7-to-1.8  
							
							... 
							
							
							
							Update django-debug-toolbar to 1.8 
							
						 
						
							2017-07-05 13:58:19 +01:00  
				
					
						
							
							
								
								Oliver Marks 
							
						 
						
							
								d38ccf4ca7 
								
							 
						 
						
							
							
								
								Merge pull request  #113  from maidstone-hackspace/pyup-update-coverage-4.3.1-to-4.4.1  
							
							... 
							
							
							
							Update coverage to 4.4.1 
							
						 
						
							2017-07-05 13:58:04 +01:00  
				
					
						
							
							
								
								Oliver Marks 
							
						 
						
							
								b336834c33 
								
							 
						 
						
							
							
								
								Merge pull request  #126  from maidstone-hackspace/pyup-update-libsass-0.12.3-to-0.13.2  
							
							... 
							
							
							
							Update libsass to 0.13.2 
							
						 
						
							2017-07-05 13:57:41 +01:00  
				
					
						
							
							
								
								Oliver Marks 
							
						 
						
							
								c9385ebaa1 
								
							 
						 
						
							
							
								
								Merge pull request  #130  from maidstone-hackspace/pyup-update-pillow-4.1.0-to-4.2.0  
							
							... 
							
							
							
							Update pillow to 4.2.0 
							
						 
						
							2017-07-05 13:57:18 +01:00  
				
					
						
							
							
								 
						
							
								3ca6cc4702 
								
							 
						 
						
							
							
								
								Fixes   #133  Updated blurb on homepage, and amended the about page  
							
							
							
						 
						
							2017-07-05 13:49:00 +01:00  
				
					
						
							
							
								
								Oliver Marks 
							
						 
						
							
								b0bffdc7f3 
								
							 
						 
						
							
							
								
								Merge pull request  #108  from maidstone-hackspace/pyup-update-braintree-3.35.0-to-3.37.2  
							
							... 
							
							
							
							Update braintree to 3.37.2 
							
						 
						
							2017-07-05 12:59:04 +01:00  
				
					
						
							
							
								
								Oliver Marks 
							
						 
						
							
								b80c1ff4e2 
								
							 
						 
						
							
							
								
								Merge pull request  #127  from maidstone-hackspace/pyup-update-django-test-plus-1.0.17-to-1.0.18  
							
							... 
							
							
							
							Update django-test-plus to 1.0.18 
							
						 
						
							2017-07-05 12:58:43 +01:00  
				
					
						
							
							
								
								Oliver Marks 
							
						 
						
							
								9ee31d2e0c 
								
							 
						 
						
							
							
								
								Merge pull request  #129  from maidstone-hackspace/pyup-update-django-extensions-1.7.8-to-1.8.0  
							
							... 
							
							
							
							Update django-extensions to 1.8.0 
							
						 
						
							2017-07-05 12:58:27 +01:00  
				
					
						
							
							
								
								Oliver Marks 
							
						 
						
							
								45c9440aeb 
								
							 
						 
						
							
							
								
								Merge pull request  #131  from maidstone-hackspace/pyup-update-django-1.11.1-to-1.11.3  
							
							... 
							
							
							
							Update django to 1.11.3 
							
						 
						
							2017-07-05 12:58:08 +01:00  
				
					
						
							
							
								 
						
							
								de90af456c 
								
							 
						 
						
							
							
								
								Update django from 1.11.1 to 1.11.3  
							
							
							
						 
						
							2017-07-02 03:21:53 +01:00  
				
					
						
							
							
								 
						
							
								b0b51b8f14 
								
							 
						 
						
							
							
								
								Update pillow from 4.1.0 to 4.2.0  
							
							
							
						 
						
							2017-07-01 18:30:56 +01:00  
				
					
						
							
							
								 
						
							
								fc27e1055d 
								
							 
						 
						
							
							
								
								Update django-extensions from 1.7.8 to 1.8.0  
							
							
							
						 
						
							2017-06-29 23:01:54 +01:00  
				
					
						
							
							
								 
						
							
								2302988732 
								
							 
						 
						
							
							
								
								Update django-test-plus from 1.0.17 to 1.0.18  
							
							
							
						 
						
							2017-06-26 18:09:50 +01:00  
				
					
						
							
							
								 
						
							
								fae0b8e47d 
								
							 
						 
						
							
							
								
								Update django-test-plus from 1.0.17 to 1.0.18  
							
							
							
						 
						
							2017-06-26 18:09:49 +01:00  
				
					
						
							
							
								 
						
							
								008df61d43 
								
							 
						 
						
							
							
								
								Update libsass from 0.12.3 to 0.13.2  
							
							
							
						 
						
							2017-06-15 03:31:29 +01:00  
				
					
						
							
							
								 
						
							
								24ba2e3d4e 
								
							 
						 
						
							
							
								
								Update gevent from 1.2.0 to 1.2.2  
							
							
							
						 
						
							2017-06-05 13:22:05 +01:00  
				
					
						
							
							
								
								Oliver Marks 
							
						 
						
							
								eac7ee9211 
								
							 
						 
						
							
							
								
								Initial version of home page rss.xml feed  
							
							
							
						 
						
							2017-06-01 20:30:40 +01:00  
				
					
						
							
							
								 
						
							
								066a2a524d 
								
							 
						 
						
							
							
								
								Update boto from 2.46.1 to 2.47.0  
							
							
							
						 
						
							2017-05-24 23:18:51 +01:00  
				
					
						
							
							
								
								Oliver Marks 
							
						 
						
							
								bbcc3ff758 
								
							 
						 
						
							
							
								
								Merge pull request  #114  from maidstone-hackspace/pyup-update-werkzeug-0.12.1-to-0.12.2  
							
							... 
							
							
							
							Update werkzeug to 0.12.2 
							
						 
						
							2017-05-23 22:09:58 +01:00