Oliver Marks 
							
						 
						
							
								11d4ee4659 
								
							 
						 
						
							
							
								
								Rejig the requirements and update drone to latest spec.  
							
							
							
						 
						
							2018-12-15 12:37:27 +00:00  
				
					
						
							
							
								
								Oliver Marks 
							
						 
						
							
								4c9c2e2858 
								
							 
						 
						
							
							
								
								Pin redis version  
							
							
							
						 
						
							2018-12-15 12:37:27 +00:00  
				
					
						
							
							
								
								Oliver Marks 
							
						 
						
							
								84a9c22628 
								
							 
						 
						
							
							
								
								Correct requirement for wiki.  
							
							
							
						 
						
							2018-11-12 17:42:39 +00:00  
				
					
						
							
							
								
								Oliver Marks 
							
						 
						
							
								c18396ff1d 
								
							 
						 
						
							
							
								
								Requirements updates  
							
							
							
						 
						
							2018-11-12 17:33:57 +00:00  
				
					
						
							
							
								
								Oliver Marks 
							
						 
						
							
								6a72defd93 
								
							 
						 
						
							
							
								
								Updated requirements  
							
							
							
						 
						
							2018-11-12 17:25:57 +00:00  
				
					
						
							
							
								 
						
							
								cb29f28a78 
								
							 
						 
						
							
							
								
								New JWT token based RFID view  
							
							
							
						 
						
							2018-10-17 19:22:51 +01:00  
				
					
						
							
							
								 
						
							
								d1448c7041 
								
							 
						 
						
							
							
								
								Udpated Django Version  
							
							
							
						 
						
							2018-10-08 08:50:59 +01:00  
				
					
						
							
							
								
								Oliver Marks 
							
						 
						
							
								d4357e3a75 
								
							 
						 
						
							
							
								
								Update feed parser to us different library  
							
							
							
						 
						
							2018-09-18 20:31:49 +01:00  
				
					
						
							
							
								
								Oliver Marks 
							
						 
						
							
								aecd76b567 
								
							 
						 
						
							
							
								
								Add open graph data to the wiki and other pages  
							
							
							
						 
						
							2018-09-18 20:31:49 +01:00  
				
					
						
							
							
								
								Oliver Marks 
							
						 
						
							
								9c23136214 
								
							 
						 
						
							
							
								
								adjusting boto to store media in a bucket instead of locally on the server  
							
							
							
						 
						
							2018-09-14 22:03:45 +01:00  
				
					
						
							
							
								
								Oliver Marks 
							
						 
						
							
								d19d81fb1e 
								
							 
						 
						
							
							
								
								update libraries  
							
							
							
						 
						
							2018-09-11 14:07:07 +01:00  
				
					
						
							
							
								
								Oliver Marks 
							
						 
						
							
								55af847443 
								
							 
						 
						
							
							
								
								Django 2  
							
							
							
						 
						
							2018-09-08 10:15:22 +01:00  
				
					
						
							
							
								
								Oliver Marks 
							
						 
						
							
								673c194967 
								
							 
						 
						
							
							
								
								Twitter reminder support  
							
							
							
						 
						
							2018-05-08 21:49:13 +01:00  
				
					
						
							
							
								
								Oliver Marks 
							
						 
						
							
								54a90f8359 
								
							 
						 
						
							
							
								
								Ldap server integration  
							
							
							
						 
						
							2018-05-02 13:57:08 +01:00  
				
					
						
							
							
								 
						
							
								f7fb3f5cf7 
								
							 
						 
						
							
							
								
								New project fixes  
							
							
							
						 
						
							2018-03-09 10:46:19 +00:00  
				
					
						
							
							
								 
						
							
								ae1f830785 
								
							 
						 
						
							
							
								
								Simplify config fix wiki styles.  
							
							
							
						 
						
							2018-02-03 19:21:12 +00:00  
				
					
						
							
							
								
								Oliver Marks 
							
						 
						
							
								6ab5049e88 
								
							 
						 
						
							
							
								
								move requirement  
							
							
							
						 
						
							2018-01-31 07:30:27 +00:00  
				
					
						
							
							
								 
						
							
								43a98f7164 
								
							 
						 
						
							
							
								
								Sass fix for permissions  
							
							
							
						 
						
							2018-01-30 14:19:39 +00:00  
				
					
						
							
							
								 
						
							
								579478bb87 
								
							 
						 
						
							
							
								
								Adjust config for dev to be more like live  
							
							
							
						 
						
							2018-01-29 14:30:11 +00:00  
				
					
						
							
							
								
								Oliver Marks 
							
						 
						
							
								0c01228a05 
								
							 
						 
						
							
							
								
								adjust permissions  
							
							
							
						 
						
							2018-01-28 12:25:04 +00:00  
				
					
						
							
							
								
								Oliver Marks 
							
						 
						
							
								95d45661b3 
								
							 
						 
						
							
							
								
								Updated containerr versions  
							
							
							
						 
						
							2018-01-27 21:55:26 +00:00  
				
					
						
							
							
								
								Oliver Marks 
							
						 
						
							
								276a87c0b3 
								
							 
						 
						
							
							
								
								Now on the bucket list :)  
							
							
							
						 
						
							2018-01-21 21:06:51 +00:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								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