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,936 Commits 6 Branches 99 Tags 484 MiB
7a88a8d539
Commit Graph

5936 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
github-actions[bot]
aa4cfc4c53 updated translation base 2021-06-14 21:21:17 +00: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
github-actions[bot]
a9636b7ec5 updated translation base 2021-06-14 11:41:16 +00: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
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
github-actions[bot]
e0c5ef3f04 updated translation base 2021-06-11 22:02:48 +00: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
github-actions[bot]
1e10f0e373 updated translation base 2021-06-10 22:16:57 +00: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
github-actions[bot]
9b30dc71b8 updated translation base 2021-06-10 01:07:39 +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
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