a36b22692e 
					 
					
						
						
							
							Merge branch 'master' of  https://github.com/inventree/InvenTree  into feature/performance-op  
						
						
						
						
					 
					
						2021-04-21 10:47:25 +02:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						64c29d73cc 
					 
					
						
						
							
							gettext required for translation  
						
						
						
						
					 
					
						2021-04-21 13:11:57 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						043d929dbb 
					 
					
						
						
							
							Fix proper good  
						
						
						
						
					 
					
						2021-04-21 12:57:54 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						096403b429 
					 
					
						
						
							
							CI file fixes  
						
						
						
						
					 
					
						2021-04-21 12:37:20 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						a1e835e01b 
					 
					
						
						
							
							Add some new (empty) locale translation entries  
						
						... 
						
						
						
						- fr
- it
- ja
- pl
- ru
- zh
Also fixes the `invoke translate` command (maybe it was changed with the recent update to Django 3.2?)
The CI pipeline now runs the translation and static collection steps, to check those for errors. 
						
						
					 
					
						2021-04-21 12:33:56 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						b20c832702 
					 
					
						
						
							
							Changes to docker workflow  
						
						
						
						
					 
					
						2021-04-21 11:13:37 +10:00 
						 
				 
			
				
					
						
							
							
								Matthias Mair 
							
						 
					 
					
						
						
							
						
						6c296e1384 
					 
					
						
						
							
							added collection-step to coverage  
						
						
						
						
					 
					
						2021-04-20 19:28:12 +02:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						e057d6d161 
					 
					
						
						
							
							Fix directory  
						
						
						
						
					 
					
						2021-04-18 20:00:03 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						270c0ea85d 
					 
					
						
						
							
							Cleanup docker files  
						
						
						
						
					 
					
						2021-04-18 15:24:33 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						029808a986 
					 
					
						
						
							
							Fix workflow for publishing docker files  
						
						
						
						
					 
					
						2021-04-11 15:45:17 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						b490c5d035 
					 
					
						
						
							
							Add new docker workflow for publising docker images on release  
						
						
						
						
					 
					
						2021-04-11 15:08:13 +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 
							
						 
					 
					
						
						
							
						
						3da5505b58 
					 
					
						
						
							
							Fix build workflow  
						
						
						
						
					 
					
						2021-04-10 22:44:37 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						ed304f571a 
					 
					
						
						
							
							Better configuration of github repo  
						
						
						
						
					 
					
						2021-04-08 00:05:37 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						38b9655ad9 
					 
					
						
						
							
							Remove unused workflow  
						
						
						
						
					 
					
						2021-04-01 08:43:58 +11:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						2746396d11 
					 
					
						
						
							
							Fix tag name  
						
						
						
						
					 
					
						2021-03-31 22:50:41 +11:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						6017cad6b3 
					 
					
						
						
							
							So apparently I cannot spell...  
						
						
						
						
					 
					
						2021-03-31 22:48:58 +11:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						1a7b6e2613 
					 
					
						
						
							
							Fix  
						
						
						
						
					 
					
						2021-03-31 22:47:41 +11:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						ab57fd3b76 
					 
					
						
						
							
							Build docker image  
						
						
						
						
					 
					
						2021-03-31 22:45:42 +11:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						3f257279ee 
					 
					
						
						
							
							Specify directories for CI  
						
						
						
						
					 
					
						2021-03-31 22:31:50 +11:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						731ec25b24 
					 
					
						
						
							
							Merge remote-tracking branch 'inventree/master' into django-q  
						
						... 
						
						
						
						# Conflicts:
