Commit Graph
100 Commits
Author SHA1 Message Date
Oliver 9ffb9552a9 Fix: New translations django.po from Crowdin 2021-06-21 09:45:50 +10:00
Oliver 6eefc2ed0c Fix: New translations django.po from Crowdin 2021-06-21 09:45:49 +10:00
Oliver 7afe1acb0a Fix: New translations django.po from Crowdin 2021-06-21 09:45:47 +10:00
Oliver d3f8620524 Fix: New translations django.po from Crowdin 2021-06-21 09:45:46 +10:00
Oliver 6494c9d7d3 Fix: New translations django.po from Crowdin 2021-06-21 09:45:45 +10:00
Oliver 34485f1224 Fix: New translations django.po from Crowdin 2021-06-21 08:11:27 +10:00
Oliver 0b364d4398 Fix: New translations django.po from Crowdin 2021-06-21 08:11:26 +10:00
Oliver e841b26b72 Fix: New translations django.po from Crowdin 2021-06-21 08:11:24 +10:00
Oliver 7907c4296a Fix: New translations django.po from Crowdin 2021-06-21 08:11:23 +10:00
Oliver 007fcb446f Fix: New translations django.po from Crowdin 2021-06-21 08:11:22 +10:00
Oliver 4c2b392bd3 Fix: New translations django.po from Crowdin 2021-06-21 08:11:20 +10:00
Oliver e570de204a Fix: New translations django.po from Crowdin 2021-06-21 08:11:19 +10:00
Oliver 63b0e5f8ca Fix: New translations django.po from Crowdin 2021-06-21 08:11:18 +10:00
Oliver 527dfe0bab Fix: New translations django.po from Crowdin 2021-06-21 08:11:17 +10:00
Oliver 3293071c8e Fix: New translations django.po from Crowdin 2021-06-21 07:05:46 +10:00
Oliver 431a3f17ee Fix: New translations django.po from Crowdin 2021-06-18 20:58:29 +10:00
Oliver 0c479eba8c Fix: New translations django.po from Crowdin 2021-06-18 20:58:28 +10:00
Oliver 55d29c0825 Fix: New translations django.po from Crowdin 2021-06-18 20:58:26 +10:00
Oliver fc1308b13e Fix: New translations django.po from Crowdin 2021-06-18 20:58:25 +10:00
Oliver ecfd4a206f Fix: New translations django.po from Crowdin 2021-06-18 20:58:23 +10:00
Oliver 877dd72781 Fix: New translations django.po from Crowdin 2021-06-18 20:58:22 +10:00
Oliver c36030d232 Fix: New translations django.po from Crowdin 2021-06-18 20:58:21 +10:00
Oliver b5b5398d43 Fix: New translations django.po from Crowdin 2021-06-18 20:58:19 +10:00
Oliver 2f887f08e5 Fix: New translations django.po from Crowdin 2021-06-18 20:58:18 +10:00
Oliver 73c727ee76 Fix: New translations django.po from Crowdin 2021-06-18 11:38:19 +10:00
Oliver 4073f0d066 Fix: New translations django.po from Crowdin 2021-06-18 11:38:18 +10:00
Oliver 6448a433c9 Fix: New translations django.po from Crowdin 2021-06-18 11:38:17 +10:00
Oliver 463a604b51 Fix: New translations django.po from Crowdin 2021-06-18 11:38:15 +10:00
Oliver c37e5b1de7 Fix: New translations django.po from Crowdin 2021-06-18 11:38:14 +10:00
Oliver de807d623e Fix: New translations django.po from Crowdin 2021-06-18 11:38:13 +10:00
Oliver 2e446a12e1 Fix: New translations django.po from Crowdin 2021-06-18 11:38:11 +10:00
Oliver d923035eb0 Fix: New translations django.po from Crowdin 2021-06-18 11:38:10 +10:00
Oliver 551cde708e Fix: New translations django.po from Crowdin 2021-06-18 11:38:09 +10:00
Oliver 1546b3f56b Fix: New translations django.po from Crowdin 2021-06-18 10:28:13 +10:00
Oliver 0154f43373 Fix: New translations django.po from Crowdin 2021-06-18 08:58:22 +10:00
Oliver e12e6b0346 Fix: New translations django.po from Crowdin 2021-06-18 08:01:04 +10:00
Oliver 47e32e78ce Fix: New translations django.po from Crowdin 2021-06-18 07:02:10 +10:00
Oliver 64b6863e4c Fix: New translations django.po from Crowdin 2021-06-18 06:02:14 +10:00
Oliver 43214d8e4c Fix: New translations django.po from Crowdin 2021-06-18 05:06:49 +10:00
Oliver 5d8c6224e8 Fix: New translations django.po from Crowdin 2021-06-18 04:03:07 +10:00
Oliver 0a619dce86 Fix: New translations django.po from Crowdin 2021-06-18 03:06:40 +10:00
Oliver 436abf31a8 Fix: New translations django.po from Crowdin 2021-06-18 02:09:40 +10:00
Oliver 17343cbfad Fix: New translations django.po from Crowdin 2021-06-18 02:09:39 +10:00
Oliver 21f541f188 Fix: New translations django.po from Crowdin 2021-06-18 00:58:15 +10:00
Oliver 49a60dad0a Fix: New translations django.po from Crowdin 2021-06-17 22:38:27 +10:00
Oliver 57572fe1e1 Fix: New translations django.po from Crowdin 2021-06-17 22:38:26 +10:00
Oliver c249f4c004 Fix: New translations django.po from Crowdin 2021-06-17 22:38:25 +10:00
Oliver bce93d9a19 Fix: New translations django.po from Crowdin 2021-06-17 22:38:22 +10:00
Oliver 4e26604b54 Fix: New translations django.po from Crowdin 2021-06-17 22:38:21 +10:00
Oliver 869eae871b Fix: New translations django.po from Crowdin 2021-06-17 22:38:19 +10:00
Oliver f8dbd59a85 Fix: New translations django.po from Crowdin 2021-06-17 22:38:18 +10:00
Oliver 90132d32b6 Fix: New translations django.po from Crowdin 2021-06-17 22:38:15 +10:00
Oliver 485df6c6c8 Fix: New translations django.po from Crowdin 2021-06-17 22:38:14 +10:00
Oliver 1634926574 Fix: New translations django.po from Crowdin 2021-06-17 18:06:59 +10:00
Oliver 773d4a7039 Fix: New translations django.po from Crowdin 2021-06-17 18:06:57 +10:00
Oliver 35342a5c7b Fix: New translations django.po from Crowdin 2021-06-17 18:06:55 +10:00
Oliver 5b3e396a98 Fix: New translations django.po from Crowdin 2021-06-17 18:06:53 +10:00
Oliver 2fb8e83577 Fix: New translations django.po from Crowdin 2021-06-17 18:06:52 +10:00
Oliver 0a3916fec7 Fix: New translations django.po from Crowdin 2021-06-17 18:06:50 +10:00
Oliver b8c496c869 Fix: New translations django.po from Crowdin 2021-06-17 18:06:49 +10:00
Oliver 4ec2956cc7 Fix: New translations django.po from Crowdin 2021-06-17 18:06:47 +10:00
Oliver 6a62e3315e Fix: New translations django.po from Crowdin 2021-06-17 18:06:45 +10:00
OliverandGitHub 2c3f0fc95e New Crowdin updates (#1670)
* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin
2021-06-17 15:48:24 +10:00
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
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
OliverandGitHub 5bbc44e816 Merge pull request #1666 from matmair/po-total
total price column as per #1660
2021-06-17 08:38:51 +10: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 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
OliverandGitHub 9386332de1 Update version.py 2021-06-16 23:54:42 +10:00
OliverandGitHub 731ea0238e Update version.py
Bump version number
2021-06-16 23:53:58 +10:00
OliverandGitHub 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