inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2026-07-19 04:50:47 +00:00
Code Activity
5,805 Commits 9 Branches 164 Tags
a8ae62e1335cb230766ade53050a0ae844c3f4a1
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Oliver a8ae62e133 Merge remote-tracking branch 'inventree/master' into l10 2021-06-17 08:49:00 +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
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
Oliver e2b529743a Fix: New translations django.po from Crowdin 2021-06-15 07:34:07 +10:00
Oliver 71cf41e7cd Fix: New translations django.po from Crowdin 2021-06-15 07:34:05 +10:00
Oliver 27a5d6843f Fix: New translations django.po from Crowdin 2021-06-15 07:34:04 +10:00
Oliver 36a3ed563f Fix: New translations django.po from Crowdin 2021-06-15 07:34:03 +10:00
OliverandGitHub 8da00c6106 Merge pull request #1662 from eeintech/fix-1661 
Add "Purchase Price" to stock table
 2021-06-15 07:20:03 +10:00
OliverandGitHub 8e6691ce36 Merge pull request #1658 from matmair/fix-whitespace-paths 
fix whitespaces in paths
 2021-06-14 21:39:51 +10:00
Oliver f03dfa8131 Fix: New translations django.po from Crowdin 2021-06-14 00:47:23 +10:00
Oliver 3e11fc3437 Fix: New translations django.po from Crowdin 2021-06-13 23:49:06 +10:00
Oliver 8b6dceb599 Fix: New translations django.po from Crowdin 2021-06-12 08:09:58 +10:00
Oliver 0f30d9961a Fix: New translations django.po from Crowdin 2021-06-12 08:09:57 +10:00
Oliver 8001a1a794 Fix: New translations django.po from Crowdin 2021-06-12 08:09:56 +10:00
Oliver 9e70674700 Fix: New translations django.po from Crowdin 2021-06-12 08:09:54 +10:00
Oliver 0dae3a1057 Fix: New translations django.po from Crowdin 2021-06-12 08:09:53 +10:00
Oliver 08d3058ad7 Fix: New translations django.po from Crowdin 2021-06-12 08:09:52 +10:00
Oliver 3be1f99380 Fix: New translations django.po from Crowdin 2021-06-12 08:09:51 +10:00
Oliver 26c682f016 Fix: New translations django.po from Crowdin 2021-06-12 08:09:50 +10:00
Oliver c519578a21 Fix: New translations django.po from Crowdin 2021-06-12 08:09:49 +10:00
OliverandGitHub 2e1db9d0bc Merge pull request #1653 from matmair/display-serial 
display latest serial on all part-views #1648
 2021-06-12 08:01:34 +10:00
OliverandGitHub deb8f0df2a Merge pull request #1652 from inventree/dependabot/pip/django-3.2.4 
Build(deps): Bump django from 3.2.2 to 3.2.4
 2021-06-11 08:15:41 +10:00
OliverandGitHub 3a91156b01 Merge pull request #1651 from inventree/dependabot/pip/django-3.2.2 
Build(deps): Bump django from 3.2.1 to 3.2.2
 2021-06-10 11:05:47 +10:00
Oliver 481a056327 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-09 16:18:13 +10:00
OliverandGitHub 0076c0cec5 Merge pull request #1649 from SchrodingersGat/typo-fix 
Fix typo in getStockItemThumbnail
 2021-06-09 11:54:50 +10:00
OliverandGitHub fb52115fe3 Merge pull request #1646 from inventree/dependabot/pip/pillow-8.2.0 
Build(deps): Bump pillow from 8.1.1 to 8.2.0
 2021-06-09 11:47:03 +10:00
Oliver 0c14457598 Fix typo in getStockItemThumbnail 2021-06-09 11:16:37 +10:00
Oliver cd2fcdd436 Fix: New translations django.po from Crowdin 2021-06-09 10:23:03 +10:00
Oliver 96776fc9fe Fix: New translations django.po from Crowdin 2021-06-09 10:23:02 +10:00
Oliver a1b48428dd Fix: New translations django.po from Crowdin 2021-06-09 10:22:59 +10:00
Oliver 3e9014646f Fix: New translations django.po from Crowdin 2021-06-09 10:22:58 +10:00
Oliver 1a7eebb7ab Fix: New translations django.po from Crowdin 2021-06-09 10:22:56 +10:00
Oliver b8cd0d52d9 Fix: New translations django.po from Crowdin 2021-06-09 10:22:55 +10:00
Oliver 60fd027ec3 Fix: New translations django.po from Crowdin 2021-06-09 10:22:53 +10:00
Oliver 5f85300993 Fix: New translations django.po from Crowdin 2021-06-09 10:22:52 +10:00
Oliver e7f3709502 Fix: New translations django.po from Crowdin 2021-06-09 10:22:51 +10:00
OliverandGitHub 120c371a11 Merge pull request #1647 from SchrodingersGat/thumbnail-error-catch 
BuildItemSerializer: Handle errors when thumbnail is not found
 2021-06-09 10:02:42 +10:00
