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
5,738 Commits 6 Branches 99 Tags 484 MiB
bbe7edbf82
Commit Graph

5738 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matthias
bbe7edbf82 totals like in #1666 2021-06-17 00:50:10 +02:00
Oliver
9386332de1
Update version.py 2021-06-16 23:54:42 +10: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
8da00c6106
Merge pull request #1662 from eeintech/fix-1661 
Add "Purchase Price" to stock table
 2021-06-15 07:20:03 +10:00
eeintech
08fbdf660b Fix for #1661 2021-06-14 14:19:10 -04:00
Oliver
8e6691ce36
Merge pull request #1658 from matmair/fix-whitespace-paths 
fix whitespaces in paths
 2021-06-14 21:39:51 +10:00
Matthias
ec19d77523 fix whitespaces in paths 2021-06-13 20:08:42 +02:00
Oliver
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
Matthias
c0e50128dd display latest serial on all part-views #1648 2021-06-11 23:43:23 +02:00
Oliver
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
dependabot[bot]
0bc190bca5
Build(deps): Bump django from 3.2.2 to 3.2.4 
Bumps [django](https://github.com/django/django) from 3.2.2 to 3.2.4.
- [Release notes](https://github.com/django/django/releases)
- [Commits](https://github.com/django/django/compare/3.2.2...3.2.4)

---
updated-dependencies:
- dependency-name: django
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-06-10 17:36:17 +00:00
Oliver
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
dependabot[bot]
6e2abc4cde
Build(deps): Bump django from 3.2.1 to 3.2.2 
Bumps [django](https://github.com/django/django) from 3.2.1 to 3.2.2.
- [Release notes](https://github.com/django/django/releases)
- [Commits](https://github.com/django/django/compare/3.2.1...3.2.2)

---
updated-dependencies:
- dependency-name: django
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-06-09 17:26:23 +00:00
Oliver
0076c0cec5
Merge pull request #1649 from SchrodingersGat/typo-fix 
Fix typo in getStockItemThumbnail
 2021-06-09 11:54:50 +10:00
Oliver
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
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
dependabot[bot]
2a059f345e
Build(deps): Bump pillow from 8.1.1 to 8.2.0 
Bumps [pillow](https://github.com/python-pillow/Pillow) from 8.1.1 to 8.2.0.
- [Release notes](https://github.com/python-pillow/Pillow/releases)
- [Changelog](https://github.com/python-pillow/Pillow/blob/master/CHANGES.rst)
- [Commits](https://github.com/python-pillow/Pillow/compare/8.1.1...8.2.0)

---
updated-dependencies:
- dependency-name: pillow
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-06-08 19:49:34 +00:00
Oliver
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
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
Oliver
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
Oliver
62682c686b
Merge pull request #1629 from inventree/l10_crowdin 
New Crowdin updates
 2021-06-06 22:21:35 +10:00
Oliver
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
Oliver
573f601752
Merge pull request #1632 from matmair/nav-style 
same nav sidebar distance for everything
 2021-06-06 22:14:20 +10:00
Oliver
8301eb3be3
Merge pull request #1633 from matmair/money-format 
Money format
 2021-06-06 22:12:55 +10:00
Matthias
0bac7ebf3e styling 2021-06-05 17:18:46 +02:00
Matthias
05d79a4c19 same nav sidebar distance for everything 2021-06-05 15:18:08 +02:00
Matthias
44717b646f using new tag for currency 2021-06-05 15:07:42 +02:00
Matthias
0eff7d000a added tag to replace dynamic setting 2021-06-05 15:05:05 +02:00
Matthias
691142ea4c fixing currency display 2021-06-05 13:27:39 +02:00
Matthias
d87592aedb use the default currency in forms 2021-06-05 13:22:11 +02:00
dependabot[bot]
7d7e518c1b
Bump django from 3.2 to 3.2.1 
Bumps [django](https://github.com/django/django) from 3.2 to 3.2.1.
- [Release notes](https://github.com/django/django/releases)
- [Commits](https://github.com/django/django/compare/3.2...3.2.1)

---
updated-dependencies:
- dependency-name: django
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-06-04 21:37:26 +00: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