Matthias 
							
						 
					 
					
						
						
							
						
						2cf4e20d9a 
					 
					
						
						
							
							Merge branch 'master' of  https://github.com/inventree/InvenTree  into matmair/issue2250  
						
						
						
						
					 
					
						2021-12-07 01:16:32 +01:00 
						 
				 
			
				
					
						
							
							
								Matthias 
							
						 
					 
					
						
						
							
						
						fbc4cfe166 
					 
					
						
						
							
							remove always show  
						
						
						
						
					 
					
						2021-12-07 00:52:14 +01:00 
						 
				 
			
				
					
						
							
							
								Matthias 
							
						 
					 
					
						
						
							
						
						46279c8172 
					 
					
						
						
							
							fix design refs  
						
						
						
						
					 
					
						2021-12-07 00:51:44 +01:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						1a85e4f21d 
					 
					
						
						
							
							Translateable string fixeas  
						
						
						
						
					 
					
						2021-12-07 10:51:40 +11:00 
						 
				 
			
				
					
						
							
							
								Matthias 
							
						 
					 
					
						
						
							
						
						2fa67707bd 
					 
					
						
						
							
							Add text  
						
						
						
						
					 
					
						2021-12-07 00:51:27 +01:00 
						 
				 
			
				
					
						
							
							
								Matthias 
							
						 
					 
					
						
						
							
						
						99a62b2934 
					 
					
						
						
							
							move border on right side to items  
						
						
						
						
					 
					
						2021-12-07 00:41:37 +01:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						463192e0b9 
					 
					
						
						
							
							Improved table filtering for "purchase order" table (as seen from "part" view)  
						
						
						
						
					 
					
						2021-12-07 10:33:09 +11:00 
						 
				 
			
				
					
						
							
							
								Matthias 
							
						 
					 
					
						
						
							
						
						61bdf8937c 
					 
					
						
						
							
							style fix  
						
						
						
						
					 
					
						2021-12-07 00:30:50 +01:00 
						 
				 
			
				
					
						
							
							
								Matthias 
							
						 
					 
					
						
						
							
						
						388b42a407 
					 
					
						
						
							
							use sidebar-wrapper for styleing  
						
						
						
						
					 
					
						2021-12-07 00:26:36 +01:00 
						 
				 
			
				
					
						
							
							
								Matthias 
							
						 
					 
					
						
						
							
						
						f375ba96ae 
					 
					
						
						
							
							add sidetree toggler function  
						
						
						
						
					 
					
						2021-12-07 00:21:33 +01:00 
						 
				 
			
				
					
						
							
							
								Matthias 
							
						 
					 
					
						
						
							
						
						b5ae9edc2e 
					 
					
						
						
							
							style fixes  
						
						
						
						
					 
					
						2021-12-06 23:48:21 +01:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						1ad91811a5 
					 
					
						
						
							
							Merge pull request  #2426  from nwns/feature/qcluster_redis  
						
						... 
						
						
						
						Q_CLUSTER is using the database for its broker 
						
						
					 
					
						2021-12-07 09:24:29 +11:00 
						 
				 
			
				
					
						
							
							
								Matthias 
							
						 
					 
					
						
						
							
						
						c703f9993f 
					 
					
						
						
							
							make url simpler  
						
						
						
						
					 
					
						2021-12-06 22:37:42 +01:00 
						 
				 
			
				
					
						
							
							
								Matthias 
							
						 
					 
					
						
						
							
						
						8e425e67a1 
					 
					
						
						
							
							reduce  
						
						
						
						
					 
					
						2021-12-06 22:37:17 +01:00 
						 
				 
			
				
					
						
							
							
								Matthias 
							
						 
					 
					
						
						
							
						
						70939a0cf9 
					 
					
						
						
							
							first working example  
						
						
						
						
					 
					
						2021-12-06 22:35:14 +01:00 
						 
				 
			
				
					
						
							
							
								Matthias 
							
						 
					 
					
						
						
							
						
						de4d057b93 
					 
					
						
						
							
							Merge branch 'master' of  https://github.com/inventree/InvenTree  into matmair/issue2250  
						
						
						
						
					 
					
						2021-12-06 01:37:48 +01:00 
						 
				 
			
				
					
						
							
							
								Matthias 
							
						 
					 
					
						
						
							
						
						9ebbf8190c 
					 
					
						
						
							
							add tree to replication  
						
						
						
						
					 
					
						2021-12-06 01:35:14 +01:00 
						 
				 
			
				
					
						
							
							
								Matthias 
							
						 
					 
					
						
						
							
						
						416bcb822b 
					 
					
						
						
							
							remove unneeded sidebar block  
						
						
						
						
					 
					
						2021-12-06 01:34:16 +01:00 
						 
				 
			
				
					
						
							
							
								Matthias 
							
						 
					 
					
						
						
							
						
						49f9cc7edc 
					 
					
						
						
							
							modifiy sidebar code  
						
						
						
						
					 
					
						2021-12-06 01:33:41 +01:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						b7f3a044d9 
					 
					
						
						
							
							Merge pull request  #2427  from nwns/fix/overlapping_currency  
						
						... 
						
						
						
						Swallow Serialization failure while updating exchange rates 
						
						
					 
					
						2021-12-06 09:49:54 +11:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						07c88328ae 
					 
					
						
						
							
							Merge pull request  #2423  from SchrodingersGat/maintenance-mode-state-file  
						
						... 
						
						
						
						Adjustments for maintenance-mode options: 
						
						
					 
					
						2021-12-06 09:48:43 +11:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						44d35d06f4 
					 
					
						
						
							
							Merge remote-tracking branch 'inventree/master' into maintenance-mode-state-file  
						
						... 
						
						
						
						# Conflicts:
#	InvenTree/InvenTree/settings.py 
						
						
					 
					
						2021-12-06 09:16:44 +11:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						da020f6fd6 
					 
					
						
						
							
							Remove extra options  
						
						
						
						
					 
					
						2021-12-06 09:05:13 +11:00 
						 
				 
			
				
					
						
							
							
								Nigel 
							
						 
					 
					
						
						
							
						
						a9f584cb65 
					 
					
						
						
							
							fix: swallow Serialization failure  
						
						... 
						
						
						
						We can swallow the serialization exception because there is a scheduled
task that will update these later anyway.
Fixes  #2241  
						
						
					 
					
						2021-12-05 09:24:57 -07:00 
						 
				 
			
				
					
						
							
							
								Nigel 
							
						 
					 
					
						
						
							
						
						561fd6afc1 
					 
					
						
						
							
							fix: Q_CLUSTER is using the database for its broker  
						
						... 
						
						
						
						Q_CLUSTER is using the database as its broker, and adding cache
configuration for it and not using it is pointless.  But rather than
change Q_CLUSTER's configuration to use redis as the broker, lets just
leave it using the database as the database broker has its advantages. 
						
						
					 
					
						2021-12-05 09:04:54 -07:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						8814868fc7 
					 
					
						
						
							
							Merge pull request  #2424  from SchrodingersGat/remove-schedule-delete  
						
						... 
						
						
						
						Remove schedule delete 
						
						
					 
					
						2021-12-05 19:11:00 +11:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						93a240d9c3 
					 
					
						
						
							
							Remove the "scheduled_for_deletion" field from the StockItem model  
						
						... 
						
						
						
						Reverts back to the original behaviour - stock items are just deleted 
						
						
					 
					
						2021-12-05 18:14:14 +11:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						a821717103 
					 
					
						
						
							
							Add a data migration which deletes any stock items which have been scheduled for deletion.  
						
						... 
						
						
						
						Also deletes any instance of the "delete_old_stock_items" worker task 
						
						
					 
					
						2021-12-05 17:56:39 +11:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						ae8166984f 
					 
					
						
						
							
							Adjustments for maintenance-mode options:  
						
						... 
						
						
						
						- Brings the state into the same directory as the runtime config file 
						
						
					 
					
						2021-12-05 17:28:46 +11:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						7ba01612d8 
					 
					
						
						
							
							Merge pull request  #2074  from matmair/plugin-2037  
						
						... 
						
						
						
						New Plugin definition 
						
						
					 
					
						2021-12-05 08:46:47 +11:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						0c9590ba37 
					 
					
						
						
							
							Merge pull request  #2417  from matmair/pipeline  
						
						... 
						
						
						
						Pipeline refactor ... again 
						
						
					 
					
						2021-12-05 08:00:02 +11:00 
						 
				 
			
				
					
						
							
							
								Matthias 
							
						 
					 
					
						
						
							
						
						529987bb17 
					 
					
						
						
							
							remove unneeded Todo  
						
						
						
						
					 
					
						2021-12-04 19:52:56 +01:00 
						 
				 
			
				
					
						
							
							
								Matthias 
							
						 
					 
					
						
						
							
						
						ed5bb3d264 
					 
					
						
						
							
							turn around template loader order  
						
						
						
						
					 
					
						2021-12-04 19:49:43 +01:00 
						 
				 
			
				
					
						
							
							
								Matthias 
							
						 
					 
					
						
						
							
						
						5567ee432a 
					 
					
						
						
							
							more coverage  
						
						
						
						
					 
					
						2021-12-04 18:50:49 +01:00 
						 
				 
			
				
					
						
							
							
								Matthias 
							
						 
					 
					
						
						
							
						
						d156e4c431 
					 
					
						
						
							
							make simpler  
						
						
						
						
					 
					
						2021-12-04 18:44:31 +01:00 
						 
				 
			
				
					
						
							
							
								Matthias 
							
						 
					 
					
						
						
							
						
						2413119cc1 
					 
					
						
						
							
							seperate wrong implementations into own cases  
						
						
						
						
					 
					
						2021-12-04 18:42:08 +01:00 
						 
				 
			
				
					
						
							
							
								Matthias 
							
						 
					 
					
						
						
							
						
						bb2ad7c2cb 
					 
					
						
						
							
							Merge branch 'master' of  https://github.com/inventree/InvenTree  into plugin-2037  
						
						
						
						
					 
					
						2021-12-04 18:04:47 +01:00 
						 
				 
			
				
					
						
							
							
								Matthias Mair 
							
						 
					 
					
						
						
							
						
						1060f60117 
					 
					
						
						
							
							Merge branch 'inventree:master' into webhooks  
						
						
						
						
					 
					
						2021-12-04 17:53:21 +01:00 
						 
				 
			
				
					
						
							
							
								Matthias Mair 
							
						 
					 
					
						
						
							
						
						2a0e07abe0 
					 
					
						
						
							
							Merge branch 'inventree:master' into matmair/issue2201  
						
						
						
						
					 
					
						2021-12-04 17:53:13 +01:00 
						 
				 
			
				
					
						
							
							
								Matthias Mair 
							
						 
					 
					
						
						
							
						
						502d701a70 
					 
					
						
						
							
							Merge branch 'inventree:master' into pipeline  
						
						
						
						
					 
					
						2021-12-04 17:53:02 +01:00 
						 
				 
			
				
					
						
							
							
								Matthias Mair 
							
						 
					 
					
						
						
							
						
						0d9f76a019 
					 
					
						
						
							
							Merge branch 'inventree:master' into matmair/issue2279  
						
						
						
						
					 
					
						2021-12-04 17:52:58 +01:00 
						 
				 
			
				
					
						
							
							
								Matthias 
							
						 
					 
					
						
						
							
						
						2ef8c25c05 
					 
					
						
						
							
							directer import  
						
						
						
						
					 
					
						2021-12-04 17:46:04 +01:00 
						 
				 
			
				
					
						
							
							
								Matthias 
							
						 
					 
					
						
						
							
						
						8724471fc0 
					 
					
						
						
							
							rename  
						
						
						
						
					 
					
						2021-12-04 17:45:52 +01:00 
						 
				 
			
				
					
						
							
							
								Matthias 
							
						 
					 
					
						
						
							
						
						ce726f89a1 
					 
					
						
						
							
							refactor wrong implementations into own testcase  
						
						
						
						
					 
					
						2021-12-04 17:45:40 +01:00 
						 
				 
			
				
					
						
							
							
								Matthias 
							
						 
					 
					
						
						
							
						
						13b390d69b 
					 
					
						
						
							
							test that single errors do not kill the whole  
						
						
						
						
					 
					
						2021-12-04 17:44:10 +01:00 
						 
				 
			
				
					
						
							
							
								Matthias 
							
						 
					 
					
						
						
							
						
						cfd509adb4 
					 
					
						
						
							
							PEP fix  
						
						
						
						
					 
					
						2021-12-04 17:43:11 +01:00 
						 
				 
			
				
					
						
							
							
								Matthias 
							
						 
					 
					
						
						
							
						
						58f0838d3d 
					 
					
						
						
							
							improve coverage  
						
						
						
						
					 
					
						2021-12-04 17:24:41 +01:00 
						 
				 
			
				
					
						
							
							
								Matthias 
							
						 
					 
					
						
						
							
						
						0b6cceb998 
					 
					
						
						
							
							this should not happen  
						
						
						
						
					 
					
						2021-12-04 17:23:35 +01:00 
						 
				 
			
				
					
						
							
							
								Matthias 
							
						 
					 
					
						
						
							
						
						cccbc567fe 
					 
					
						
						
							
							delivery must be true  
						
						
						
						
					 
					
						2021-12-04 17:23:04 +01:00 
						 
				 
			
				
					
						
							
							
								Matthias 
							
						 
					 
					
						
						
							
						
						d9c6e6c4f4 
					 
					
						
						
							
							remove version nb checks  
						
						
						
						
					 
					
						2021-12-04 16:45:59 +01:00