#	.github/workflows/style.yaml
#	.travis.yml
#	InvenTree/InvenTree/settings.py 
						
						
					 
					
						2021-03-31 22:17:38 +11:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						73e032e1d0 
					 
					
						
						
							
							Specify database name  
						
						
						
						
					 
					
						2021-03-31 21:54:13 +11:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						82b6c48946 
					 
					
						
						
							
							Specify database name  
						
						
						
						
					 
					
						2021-03-31 21:48:54 +11:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						83cd24961d 
					 
					
						
						
							
							INFO level debug  
						
						
						
						
					 
					
						2021-03-31 21:18:17 +11:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						737a378515 
					 
					
						
						
							
							Extra debug output for tests  
						
						
						
						
					 
					
						2021-03-31 21:17:17 +11:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						f71ebc20ec 
					 
					
						
						
							
							Remove travis script  
						
						
						
						
					 
					
						2021-03-31 21:07:16 +11:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						ac9753e72c 
					 
					
						
						
							
							Add data import/export step  
						
						
						
						
					 
					
						2021-03-31 20:58:30 +11:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						dc94376f6d 
					 
					
						
						
							
							Fix workflows  
						
						
						
						
					 
					
						2021-03-31 20:46:26 +11:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						c846e2e65a 
					 
					
						
						
							
							Use env variables rather than custom ci scripts  
						
						
						
						
					 
					
						2021-03-31 20:39:22 +11:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						2f6ee330de 
					 
					
						
						
							
							Add CI check against MariaDB  
						
						
						
						
					 
					
						2021-03-31 20:20:10 +11:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						c66dddc03f 
					 
					
						
						
							
							Force TCP for postgres  
						
						
						
						
					 
					
						2021-03-31 20:14:57 +11:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						6b99808c52 
					 
					
						
						
							
							Run as root  
						
						
						
						
					 
					
						2021-03-31 20:12:45 +11:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						61d14a0eda 
					 
					
						
						
							
							Database naming fix  
						
						
						
						
					 
					
						2021-03-31 20:07:42 +11:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						3cc0530419 
					 
					
						
						
							
							Root password  
						
						
						
						
					 
					
						2021-03-31 20:01:02 +11:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						cef75aabc5 
					 
					
						
						
							
							Update  
						
						
						
						
					 
					
						2021-03-31 19:59:23 +11:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						09693d0d09 
					 
					
						
						
							
							Start service  
						
						
						
						
					 
					
						2021-03-31 19:54:37 +11:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						67a4c5a9a2 
					 
					
						
						
							
							Try pointing to different host  
						
						
						
						
					 
					
						2021-03-31 19:45:58 +11:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						db8d93e2e9 
					 
					
						
						
							
							Create mysql database manually  
						
						
						
						
					 
					
						2021-03-31 17:54:42 +11:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						af52f0eace 
					 
					
						
						
							
							Typo fix  
						
						
						
						
					 
					
						2021-03-31 17:45:57 +11:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						631e41e22a 
					 
					
						
						
							
							Fix postgres workflow  
						
						
						
						
					 
					
						2021-03-31 17:40:37 +11:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						9e4218d02f 
					 
					
						
						
							
							Mysql fixes  
						
						
						
						
					 
					
						2021-03-31 17:34:12 +11:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						d09483f30c 
					 
					
						
						
							
							Workflow fixes  
						
						
						
						
					 
					
						2021-03-31 17:28:30 +11:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						bdd5fa96e7 
					 
					
						
						
							
							Add tests for mysql and postgresql  
						
						
						
						
					 
					
						2021-03-31 17:18:04 +11:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						d20c3bb733 
					 
					
						
						
							
							GITHUB_TOKEN  
						
						
						
						
					 
					
						2021-03-31 17:08:24 +11:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						ae72224ece 
					 
					
						
						
							
							Fix coveralls  
						
						
						
						
					 
					
						2021-03-31 16:57:44 +11:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						fd43f8dc64 
					 
					
						
						
							
							Merge remote-tracking branch 'inventree/master' into coverage-workflow  
						
						... 
						
						
						
						# Conflicts:
#	.github/workflows/style.yaml 
						
						
					 
					
						2021-03-31 16:26:02 +11:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						6b32142725 
					 
					
						
						
							
							run on pull request  
						
						
						
						
					 
					
						2021-03-31 16:24:33 +11:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						01e6635032 
					 
					
						
						
							
							Add workflow for code coverage  
						
						
						
						
					 
					
						2021-03-31 13:06:22 +11:00 
						 
				 
			
				
					
						
							
							
								Oliver Walters 
							
						 
					 
					
						
						
							
						
						b16f85de65 
					 
					
						
						
							
							Update style worfdlow  
						
						
						
						
					 
					
						2021-03-31 12:41:39 +11:00