Oliver Walters 
							
						 
					 
					
						
						
							
						
						78bcbe271a 
					 
					
						
						
							
							Update supervisor conf file  
						
						
						
						
							
						
					 
					
						2021-04-11 13:45:56 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						2e8d3b6424 
					 
					
						
						
							
							Fix for tasks.py (??)  
						
						
						
						
							
						
					 
					
						2021-04-11 13:22:16 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						c9021fe991 
					 
					
						
						
							
							Simplify docker build workflow  
						
						
						
						
							
						
					 
					
						2021-04-10 22:48:23 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						0e1b647e7b 
					 
					
						
						
							
							Remove mariadb test (uses the same backend as mysql!)  
						
						
						
						
							
						
					 
					
						2021-04-10 22:47:30 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						b74d365529 
					 
					
						
						
							
							Merge remote-tracking branch 'upstream/master' into django-q  
						
						
						
						
							
						
					 
					
						2021-04-10 22:46:20 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						3da5505b58 
					 
					
						
						
							
							Fix build workflow  
						
						
						
						
							
						
					 
					
						2021-04-10 22:44:37 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						5a168abbfe 
					 
					
						
						
							
							Separated docker file into separate directory  
						
						
						
						
							
						
					 
					
						2021-04-10 22:42:08 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						8f626d305e 
					 
					
						
						
							
							Fix location of entrypoint scripts  
						
						
						
						
							
						
					 
					
						2021-04-10 22:35:10 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						5d9e273559 
					 
					
						
						
							
							Adds nxinx service  
						
						
						
						
							
						
					 
					
						2021-04-10 22:25:07 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						91b6f98f95 
					 
					
						
						
							
							Update directory structure to match docker config  
						
						
						
						
							
						
					 
					
						2021-04-10 22:08:36 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						2f1db486a0 
					 
					
						
						
							
							Do not use python virtual environment inside container  
						
						
						
						
							
						
					 
					
						2021-04-10 21:40:27 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						823f84e46a 
					 
					
						
						
							
							Simplified volume management in docker-compose  
						
						
						
						
							
						
					 
					
						2021-04-10 20:58:51 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						178715ce61 
					 
					
						
						
							
							Auto create config file in specified location if it does not exist  
						
						
						
						
							
						
					 
					
						2021-04-10 20:57:56 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						e787c853e5 
					 
					
						
						
							
							Update logger context  
						
						
						
						
							
						
					 
					
						2021-04-10 20:08:13 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						5e54b0f5cf 
					 
					
						
						
							
							Auto-generate key file if it does not exist!  
						
						
						
						
							
						
					 
					
						2021-04-10 19:01:02 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						9086c8a3bf 
					 
					
						
						
							
							Simplify external directory structure  
						
						... 
						
						
						
						- All InvenTree data now in a single subdir
- Copy default config file (if it does not exist)
- Config file is accessible from outside world
- Update start_server and start_worker scripts 
						
						
							
						
					 
					
						2021-04-10 17:36:19 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						e011faa9b7 
					 
					
						
						
							
							Merge pull request  #1450  from SchrodingersGat/company-description-optional  
						
						... 
						
						
						
						Company description is no longer a required field 
						
						
							
 
						
					 
					
						2021-04-10 16:19:30 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						e6bd91c9e2 
					 
					
						
						
							
							Company description is no longer a required field  
						
						
						
						
							
						
					 
					
						2021-04-10 15:29:44 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						1372343bd5 
					 
					
						
						
							
							Updates to docker-compose file  
						
						... 
						
						
						
						- Note: not ready yet! 
						
						
							
						
					 
					
						2021-04-10 15:27:50 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						8eb571bddf 
					 
					
						
						
							
							Update dockerfile  
						
						
						
						
							
						
					 
					
						2021-04-10 15:08:10 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						c7e1ac5648 
					 
					
						
						
							
							Merge pull request  #1449  from eeintech/fix_stock_ops  
						
						... 
						
						
						
						Fixed transfer stock action in template 
						
						
							
						
					 
					
						2021-04-10 09:19:43 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						6bf3cc9e01 
					 
					
						
						
							
							Merge pull request  #1446  from eeintech/bom_yaml_export  
						
						... 
						
						
						
						Replace normalize with integer wrapper for quantity field 
						
						
							
						
					 
					
						2021-04-10 09:17:23 +10:00 
						 
				 
			
				
					
						
							
							
								eeintech 
							
						 
					 
					
						
						
							
						
						6bf4140e5a 
					 
					
						
						
							
							Fixed transfer stock action in template  
						
						
						
						
							
						
					 
					
						2021-04-09 16:55:05 -04:00 
						 
				 
			
				
					
						
							
							
								eeintech 
							
						 
					 
					
						
						
							
						
						afddf12339 
					 
					
						
						
							
							Changed int to float  
						
						
						
						
							
						
					 
					
						2021-04-08 22:04:26 -04:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						6a1bb0a806 
					 
					
						
						
							
							Merge pull request  #1445  from eeintech/simple_stock_table_view  
						
						... 
						
						
						
						Simplified stock table view in Part and SupplierPart detail pages 
						
						
							
						
					 
					
						2021-04-09 11:58:33 +10:00 
						 
				 
			
				
					
						
							
							
								eeintech 
							
						 
					 
					
						
						
							
						
						97e1bc0a67 
					 
					
						
						
							
							Added missing part_detail reference  
						
						
						
						
							
						
					 
					
						2021-04-08 21:46:11 -04:00 
						 
				 
			
				
					
						
							
							
								eeintech 
							
						 
					 
					
						
						
							
						
						cbddda6640 
					 
					
						
						
							
							Remove normalize import  
						
						
						
						
							
						
					 
					
						2021-04-08 14:41:06 -04:00 
						 
				 
			
				
					
						
							
							
								eeintech 
							
						 
					 
					
						
						
							
						
						7491cda313 
					 
					
						
						
							
							Replace normalize with integer wrapper for quantity field  
						
						
						
						
							
						
					 
					
						2021-04-08 14:35:47 -04:00 
						 
				 
			
				
					
						
							
							
								eeintech 
							
						 
					 
					
						
						
							
						
						b5a5f5b409 
					 
					
						
						
							
							Simplified stock table view in Part and SupplierPart detail pages  
						
						
						
						
							
						
					 
					
						2021-04-08 13:42:35 -04:00 
						 
				 
			
				
					
						
							
							
								eeintech 
							
						 
					 
					
						
						
							
						
						f8d1ee8805 
					 
					
						
						
							
							Made company description optional  
						
						
						
						
							
						
					 
					
						2021-04-08 13:24:17 -04:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						47a93bc4cb 
					 
					
						
						
							
							More environment variables for config.yaml  
						
						
						
						
							
						
					 
					
						2021-04-08 21:01:52 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						3381945e14 
					 
					
						
						
							
							Add newline  
						
						
						
						
							
						
					 
					
						2021-04-08 17:10:48 +10:00 
						 
				 
			
				
					
						
							
							
								eeintech 
							
						 
					 
					
						
						
							
						
						0bb2507dd6 
					 
					
						
						
							
							Added manufacturer part deletion warning when deleting a part  
						
						
						
						
							
						
					 
					
						2021-04-07 14:02:50 -04:00 
						 
				 
			
				
					
						
							
							
								eeintech 
							
						 
					 
					
						
						
							
						
						1074300ba0 
					 
					
						
						
							
							Improved BOM export of combined manufacturer and supplier data  
						
						
						
						
							
						
					 
					
						2021-04-07 12:24:32 -04:00 
						 
				 
			
				
					
						
							
							
								eeintech 
							
						 
					 
					
						
						
							
						
						ccd35fc4b4 
					 
					
						
						
							
							Fixed supplier part list bug and hide manufacturer fields in supplier part edit form  
						
						
						
						
							
						
					 
					
						2021-04-07 11:50:11 -04:00 
						 
				 
			
				
					
						
							
							
								eeintech 
							
						 
					 
					
						
						
							
						
						c0691c3e9b 
					 
					
						
						
							
							Decoupled manufacturer and supplier data in BOM export, aggregate data needs more work  
						
						
						
						
							
						
					 
					
						2021-04-07 11:43:05 -04:00 
						 
				 
			
				
					
						
							
							
								eeintech 
							
						 
					 
					
						
						
							
						
						63ade51c6c 
					 
					
						
						
							
							Updated migrations after merge with master  
						
						
						
						
							
						
					 
					
						2021-04-07 10:49:19 -04:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						3926276fd1 
					 
					
						
						
							
							Greatly simplified "wait_for_db" command  
						
						
						
						
							
						
					 
					
						2021-04-08 00:37:34 +10:00 
						 
				 
			
				
					
						
							
							
								eeintech 
							
						 
					 
					
						
						
							
						
						f39928368e 
					 
					
						
						
							
							Merge branch 'master' of github.com:inventree/InvenTree into manufacturer_part  
						
						
						
						
							
						
					 
					
						2021-04-07 10:33:55 -04:00 
						 
				 
			
				
					
						
							
							
								eeintech 
							
						 
					 
					
						
						
							
						
						2db6af2af6 
					 
					
						
						
							
							PO table and stock item template improvements  
						
						
						
						
							
						
					 
					
						2021-04-07 10:33:31 -04:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						71cac6e269 
					 
					
						
						
							
							Simplify waiting for db  
						
						
						
						
							
						
					 
					
						2021-04-08 00:09:51 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						ed304f571a 
					 
					
						
						
							
							Better configuration of github repo  
						
						
						
						
							
						
					 
					
						2021-04-08 00:05:37 +10:00 
						 
				 
			
				
					
						
							
							
								eeintech 
							
						 
					 
					
						
						
							
						
						b2264940a3 
					 
					
						
						
							
							Dynamic control of information to make cleaner supplier and manufacturer tables  
						
						
						
						
							
						
					 
					
						2021-04-07 09:54:20 -04:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						14aead038e 
					 
					
						
						
							
							Adds docker_compose file  
						
						
						
						
							
						
					 
					
						2021-04-07 23:46:30 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						d4d9263131 
					 
					
						
						
							
							Add option to specify config file via environment variable  
						
						
						
						
							
						
					 
					
						2021-04-07 23:46:03 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						9c38d67b52 
					 
					
						
						
							
							Merge remote-tracking branch 'upstream/master' into django-q  
						
						... 
						
						
						
						# Conflicts:
#	InvenTree/InvenTree/status.py
#	InvenTree/templates/about.html 
						
						
							
						
					 
					
						2021-04-07 22:29:47 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						4a3ca4638c 
					 
					
						
						
							
							Dockerfile updates  
						
						
						
						
							
						
					 
					
						2021-04-07 22:27:55 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						d91531720b 
					 
					
						
						
							
							Unit testing for task scheduling  
						
						
						
						
							
						
					 
					
						2021-04-07 22:17:24 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						5e0e364b6c 
					 
					
						
						
							
							Merge pull request  #1441  from SchrodingersGat/missing-git  
						
						... 
						
						
						
						Hide git information if there is an error 
						
						
							
						
					 
					
						2021-04-07 22:09:38 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						da63ec5351 
					 
					
						
						
							
							Merge pull request  #1437  from matmair/translation_improv  
						
						... 
						
						
						
						Translation improvements 
						
						
							
						
					 
					
						2021-04-07 20:57:47 +10:00