| 
						
					 | 
					
						
						
							
						
						75f487aee9
					 | 
					
						
						
							
							Merge branch 'master' of https://github.com/inventree/InvenTree into price-history
						
						
						
						
						
						
					 | 
					
						2021-05-04 00:02:15 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						036c5661ec
					 | 
					
						
						
							
							Link for credits in UI and README Closes #1533
						
						
						
						
						
						
					 | 
					
						2021-04-30 23:40:52 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						c60f4c4f2f
					 | 
					
						
						
							
							Merge pull request #1529 from matmair/matmair/issue1527
						
						
						
						
						
						
						
						per session user-language settings 
						
						
					 | 
					
						2021-04-30 11:53:39 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eeintech
							
						 
					 | 
					
						
						
							
						
						a63d5012f0
					 | 
					
						
						
							
							Purchase order fixes
						
						
						
						
						
						
					 | 
					
						2021-04-28 13:16:40 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						15eb835ffc
					 | 
					
						
						
							
							explicit redirection url Fixes #1527
						
						
						
						
						
						
					 | 
					
						2021-04-28 14:38:07 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c5640fe6c6
					 | 
					
						
						
							
							renamed theme to appearance
						
						
						
						
						
						
					 | 
					
						2021-04-28 14:37:11 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						660f2673ac
					 | 
					
						
						
							
							added in language-change form
						
						
						
						
						
						
					 | 
					
						2021-04-28 14:26:55 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f4502aecca
					 | 
					
						
						
							
							Merge branch 'master' of https://github.com/inventree/InvenTree into price-history
						
						
						
						
						
						
					 | 
					
						2021-04-26 21:48:42 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						d6ef9ee212
					 | 
					
						
						
							
							Adds some more translatable strings
						
						
						
						
						
						
						
						- Mostly just to check the workflow integration 
						
						
					 | 
					
						2021-04-22 23:19:11 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						294dd0525f
					 | 
					
						
						
							
							use spaces instead of tabs
						
						
						
						
						
						
					 | 
					
						2021-04-22 12:53:49 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a0154067d2
					 | 
					
						
						
							
							added setting -> default false
						
						
						
						
						
						
					 | 
					
						2021-04-22 12:05:48 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						07d68f7fde
					 | 
					
						
						
							
							Merge branch 'master' of https://github.com/inventree/InvenTree into price-history
						
						
						
						
						
						
					 | 
					
						2021-04-21 11:12:48 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						5a44a50f3b
					 | 
					
						
						
							
							Fix date in build table
						
						
						
						
						
						
					 | 
					
						2021-04-21 16:44:17 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						76e2b67f36
					 | 
					
						
						
							
							Fix logic for completing builds
						
						
						
						
						
						
						
						- Display better messages to the user, too 
						
						
					 | 
					
						2021-04-21 16:44:17 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						05e2b62305
					 | 
					
						
						
							
							Bug fix - calculate button PK at run time!!
						
						
						
						
						
						
					 | 
					
						2021-04-21 16:44:17 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						16b01ed772
					 | 
					
						
						
							
							significant rework of the build allocation tables / views
						
						
						
						
						
						
					 | 
					
						2021-04-21 16:44:16 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						9e470d4064
					 | 
					
						
						
							
							Add separate section for "untracked" part allocation
						
						
						
						
						
						
					 | 
					
						2021-04-21 16:44:16 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						4903826be1
					 | 
					
						
						
							
							Merge pull request #1494 from matmair/feature/js_translation
						
						
						
						
						
						
						
						Translating JS-Files once 
						
						
					 | 
					
						2021-04-20 22:58:43 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						2943dc6083
					 | 
					
						
						
							
							initial implementation as in #1485
						
						
						
						
						
						
					 | 
					
						2021-04-20 13:37:19 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						c5fa0bb459
					 | 
					
						
						
							
							Improved API filtering for PartCategory
						
						
						
						
						
						
					 | 
					
						2021-04-20 20:15:06 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						38eea21f4f
					 | 
					
						
						
							
							Enable printing of multiple stock location labels
						
						
						
						
						
						
					 | 
					
						2021-04-20 20:06:13 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						412b05d76c
					 | 
					
						
						
							
							Allow API filtering by "cascading" stock locations
						
						
						
						
						
						
					 | 
					
						2021-04-20 20:00:15 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						6986709fb8
					 | 
					
						
						
							
							Reorganized stock location view
						
						
						
						
						
						
					 | 
					
						2021-04-20 19:49:07 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						f578f68001
					 | 
					
						
						
							
							Split "part category" view into separate pages
						
						
						
						
						
						
					 | 
					
						2021-04-20 19:30:43 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						157d58b157
					 | 
					
						
						
							
							Merge pull request #1481 from matmair/instance-name-in-title
						
						
						
						
						
						
						
						Instance name in title 
						
						
					 | 
					
						2021-04-18 21:48:37 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6c3a66f7d6
					 | 
					
						
						
							
							Merge branch 'master' of https://github.com/inventree/InvenTree into price-history
						
						
						
						
						
						
					 | 
					
						2021-04-18 12:58:19 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7a0a901c2b
					 | 
					
						
						
							
							translations fo true/false yes /no
						
						
						
						
						
						
					 | 
					
						2021-04-17 23:28:10 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b1e08dae78
					 | 
					
						
						
							
							Merge branch 'master' of https://github.com/inventree/InvenTree into instance-name-in-title
						
						
						
						
						
						
					 | 
					
						2021-04-17 12:19:38 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3598c36043
					 | 
					
						
						
							
							Merge branch 'master' of https://github.com/inventree/InvenTree into price-history
						
						
						
						
						
						
					 | 
					
						2021-04-17 09:59:05 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eeintech
							
						 
					 | 
					
						
						
							
						
						2b4723cc32
					 | 
					
						
						
							
							Hide system alert for non-staff users, introduced orange icon for less severe alert than background workers not running (like missing email config)
						
						
						
						
						
						
					 | 
					
						2021-04-16 12:22:13 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver
							
						 
					 | 
					
						
						
							
						
						d4529ec1c4
					 | 
					
						
						
							
							Merge pull request #1464 from matmair/translation_improv
						
						
						
						
						
						
						
						Translation improvments 
						
						
					 | 
					
						2021-04-16 21:46:07 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						098ac0c461
					 | 
					
						
						
							
							using feature in views
						
						
						
						
						
						
					 | 
					
						2021-04-15 14:52:08 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d49977bed3
					 | 
					
						
						
							
							initial implementation as described in #1463
						
						
						
						
						
						
					 | 
					
						2021-04-15 14:51:11 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						cfae92e22b
					 | 
					
						
						
							
							more translated strings for api-titles and filters
						
						
						
						
						
						
					 | 
					
						2021-04-15 12:15:02 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						75381cbb7b
					 | 
					
						
						
							
							Merge branch 'master' of https://github.com/inventree/InvenTree into price-history
						
						
						
						
						
						
					 | 
					
						2021-04-14 21:18:21 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eeintech
							
						 
					 | 
					
						
						
							
						
						42a73576da
					 | 
					
						
						
							
							Merge branch 'master' of github.com:inventree/InvenTree into manufacturer_part
						
						
						
						
						
						
					 | 
					
						2021-04-13 09:48:55 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						96efb0eb28
					 | 
					
						
						
							
							Remove "forgot password" link if the email backend is not configured
						
						
						
						
						
						
					 | 
					
						2021-04-13 20:02:20 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eeintech
							
						 
					 | 
					
						
						
							
						
						3eae70e745
					 | 
					
						
						
							
							Merged master and company migrations
						
						
						
						
						
						
					 | 
					
						2021-04-12 11:10:35 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						f902b79d79
					 | 
					
						
						
							
							And more templates
						
						
						
						
						
						
					 | 
					
						2021-04-12 20:07:38 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						12a4c22a9b
					 | 
					
						
						
							
							Password reset templates
						
						
						
						
						
						
					 | 
					
						2021-04-12 20:02:05 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oliver Walters
							
						 
					 | 
					
						
						
							
						
						b74d365529
					 | 
					
						
						
							
							Merge remote-tracking branch 'upstream/master' into django-q
						
						
						
						
						
						
					 | 
					
						2021-04-10 22:46:20 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eeintech
							
						 
					 | 
					
						
						
							
						
						97e1bc0a67
					 | 
					
						
						
							
							Added missing part_detail reference
						
						
						
						
						
						
					 | 
					
						2021-04-08 21:46:11 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eeintech
							
						 
					 | 
					
						
						
							
						
						b5a5f5b409
					 | 
					
						
						
							
							Simplified stock table view in Part and SupplierPart detail pages
						
						
						
						
						
						
					 | 
					
						2021-04-08 13:42:35 -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
							
						 
					 | 
					
						
						
							
						
						f39928368e
					 | 
					
						
						
							
							Merge branch 'master' of github.com:inventree/InvenTree into manufacturer_part
						
						
						
						
						
						
					 | 
					
						2021-04-07 10:33:55 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eeintech
							
						 
					 | 
					
						
						
							
						
						b2264940a3
					 | 
					
						
						
							
							Dynamic control of information to make cleaner supplier and manufacturer tables
						
						
						
						
						
						
					 | 
					
						2021-04-07 09:54:20 -04: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
							
						 
					 | 
					
						
						
							
						
						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 Walters
							
						 
					 | 
					
						
						
							
						
						6412cf1c87
					 | 
					
						
						
							
							Hide git information if there is an error
						
						
						
						
						
						
					 | 
					
						2021-04-07 20:55:44 +10:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f647120cd1
					 | 
					
						
						
							
							initial showcase implementation
						
						
						
						
						
						
					 | 
					
						2021-04-06 18:17:09 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |