Oliver
							
						 
					 | 
					
						
						
							
						
						9884c0fadb
					 | 
					
						
						
							
							Adds filters for "manufacturer-parts" list
						
						
						
						
						
						
					 | 
					
						2021-12-21 16:47:20 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						46aeafb5da
					 | 
					
						
						
							
							Adds filter for "assigned stock" view on customer page
						
						
						
						
						
						
					 | 
					
						2021-12-21 16:44:49 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						0a21512329
					 | 
					
						
						
							
							Adds refresh and filtering for "company" table
						
						
						
						
						
						
					 | 
					
						2021-12-21 16:41:34 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						974dcb6839
					 | 
					
						
						
							
							Merge pull request #2473 from SchrodingersGat/ci-fixes
						
						
						
						
						
						
						
						Use sqlite config for docker build test 
						
						
					 | 
					
						2021-12-21 16:34:37 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						ecb9643cc1
					 | 
					
						
						
							
							Use sqlite config for docker build test
						
						
						
						
						
						
					 | 
					
						2021-12-21 16:14:04 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						09777c5764
					 | 
					
						
						
							
							Merge pull request #2468 from SchrodingersGat/merge-stock-items
						
						
						
						
						
						
						
						Merge stock items 
						
						
					 | 
					
						2021-12-21 13:56:27 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						52ca2e5068
					 | 
					
						
						
							
							Add another check for merging stock
						
						
						
						
						
						
					 | 
					
						2021-12-21 09:29:12 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						dd53748f9f
					 | 
					
						
						
							
							Cleanup models
						
						
						
						
						
						
					 | 
					
						2021-12-21 08:49:53 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						785c5edf96
					 | 
					
						
						
							
							Reduce verbosity of translation coverage stats script
						
						
						
						
						
						
					 | 
					
						2021-12-21 08:13:38 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						5032c1c099
					 | 
					
						
						
							
							Merge remote-tracking branch 'inventree/master' into merge-stock-items
						
						
						
						
						
						
					 | 
					
						2021-12-21 01:03:54 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						fcb2bb2a46
					 | 
					
						
						
							
							Fix behaviour on deleting parent stock item
						
						
						
						
						
						
					 | 
					
						2021-12-21 01:03:37 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						7e897c0bd5
					 | 
					
						
						
							
							Merge pull request #2467 from SchrodingersGat/postgresql-dev
						
						
						
						
						
						
						
						Change dev environment setup to use postgresql 
						
						
					 | 
					
						2021-12-21 01:03:13 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						e49f89d8cc
					 | 
					
						
						
							
							Revert "Remove sqlite tests for CI"
						
						
						
						
						
						
						
						This reverts commit 470ad5507a. 
						
						
					 | 
					
						2021-12-21 00:43:03 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						470ad5507a
					 | 
					
						
						
							
							Remove sqlite tests for CI
						
						
						
						
						
						
					 | 
					
						2021-12-21 00:40:41 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						11d3cd3c0c
					 | 
					
						
						
							
							Change dev environment setup to use postgresql
						
						
						
						
						
						
						
						- sqlite causes too many errors
