Oliver Marks 
							
						 
						
							 
							
							
							
							
								
							
							
								276a87c0b3 
								
							 
						 
						
							
							
								
								Now on the bucket list :)  
							
							 
							
							
							
						 
						
							2018-01-21 21:06:51 +00:00  
						
					 
				
					
						
							
							
								 
								Oliver Marks
							
						 
						
							 
							
							
							
							
								
							
							
								7d67e9e9e5 
								
							 
						 
						
							
							
								
								requests wip  
							
							 
							
							
							
						 
						
							2018-01-18 14:12:23 +00:00  
						
					 
				
					
						
							
							
								
								Oliver Marks 
							
						 
						
							 
							
							
							
							
								
							
							
								1fb2b65df2 
								
							 
						 
						
							
							
								
								Added flag to track completed equipment requests  
							
							 
							
							
							
						 
						
							2018-01-14 18:25:02 +00:00  
						
					 
				
					
						
							
							
								
								Oliver Marks 
							
						 
						
							 
							
							
							
							
								
							
							
								afdb834daf 
								
							 
						 
						
							
							
								
								Disable django wiki login pages and use the default django pages  
							
							 
							
							
							
						 
						
							2018-01-06 21:11:58 +00:00  
						
					 
				
					
						
							
							
								
								Oliver Marks 
							
						 
						
							 
							
							
							
							
								
							
							
								9f9f9e4795 
								
							 
						 
						
							
							
								
								Updated draceditor to martor, project was renamed.  
							
							 
							
							
							
						 
						
							2018-01-06 20:59:38 +00:00  
						
					 
				
					
						
							
							
								 
								Oly
							
						 
						
							 
							
							
							
							
								
							
							
								8a2fa40f04 
								
							 
						 
						
							
							
								
								Change include to use custom django wiki temporarily  
							
							 
							
							
							
						 
						
							2017-10-30 13:41:36 +00: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  
						
					 
				
					
						
							
							
								 
								Oly
							
						 
						
							 
							
							
							
							
								
							
							
								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  
						
					 
				
					
						
							
							
								
								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 
							
						 
						
							 
							
							
							
							
								
							
							
								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  
						
					 
				
					
						
							
							
								
								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  
						
					 
				
					
						
							
							
								 
								pyup-bot
							
						 
						
							 
							
							
							
							
								
							
							
								de90af456c 
								
							 
						 
						
							
							
								
								Update django from 1.11.1 to 1.11.3  
							
							 
							
							
							
						 
						
							2017-07-02 03:21:53 +01:00  
						
					 
				
					
						
							
							
								 
								pyup-bot
							
						 
						
							 
							
							
							
							
								
							
							
								b0b51b8f14 
								
							 
						 
						
							
							
								
								Update pillow from 4.1.0 to 4.2.0  
							
							 
							
							
							
						 
						
							2017-07-01 18:30:56 +01:00  
						
					 
				
					
						
							
							
								 
								pyup-bot
							
						 
						
							 
							
							
							
							
								
							
							
								fc27e1055d 
								
							 
						 
						
							
							
								
								Update django-extensions from 1.7.8 to 1.8.0  
							
							 
							
							
							
						 
						
							2017-06-29 23:01:54 +01:00  
						
					 
				
					
						
							
							
								 
								pyup-bot
							
						 
						
							 
							
							
							
							
								
							
							
								2302988732 
								
							 
						 
						
							
							
								
								Update django-test-plus from 1.0.17 to 1.0.18  
							
							 
							
							
							
						 
						
							2017-06-26 18:09:50 +01:00  
						
					 
				
					
						
							
							
								 
								pyup-bot
							
						 
						
							 
							
							
							
							
								
							
							
								fae0b8e47d 
								
							 
						 
						
							
							
								
								Update django-test-plus from 1.0.17 to 1.0.18  
							
							 
							
							
							
						 
						
							2017-06-26 18:09:49 +01:00  
						
					 
				
					
						
							
							
								 
								pyup-bot
							
						 
						
							 
							
							
							
							
								
							
							
								008df61d43 
								
							 
						 
						
							
							
								
								Update libsass from 0.12.3 to 0.13.2  
							
							 
							
							
							
						 
						
							2017-06-15 03:31:29 +01:00  
						
					 
				
					
						
							
							
								 
								pyup-bot
							
						 
						
							 
							
							
							
							
								
							
							
								24ba2e3d4e 
								
							 
						 
						
							
							
								
								Update gevent from 1.2.0 to 1.2.2  
							
							 
							
							
							
						 
						
							2017-06-05 13:22:05 +01:00  
						
					 
				
					
						
							
							
								 
								pyup-bot
							
						 
						
							 
							
							
							
							
								
							
							
								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  
						
					 
				
					
						
							
							
								
								Oliver Marks 
							
						 
						
							 
							
							
							
							
								
							
							
								45aa5188a9 
								
							 
						 
						
							
							
								
								Merge pull request  #98  from maidstone-hackspace/pyup-update-django-allauth-0.31.0-to-0.32.0  
							
							 
							
							... 
							
							
							
							Update django-allauth to 0.32.0 
							
						 
						
							2017-05-23 22:09:22 +01:00  
						
					 
				
					
						
							
							
								
								Oliver Marks 
							
						 
						
							 
							
							
							
							
								
							
							
								4b7bf90b62 
								
							 
						 
						
							
							
								
								Merge pull request  #111  from maidstone-hackspace/pyup-update-djangorestframework-3.6.2-to-3.6.3  
							
							 
							
							... 
							
							
							
							Update djangorestframework to 3.6.3 
							
						 
						
							2017-05-23 22:09:00 +01:00  
						
					 
				
					
						
							
							
								 
								pyup-bot
							
						 
						
							 
							
							
							
							
								
							
							
								9e2a9c0c4a 
								
							 
						 
						
							
							
								
								Update django-anymail from 0.9 to 0.10  
							
							 
							
							
							
						 
						
							2017-05-22 20:27:49 +01:00  
						
					 
				
					
						
							
							
								 
								pyup-bot
							
						 
						
							 
							
							
							
							
								
							
							
								5be739be3a 
								
							 
						 
						
							
							
								
								Update werkzeug from 0.12.1 to 0.12.2  
							
							 
							
							
							
						 
						
							2017-05-16 08:43:41 +01:00  
						
					 
				
					
						
							
							
								 
								pyup-bot
							
						 
						
							 
							
							
							
							
								
							
							
								c3b2cb543d 
								
							 
						 
						
							
							
								
								Update coverage from 4.3.1 to 4.4.1  
							
							 
							
							
							
						 
						
							2017-05-15 06:22:41 +01:00  
						
					 
				
					
						
							
							
								 
								pyup-bot
							
						 
						
							 
							
							
							
							
								
							
							
								7e101c4678 
								
							 
						 
						
							
							
								
								Update coverage from 4.3.1 to 4.4.1  
							
							 
							
							
							
						 
						
							2017-05-15 06:22:40 +01:00  
						
					 
				
					
						
							
							
								 
								pyup-bot
							
						 
						
							 
							
							
							
							
								
							
							
								d34134a1e2 
								
							 
						 
						
							
							
								
								Update djangorestframework from 3.6.2 to 3.6.3  
							
							 
							
							
							
						 
						
							2017-05-12 18:23:38 +01:00  
						
					 
				
					
						
							
							
								 
								pyup-bot
							
						 
						
							 
							
							
							
							
								
							
							
								09f3f254d4 
								
							 
						 
						
							
							
								
								Update django from 1.11 to 1.11.1  
							
							 
							
							
							
						 
						
							2017-05-06 16:38:36 +01:00  
						
					 
				
					
						
							
							
								 
								pyup-bot
							
						 
						
							 
							
							
							
							
								
							
							
								e103eaad74 
								
							 
						 
						
							
							
								
								Update braintree from 3.35.0 to 3.37.2  
							
							 
							
							
							
						 
						
							2017-05-05 22:28:21 +01:00  
						
					 
				
					
						
							
							
								 
								pyup-bot
							
						 
						
							 
							
							
							
							
								
							
							
								7493f3d239 
								
							 
						 
						
							
							
								
								Update django-debug-toolbar from 1.7 to 1.8  
							
							 
							
							
							
						 
						
							2017-05-05 09:20:26 +01:00  
						
					 
				
					
						
							
							
								 
								pyup-bot
							
						 
						
							 
							
							
							
							
								
							
							
								70ec17242e 
								
							 
						 
						
							
							
								
								Update django-allauth from 0.31.0 to 0.32.0  
							
							 
							
							
							
						 
						
							2017-04-27 10:10:59 +01:00  
						
					 
				
					
						
							
							
								 
								pyup-bot
							
						 
						
							 
							
							
							
							
								
							
							
								01f596da8a 
								
							 
						 
						
							
							
								
								Update django-redis from 4.7.0 to 4.8.0  
							
							 
							
							
							
						 
						
							2017-04-25 13:57:19 +01:00  
						
					 
				
					
						
							
							
								 
								pyup.io bot
							
						 
						
							 
							
							
							
							
								
							
							
								f45af116f6 
								
							 
						 
						
							
							
								
								Update ipdb from 0.10.1 to 0.10.3 ( #95 )  
							
							 
							
							
							
						 
						
							2017-04-22 16:58:21 +01:00  
						
					 
				
					
						
							
							
								 
								pyup-bot
							
						 
						
							 
							
							
							
							
								
							
							
								b8af661317 
								
							 
						 
						
							
							
								
								Update django-environ from 0.4.2 to 0.4.3  
							
							 
							
							
							
						 
						
							2017-04-19 19:01:25 +01:00  
						
					 
				
					
						
							
							
								 
								pyup.io bot
							
						 
						
							 
							
							
							
							
								
							
							
								568241412c 
								
							 
						 
						
							
							
								
								Update sphinx from 1.5.3 to 1.5.5 ( #92 )  
							
							 
							
							
							
						 
						
							2017-04-16 21:02:30 +01:00  
						
					 
				
					
						
							
							
								 
								pyup.io bot
							
						 
						
							 
							
							
							
							
								
							
							
								517fa033b8 
								
							 
						 
						
							
							
								
								Update django-test-plus to 1.0.17 ( #93 )  
							
							 
							
							... 
							
							
							
							* Update django-test-plus from 1.0.16 to 1.0.17
* Update django-test-plus from 1.0.16 to 1.0.17 
							
						 
						
							2017-04-16 21:01:58 +01:00  
						
					 
				
					
						
							
							
								 
								pyup-bot
							
						 
						
							 
							
							
							
							
								
							
							
								ec2cc5c649 
								
							 
						 
						
							
							
								
								Update django-model-utils from 2.6 to 3.0.0  
							
							 
							
							
							
						 
						
							2017-04-14 01:36:04 +01:00