Mirrored_Repos/InvenTree
1
0
Fork 0
mirror of https://github.com/inventree/InvenTree synced 2024-08-30 18:33:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,245 Commits 6 Branches 99 Tags 484 MiB
69437220ce
Commit Graph

7245 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Oliver
69c253bee5 Merge remote-tracking branch 'inventree/l10_crowdin' into l10 
# Conflicts:
#	InvenTree/locale/de/LC_MESSAGES/django.po
#	InvenTree/locale/es/LC_MESSAGES/django.po
#	InvenTree/locale/fr/LC_MESSAGES/django.po
#	InvenTree/locale/it/LC_MESSAGES/django.po
#	InvenTree/locale/ja/LC_MESSAGES/django.po
#	InvenTree/locale/pl/LC_MESSAGES/django.po
#	InvenTree/locale/ru/LC_MESSAGES/django.po
#	InvenTree/locale/tr/LC_MESSAGES/django.po
#	InvenTree/locale/zh/LC_MESSAGES/django.po
 2021-06-17 08:50:32 +10:00
Matthias
bbe7edbf82 totals like in #1666 2021-06-17 00:50:10 +02:00
Oliver
a8ae62e133 Merge remote-tracking branch 'inventree/master' into l10 2021-06-17 08:49:00 +10:00
Oliver
0f53a03aae Fix: New translations django.po from Crowdin 2021-06-17 08:41:06 +10:00
Oliver
d85fe7cf4c Fix: New translations django.po from Crowdin 2021-06-17 08:41:04 +10:00
Oliver
e1e3608700 Fix: New translations django.po from Crowdin 2021-06-17 08:41:03 +10:00
Oliver
431ae69ee9 Fix: New translations django.po from Crowdin 2021-06-17 08:41:02 +10:00
Oliver
5704dcc551 Fix: New translations django.po from Crowdin 2021-06-17 08:41:00 +10:00
Oliver
42ecb11dbc Fix: New translations django.po from Crowdin 2021-06-17 08:40:59 +10:00
Oliver
b59de2a9ba Fix: New translations django.po from Crowdin 2021-06-17 08:40:58 +10:00
Oliver
716167d4d0 Fix: New translations django.po from Crowdin 2021-06-17 08:40:57 +10:00
Oliver
7fd9dd4f12 Fix: New translations django.po from Crowdin 2021-06-17 08:40:55 +10:00
github-actions[bot]
7eb420409b updated translation base 2021-06-16 22:40:13 +00:00
Oliver
5bbc44e816
Merge pull request #1666 from matmair/po-total 
total price column as per #1660
 2021-06-17 08:38:51 +10:00
Matthias
5d3360e63b added quantity total 2021-06-17 00:23:08 +02:00
Matthias
dac112d908 added footer total for price 2021-06-17 00:22:32 +02:00
Matthias
2fc185bd71 show footer 2021-06-16 23:57:33 +02:00
Matthias
70e0933336 total price column as per #1660 2021-06-16 23:52:00 +02:00
Oliver Walters
70f3c03b64 Merge remote-tracking branch 'upstream/l10_crowdin' into l10 
# Conflicts:
#	InvenTree/locale/de/LC_MESSAGES/django.po
#	InvenTree/locale/es/LC_MESSAGES/django.po
#	InvenTree/locale/fr/LC_MESSAGES/django.po
#	InvenTree/locale/it/LC_MESSAGES/django.po
#	InvenTree/locale/ja/LC_MESSAGES/django.po
#	InvenTree/locale/pl/LC_MESSAGES/django.po
#	InvenTree/locale/ru/LC_MESSAGES/django.po
#	InvenTree/locale/tr/LC_MESSAGES/django.po
#	InvenTree/locale/zh/LC_MESSAGES/django.po
 2021-06-17 00:37:50 +10:00
Oliver Walters
4703fdf1b3 Merge remote-tracking branch 'upstream/master' 2021-06-17 00:34:29 +10:00
Oliver
0781ad525e Fix: New translations django.po from Crowdin 2021-06-17 00:02:35 +10:00
Oliver
f44959b9a8 Fix: New translations django.po from Crowdin 2021-06-17 00:02:34 +10:00
Oliver
626019323b Fix: New translations django.po from Crowdin 2021-06-17 00:02:31 +10:00
Oliver
1f10ab699f Fix: New translations django.po from Crowdin 2021-06-17 00:02:29 +10:00
Oliver
e01a3b7c5f Fix: New translations django.po from Crowdin 2021-06-17 00:02:27 +10:00
Oliver
dcb2078572 Fix: New translations django.po from Crowdin 2021-06-17 00:02:25 +10:00
Oliver
10a0eb8d70 Fix: New translations django.po from Crowdin 2021-06-17 00:02:23 +10:00
Oliver
2f9f9bd99c Fix: New translations django.po from Crowdin 2021-06-17 00:02:21 +10:00
Oliver
d5014bb08a Fix: New translations django.po from Crowdin 2021-06-17 00:02:19 +10:00
github-actions[bot]
21ccf7c4a1 updated translation base 2021-06-16 13:55:59 +00:00
Oliver
9386332de1
Update version.py 2021-06-16 23:54:42 +10:00
github-actions[bot]
a0a1ff6837 updated translation base 2021-06-16 13:54:22 +00:00
Oliver
731ea0238e
Update version.py 
Bump version number
 2021-06-16 23:53:58 +10:00
Oliver
b2247b3830
Merge pull request #1664 from SchrodingersGat/docker-production 
Docker production
 2021-06-16 23:52:52 +10:00
Oliver Walters
8e9bf2aadd Fix typo in docker-compose.yml 2021-06-16 23:31:36 +10:00
Oliver Walters
513449e13c Whoops, missed one 2021-06-16 23:03:38 +10:00
Oliver Walters
725d26d76f Fix default paths in InvenTree settings 2021-06-16 23:03:09 +10:00
Oliver Walters
d85b906560 Fix comment in docker-compose.yml file 2021-06-16 22:57:31 +10:00
Oliver Walters
7dd63b36da Simplify dockerfile / docker-compose 
- Single data volume now also includes 'static' files
- InvenTree source repo is now cloned into /home/inventree (to match the "dev" image)
 2021-06-16 22:36:05 +10:00
Oliver Walters
acd7322ff0 Files under /media require session to be authenticated 
References:

- https://docs.djangoproject.com/en/3.2/howto/deployment/wsgi/apache-auth/
- https://stackoverflow.com/questions/46421589/nginx-location-and-django-auth
- https://docs.nginx.com/nginx/admin-guide/security-controls/configuring-subrequest-authentication/
- https://pawamoy.github.io/posts/django-auth-server-for-shiny/
 2021-06-16 21:30:25 +10:00
Oliver Walters
058fc57ff1 Serve media files via nginx 2021-06-16 20:57:24 +10:00
Oliver Walters
0821ead024 Only provide static redirects if in DEBUG mode 2021-06-15 23:51:37 +10:00
Oliver Walters
632ea593fe Fix default port association 2021-06-15 23:40:50 +10:00
Oliver Walters
8bfdb0bec6 Comment fix 2021-06-15 23:19:50 +10:00
Oliver Walters
01328075ea All "development" related stuff now goes under ./dev 
- Update dev-config.env
- Update docker-compose.dev.yml
- Development target of Dockerfile no longer creates any folders
- Update entry point scripts
 2021-06-15 23:05:03 +10:00
Oliver
b8df6038fb Fix: New translations django.po from Crowdin 2021-06-15 07:34:13 +10:00
Oliver
d2661ed5c2 Fix: New translations django.po from Crowdin 2021-06-15 07:34:12 +10:00
Oliver
cacb3d5f3c Fix: New translations django.po from Crowdin 2021-06-15 07:34:11 +10:00
Oliver
f0769d3298 Fix: New translations django.po from Crowdin 2021-06-15 07:34:09 +10:00
Oliver
c1499a7748 Fix: New translations django.po from Crowdin 2021-06-15 07:34:08 +10:00