Oliver 9fd212d1b2 BuildItemSerializer: Handle errors when thumbnail is not found 2021-06-09 09:41:27 +10:00
OliverandGitHub fd63e49e60 Merge pull request #1644 from SchrodingersGat/test-table-fix 
Stock Test: Fix display of stock test table
 2021-06-08 20:27:06 +10:00
Oliver 3aadf94a9c Stock Test: Fix display of stock test table 
- Incorrect parent node was set
 2021-06-08 16:15:40 +10:00
Oliver 63cbcde4c1 Fix: New translations django.po from Crowdin 2021-06-07 00:38:35 +10:00
Oliver e861a0e417 Fix: New translations django.po from Crowdin 2021-06-07 00:38:34 +10:00
Oliver b0522ee439 Fix: New translations django.po from Crowdin 2021-06-07 00:38:32 +10:00
Oliver ac906ce608 Fix: New translations django.po from Crowdin 2021-06-07 00:38:31 +10:00
Oliver d4f30d4f4c Fix: New translations django.po from Crowdin 2021-06-07 00:38:30 +10:00
Oliver 5e98d912c2 Fix: New translations django.po from Crowdin 2021-06-07 00:38:29 +10:00
Oliver 7206930e20 Fix: New translations django.po from Crowdin 2021-06-07 00:38:28 +10:00
Oliver 989d40eafd Fix: New translations django.po from Crowdin 2021-06-07 00:38:26 +10:00
Oliver c02ed78eb5 Fix: New translations django.po from Crowdin 2021-06-07 00:38:25 +10:00
OliverandGitHub 534fd491c1 Merge pull request #1637 from SchrodingersGat/lib-update 
Update django-import-export to 2.5.0
 2021-06-07 00:30:03 +10:00
OliverandGitHub d2e35426c2 Merge pull request #1636 from SchrodingersGat/l10-merge 
L10 merge
 2021-06-07 00:13:18 +10:00
Oliver 172700da10 Update django-import-export to 2.5.0 
- Fixes an export error introduced after updating to latest django
 2021-06-07 00:12:52 +10:00
Oliver 5377d860f4 Merge remote-tracking branch 'inventree/master' into l10-merge 
# Conflicts:
#	InvenTree/locale/de/LC_MESSAGES/django.po
#	InvenTree/locale/en/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-06 22:27:27 +10:00
OliverandGitHub 62682c686b Merge pull request #1629 from inventree/l10_crowdin 
New Crowdin updates
 2021-06-06 22:21:35 +10:00
OliverandGitHub e977be9c1b Merge pull request #1630 from inventree/dependabot/pip/django-3.2.1 
Bump django from 3.2 to 3.2.1
 2021-06-06 22:20:47 +10:00
OliverandGitHub 573f601752 Merge pull request #1632 from matmair/nav-style 
same nav sidebar distance for everything
 2021-06-06 22:14:20 +10:00
OliverandGitHub 8301eb3be3 Merge pull request #1633 from matmair/money-format 
Money format
 2021-06-06 22:12:55 +10:00
Oliver 3e9adec4ff Fix: New translations django.po from Crowdin 2021-06-04 03:03:42 +10:00
Oliver 6f3593220a Fix: New translations django.po from Crowdin 2021-06-04 02:08:23 +10:00
Oliver f0a1cca914 Fix: New translations django.po from Crowdin 2021-06-03 14:40:53 +10:00
Oliver 4af74a5ba5 Fix: New translations django.po from Crowdin 2021-06-03 09:52:21 +10:00
OliverandGitHub 92f77b6bbb Merge pull request #1627 from eeintech/price_break_sort_fix 
Fixed price break row actions after sorting
 2021-06-03 09:18:49 +10:00
Oliver 2948cf5671 Fix: New translations django.po from Crowdin 2021-06-03 05:11:59 +10:00
Oliver 3b6aba7153 Fix: New translations django.po from Crowdin 2021-06-03 04:12:58 +10:00
Oliver 69ed180034 Fix: New translations django.po from Crowdin 2021-06-03 03:15:00 +10:00
Oliver 7b1bd87d84 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-02 22:58:34 +10:00
Oliver 7df72f09f4 Fix: New translations django.po from Crowdin 2021-06-02 09:57:53 +10:00
Oliver 56afcfa91f Fix: New translations django.po from Crowdin 2021-06-02 08:50:33 +10:00
Oliver 61af4ca1b3 Fix: New translations django.po from Crowdin 2021-06-01 20:22:45 +10:00
Oliver ddf1f5c5ba Fix: New translations django.po from Crowdin 2021-06-01 20:22:43 +10:00
Oliver 1a3943fd7c Fix: New translations django.po from Crowdin 2021-06-01 20:22:42 +10:00
Oliver 3df5ef5676 Fix: New translations django.po from Crowdin 2021-06-01 20:22:40 +10:00