Oliver 
							
						 
					 
					
						
						
							
						
						414d2dbc96 
					 
					
						
						
							
							Merge pull request  #1977  from eeintech/company_templates  
						
						... 
						
						
						
						Fixed company templates 
						
						
					 
					
						2021-08-20 07:47:29 +10:00 
						 
				 
			
				
					
						
							
							
								Matthias 
							
						 
					 
					
						
						
							
						
						575cf87b98 
					 
					
						
						
							
							also run static on update  
						
						
						
						
					 
					
						2021-08-19 23:37:38 +02:00 
						 
				 
			
				
					
						
							
							
								Matthias 
							
						 
					 
					
						
						
							
						
						ee33de711a 
					 
					
						
						
							
							move translation stats into own task  
						
						
						
						
					 
					
						2021-08-19 23:36:54 +02:00 
						 
				 
			
				
					
						
							
							
								Matthias 
							
						 
					 
					
						
						
							
						
						cb1e7a6cc5 
					 
					
						
						
							
							only process purchase_price if prices present  
						
						
						
						
					 
					
						2021-08-19 23:22:58 +02:00 
						 
				 
			
				
					
						
							
							
								eeintech 
							
						 
					 
					
						
						
							
						
						ec7392303d 
					 
					
						
						
							
							Fixed company templates  
						
						
						
						
					 
					
						2021-08-19 10:47:46 -04:00 
						 
				 
			
				
					
						
							
							
								github-actions[bot] 
							
						 
					 
					
						
						
							
						
						f60d7887c2 
					 
					
						
						
							
							updated translation base  
						
						
						
						
					 
					
						2021-08-19 06:54:51 +00:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						c16ce925dd 
					 
					
						
						
							
							Merge pull request  #1973  from SchrodingersGat/delete-expired-sessions  
						
						... 
						
						
						
						Run periodic (daily) task to clear out expired sessions 
						
						
					 
					
						2021-08-19 16:53:19 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						f0415640d5 
					 
					
						
						
							
							Run periodic (daily) task to clear out expired sessions  
						
						
						
						
					 
					
						2021-08-19 16:34:57 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						2de2f115c5 
					 
					
						
						
							
							Merge remote-tracking branch 'inventree/l10_crowdin' into l10  
						
						... 
						
						
						
						# Conflicts:
#	InvenTree/locale/de/LC_MESSAGES/django.po
#	InvenTree/locale/el/LC_MESSAGES/django.po
#	InvenTree/locale/es/LC_MESSAGES/django.po
#	InvenTree/locale/fr/LC_MESSAGES/django.po
#	InvenTree/locale/he/LC_MESSAGES/django.po
#	InvenTree/locale/id/LC_MESSAGES/django.po
#	InvenTree/locale/it/LC_MESSAGES/django.po
#	InvenTree/locale/ja/LC_MESSAGES/django.po
#	InvenTree/locale/ko/LC_MESSAGES/django.po
#	InvenTree/locale/nl/LC_MESSAGES/django.po
#	InvenTree/locale/no/LC_MESSAGES/django.po
#	InvenTree/locale/pl/LC_MESSAGES/django.po
#	InvenTree/locale/ru/LC_MESSAGES/django.po
#	InvenTree/locale/sv/LC_MESSAGES/django.po
#	InvenTree/locale/th/LC_MESSAGES/django.po
#	InvenTree/locale/tr/LC_MESSAGES/django.po
#	InvenTree/locale/vi/LC_MESSAGES/django.po
#	InvenTree/locale/zh/LC_MESSAGES/django.po 
						
						
					 
					
						2021-08-19 14:11:21 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						abac55928e 
					 
					
						
						
							
							Fix: New translations django.po from Crowdin  
						
						
						
						
					 
					
						2021-08-19 12:24:39 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						4506eb30c0 
					 
					
						
						
							
							Fix: New translations django.po from Crowdin  
						
						
						
						
					 
					
						2021-08-19 12:24:37 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						6960d6ab54 
					 
					
						
						
							
							Fix: New translations django.po from Crowdin  
						
						
						
						
					 
					
						2021-08-19 12:24:34 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						6d75b0ffc0 
					 
					
						
						
							
							Fix: New translations django.po from Crowdin  
						
						
						
						
					 
					
						2021-08-19 12:24:33 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						cd0d3371be 
					 
					
						
						
							
							Fix: New translations django.po from Crowdin  
						
						
						
						
					 
					
						2021-08-19 12:24:31 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						dafc4adea1 
					 
					
						
						
							
							Fix: New translations django.po from Crowdin  
						
						
						
						
					 
					
						2021-08-19 12:24:30 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						c6ea47ee12 
					 
					
						
						
							
							Fix: New translations django.po from Crowdin  
						
						
						
						
					 
					
						2021-08-19 12:24:28 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						2b0fdcccbc 
					 
					
						
						
							
							Fix: New translations django.po from Crowdin  
						
						
						
						
					 
					
						2021-08-19 12:24:27 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						7907d9c2ee 
					 
					
						
						
							
							Fix: New translations django.po from Crowdin  
						
						
						
						
					 
					
						2021-08-19 12:24:26 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						383f08def9 
					 
					
						
						
							
							Fix: New translations django.po from Crowdin  
						
						
						
						
					 
					
						2021-08-19 12:24:24 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						3794883cf8 
					 
					
						
						
							
							Fix: New translations django.po from Crowdin  
						
						
						
						
					 
					
						2021-08-19 12:24:23 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						de166e1beb 
					 
					
						
						
							
							Fix: New translations django.po from Crowdin  
						
						
						
						
					 
					
						2021-08-19 12:24:22 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						c1cda7ebe0 
					 
					
						
						
							
							Fix: New translations django.po from Crowdin  
						
						
						
						
					 
					
						2021-08-19 12:24:19 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						e4b32c8c9c 
					 
					
						
						
							
							Fix: New translations django.po from Crowdin  
						
						
						
						
					 
					
						2021-08-19 12:24:18 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						71335e59cb 
					 
					
						
						
							
							Fix: New translations django.po from Crowdin  
						
						
						
						
					 
					
						2021-08-19 12:24:17 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						fe9645e211 
					 
					
						
						
							
							Fix: New translations django.po from Crowdin  
						
						
						
						
					 
					
						2021-08-19 12:24:15 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						5c1ea2845d 
					 
					
						
						
							
							Fix: New translations django.po from Crowdin  
						
						
						
						
					 
					
						2021-08-19 12:24:14 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						3e90842be7 
					 
					
						
						
							
							Fix: New translations django.po from Crowdin  
						
						
						
						
					 
					
						2021-08-19 12:24:13 +10:00 
						 
				 
			
				
					
						
							
							
								github-actions[bot] 
							
						 
					 
					
						
						
							
						
						13797f8abe 
					 
					
						
						
							
							updated translation base  
						
						
						
						
					 
					
						2021-08-19 02:13:57 +00:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						c3048a1bf1 
					 
					
						
						
							
							Merge pull request  #1970  from SchrodingersGat/entrypoint  
						
						... 
						
						
						
						Entrypoint 
						
						
					 
					
						2021-08-19 12:12:01 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						9ed2025021 
					 
					
						
						
							
							Add a TODO for future reference  
						
						
						
						
					 
					
						2021-08-19 11:14:13 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						52bdfe5465 
					 
					
						
						
							
							Env interpolation doesn't seem to work in the CMD  
						
						
						
						
					 
					
						2021-08-18 20:52:14 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						eeac561b9b 
					 
					
						
						
							
							typo fix  
						
						
						
						
					 
					
						2021-08-18 17:07:23 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						2095d66677 
					 
					
						
						
							
							Fix entrypoint / cmd for production server  
						
						
						
						
					 
					
						2021-08-18 16:29:54 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						79d7a9f922 
					 
					
						
						
							
							fix typo in dockerfile  
						
						
						
						
					 
					
						2021-08-18 15:16:22 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						41db0ff60d 
					 
					
						
						
							
							Need to specify python3  
						
						
						
						
					 
					
						2021-08-18 14:58:16 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						db477bceab 
					 
					
						
						
							
							typo fix  
						
						
						
						
					 
					
						2021-08-18 14:47:34 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						d756579a06 
					 
					
						
						
							
							Split production environment variables out into a .env file  
						
						
						
						
					 
					
						2021-08-18 13:02:36 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						c1ea6dbb9b 
					 
					
						
						
							
							Remove commented out functionality from the entrypoint command  
						
						
						
						
					 
					
						2021-08-18 12:28:09 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						c2af401854 
					 
					
						
						
							
							Pin base python package requirements  
						
						... 
						
						
						
						- Require invoke to be installed before we can run "invoke update" 
						
						
					 
					
						2021-08-18 12:03:24 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						8fea9bc645 
					 
					
						
						
							
							Re-add docker file git version info  
						
						
						
						
					 
					
						2021-08-18 11:25:19 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						7bfddd6d51 
					 
					
						
						
							
							Simplify init scripts  
						
						... 
						
						
						
						Single script init.sh which performs the following tasks:
- Creates required directory structure
- Activates python venv (if required)
- Waits for database connection
- Runs command 
						
						
					 
					
						2021-08-18 09:52:27 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						3b8ee48581 
					 
					
						
						
							
							Fix env defines in dockerfile  
						
						
						
						
					 
					
						2021-08-18 09:34:09 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						da834d8bcc 
					 
					
						
						
							
							Reduce cruft in logs  
						
						
						
						
					 
					
						2021-08-18 00:04:38 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						b48db6f8fe 
					 
					
						
						
							
							Dockerfile fixes  
						
						
						
						
					 
					
						2021-08-17 23:15:05 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						187c9b0971 
					 
					
						
						
							
							Add server init script  
						
						... 
						
						
						
						- Taken (mostly) from https://github.com/inventree/InvenTree/pull/1949  
						
						
					 
					
						2021-08-17 23:10:57 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						8b66babd49 
					 
					
						
						
							
							Refactor dockerfile  
						
						... 
						
						
						
						- Ref: https://github.com/inventree/InvenTree/pull/1949 
- Squash all apk commands into single line
- Drop to inventree user rather than running as root
- Separate entrypoint and cmd for each target
- Set the INVENTREE_PY_ENV variable in development mode 
						
						
					 
					
						2021-08-17 22:58:44 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						b371a65897 
					 
					
						
						
							
							Fix: New translations django.po from Crowdin  
						
						
						
						
					 
					
						2021-08-17 21:24:40 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						03cdbb2eb0 
					 
					
						
						
							
							Fix: New translations django.po from Crowdin  
						
						
						
						
					 
					
						2021-08-17 21:24:38 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						6198474147 
					 
					
						
						
							
							Fix: New translations django.po from Crowdin  
						
						
						
						
					 
					
						2021-08-17 21:24:37 +10:00 
						 
				 
			
				
					
						
							
							
								Oliver 
							
						 
					 
					
						
						
							
						
						e1b46daf16 
					 
					
						
						
							
							Fix: New translations django.po from Crowdin  
						
						
						
						
					 
					
						2021-08-17 21:24:35 +10:00