- fix requirements file
- fixes for docker setup
- A lot of concurrency issues
- Bite the bullet, time to go! 
						
						
					 | 
					
						2021-12-21 00:34:23 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						552ca8e5c4
					 | 
					
						
						
							
							Adds javascript function to merge multiple stock items together
						
						
						
						
						
						
					 | 
					
						2021-12-20 22:09:08 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						31dbb9563b
					 | 
					
						
						
							
							Add some unit tests for the new endpoint
						
						
						
						
						
						
					 | 
					
						2021-12-20 21:25:27 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						943b27e195
					 | 
					
						
						
							
							Adds "items" list to API endpoint
						
						
						
						
						
						
					 | 
					
						2021-12-20 19:29:08 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						5ca50022b9
					 | 
					
						
						
							
							Incremenent API version
						
						
						
						
						
						
					 | 
					
						2021-12-20 18:47:51 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						fdf79065a9
					 | 
					
						
						
							
							Adds framework for API endpoint and serializer to merge stock items
						
						
						
						
						
						
					 | 
					
						2021-12-20 18:03:08 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						189f836e47
					 | 
					
						
						
							
							Merge pull request #2466 from SchrodingersGat/depleted-badge
						
						
						
						
						
						
						
						Float "depleted" badge to the right 
						
						
					 | 
					
						2021-12-20 14:25:03 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						d2896e0418
					 | 
					
						
						
							
							Merge pull request #2465 from SchrodingersGat/search-query-fix
						
						
						
						
						
						
						
						Cleanup search results page 
						
						
					 | 
					
						2021-12-20 13:30:58 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						c060bc0815
					 | 
					
						
						
							
							Float "depleted" badge to the right
						
						
						
						
						
						
					 | 
					
						2021-12-20 13:30:54 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						ec4f898562
					 | 
					
						
						
							
							Cleanup search results page
						
						
						
						
						
						
					 | 
					
						2021-12-20 13:10:48 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						f92600501a
					 | 
					
						
						
							
							Merge pull request #2464 from SchrodingersGat/po-receive-fix
						
						
						
						
						
						
						
						Hide "receive parts" button for orders which have been cancelled 
						
						
					 | 
					
						2021-12-20 11:56:31 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						81a3547120
					 | 
					
						
						
							
							Hide "receive parts" button for orders which have been cancelled
						
						
						
						
						
						
					 | 
					
						2021-12-20 11:17:29 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						2e5eda80fc
					 | 
					
						
						
							
							Merge pull request #2458 from SchrodingersGat/scrollbars
						
						
						
						
						
						
						
						Clip screen overflow 
						
						
					 | 
					
						2021-12-16 08:50:56 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						30f509ad32
					 | 
					
						
						
							
							Clip overflow
						
						
						
						
						
						
					 | 
					
						2021-12-16 08:27:55 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						597d26d3d4
					 | 
					
						
						
							
							Merge pull request #2452 from SchrodingersGat/bom-export-form-fixes
						
						
						
						
						
						
						
						BOM export form fixes 
						
						
					 | 
					
						2021-12-14 23:15:51 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						4805540b4c
					 | 
					
						
						
							
							try simplifying
						
						
						
						
						
						
					 | 
					
						2021-12-14 22:52:14 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						070d01b2f4
					 | 
					
						
						
							
							Try with newer python
						
						
						
						
						
						
					 | 
					
						2021-12-14 22:48:44 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						51543dff21
					 | 
					
						
						
							
							Merge pull request #2451 from sintech/tree_improvement
						
						
						
						
						
						
						
						Subcategory treeview improvements 
						
						
					 | 
					
						2021-12-14 22:45:17 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						a9d09c7d29
					 | 
					
						
						
							
							Fix mysql installs for github actions
						
						
						
						
						
						
					 | 
					
						2021-12-14 19:56:34 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								sintech
							
						 
					 | 
					
						
						
							
						
						58364bb3b5
					 | 
					
						
						
							
							JS style fix
						
						
						
						
						
						
					 | 
					
						2021-12-14 11:30:09 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						967584b25a
					 | 
					
						
						
							
							Specify mysql version
						
						
						
						
						
						
					 | 
					
						2021-12-14 17:35:36 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								sintech
							
						 
					 | 
					
						
						
							
						
						b6d9bc3093
					 | 
					
						
						
							
							Remove treeview state saving.
						
						
						
						
						
						
					 | 
					
						2021-12-13 15:51:34 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						8d4f8204ca
					 | 
					
						
						
							
							call apt-get update in workflow scripts
						
						
						
						
						
						
					 | 
					
						2021-12-13 23:48:30 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						36026a9217
					 | 
					
						
						
							
							PEP fixes
						
						
						
						
						
						
					 | 
					
						2021-12-13 23:15:06 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						922b8b1c30
					 | 
					
						
						
							
							Fix typo
						
						
						
						
						
						
						
						(cherry picked from commit 673a5779f9) 
						
						
					 | 
					
						2021-12-13 23:12:18 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						01ce752a8c
					 | 
					
						
						
							
							BOM export options are now han
						
						
						
						
						
						
						
						(cherry picked from commit c797eb0703) 
						
						
					 | 
					
						2021-12-13 23:12:11 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						88fc0393b7
					 | 
					
						
						
							
							Logic fix for boolean fields in JS forms
						
						
						
						
						
						
						
						(cherry picked from commit 10dec7743e) 
						
						
					 | 
					
						2021-12-13 23:11:56 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						d75ce451be
					 | 
					
						
						
							
							Allow user to select file format when downloadin BOM import template
						
						
						
						
						
						
						
						(cherry picked from commit 8030ca0bb9) 
						
						
					 | 
					
						2021-12-13 23:11:42 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								sintech
							
						 
					 | 
					
						
						
							
						
						40f73b00ce
					 | 
					
						
						
							
							Propagate expanded state all the way to the root
						
						
						
						
						
						
					 | 
					
						2021-12-12 19:59:18 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								sintech
							
						 
					 | 
					
						
						
							
						
						e9650a94f3
					 | 
					
						
						
							
							Do not show icons for childless categories
						
						
						
						
						
						
					 | 
					
						2021-12-12 19:57:30 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						95db82a4ea
					 | 
					
						
						
							
							Merge pull request #2450 from SchrodingersGat/bom-pricing-fix
						
						
						
						
						
						
						
						Fix decimal places for money field 
						
						
					 | 
					
						2021-12-12 22:51:50 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						f641a3a014
					 | 
					
						
						
							
							Merge pull request #2449 from inventree/dependabot/pip/django-3.2.10
						
						
						
						
						
						
						
						Bump django from 3.2.5 to 3.2.10 
						
						
					 | 
					
						2021-12-12 22:19:03 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						a2357b5b46
					 | 
					
						
						
							
							Fix decimal places for money field
						
						
						
						
						
						
					 | 
					
						2021-12-12 22:18:29 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								dependabot[bot]
							
						 
					 | 
					
						
						
							
						
						f9b1305f9c
					 | 
					
						
						
							
							Bump django from 3.2.5 to 3.2.10
						
						
						
						
						
						
						
						Bumps [django](https://github.com/django/django) from 3.2.5 to 3.2.10.
- [Release notes](https://github.com/django/django/releases)
- [Commits](https://github.com/django/django/compare/3.2.5...3.2.10)
---
updated-dependencies:
- dependency-name: django
  dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com> 
						
						
					 | 
					
						2021-12-12 10:06:07 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						a56cf5ce49
					 | 
					
						
						
							
							Merge pull request #2221 from matmair/matmair/issue2201
						
						
						
						
						
						
						
						2FA with TOTP 
						
						
					 | 
					
						2021-12-12 21:04:41 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Matthias
							
						 
					 | 
					
						
						
							
						
						41302398e9
					 | 
					
						
						
							
							managment and invoke commands to remove mfa
						
						
						
						
						
						
					 | 
					
						2021-12-11 23:07:37 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |