inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-10-31 13:15:43 +00:00
Code Activity
5,703 Commits 6 Branches 132 Tags
d2e35426c202e59d9e6f4d9e08ceed080c450e23
Commit Graph

5703 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Oliver Walters
a1e835e01b Add some new (empty) locale translation entries 
- fr
- it
- ja
- pl
- ru
- zh

Also fixes the `invoke translate` command (maybe it was changed with the recent update to Django 3.2?)

The CI pipeline now runs the translation and static collection steps, to check those for errors.
 2021-04-21 12:33:56 +10:00
Oliver
45d23bd606 Merge pull request #1497 from SchrodingersGat/docker-push 
Changes to docker workflow
 2021-04-21 11:27:45 +10:00
Oliver Walters
b20c832702 Changes to docker workflow 2021-04-21 11:13:37 +10:00
Matthias Mair
6c296e1384 added collection-step to coverage 2021-04-20 19:28:12 +02:00
Matthias
5a7f83798e docker-start - collect static js #1485 2021-04-20 18:46:35 +02:00
Matthias
fdf3e3a333 added expiry headers to nginx-docker #1485 2021-04-20 18:45:59 +02:00
Matthias
a88d9c7986 Manifeststorage as suggested in #1485 2021-04-20 18:36:51 +02:00
Oliver
4903826be1 Merge pull request #1494 from matmair/feature/js_translation 
Translating JS-Files once
 2021-04-20 22:58:43 +10:00
Matthias
99dc02e2cb cleaning up names / comments 2021-04-20 14:39:28 +02:00
Matthias
4d439db322 fixing styling issues 2021-04-20 13:48:05 +02:00
Matthias
2943dc6083 initial implementation as in #1485 2021-04-20 13:37:19 +02:00
Oliver
9addad9b46 Merge pull request #1493 from SchrodingersGat/multi-location-print 
Split "part category" view into separate pages
 2021-04-20 21:10:46 +10:00
Oliver Walters
4d1eb51bc4 Fixes 2021-04-20 20:42:55 +10:00
Oliver Walters
2bb86ff22b Adds missing template file 2021-04-20 20:20:00 +10:00
Oliver Walters
fd3e59650a Style fixes 2021-04-20 20:15:51 +10:00
Oliver Walters
c5fa0bb459 Improved API filtering for PartCategory 2021-04-20 20:15:06 +10:00
Oliver Walters
38eea21f4f Enable printing of multiple stock location labels 2021-04-20 20:06:13 +10:00
Oliver Walters
412b05d76c Allow API filtering by "cascading" stock locations 2021-04-20 20:00:15 +10:00
Oliver Walters
6986709fb8 Reorganized stock location view 2021-04-20 19:49:07 +10:00
Oliver Walters
f578f68001 Split "part category" view into separate pages 2021-04-20 19:30:43 +10:00
Oliver
21708dabaf Merge pull request #1490 from SchrodingersGat/django-3.2 
Update to django 3.2
 2021-04-20 11:25:25 +10:00
Oliver Walters
0fbf39f1bc More fixes 2021-04-20 10:59:28 +10:00
Oliver Walters
6b9145ae56 Fixes required for v3.2 compatibility 
- Specify DEFAULT_AUTO_FIELD
- Specify output_field for annotations
 2021-04-20 09:14:08 +10:00
Oliver Walters
12f1fb9526 Update to django 3.2 2021-04-20 08:15:43 +10:00
Oliver
6c159e91cc Merge pull request #1489 from eeintech/stock_fixes 
Stock return to customer fix
 2021-04-20 07:38:32 +10:00
eeintech
2dbd61c611 Stock return to customer fix, stock children item table fix 2021-04-19 11:25:39 -04:00
Oliver
5f04802ead Merge pull request #1487 from inventree/dependabot/pip/django-3.1.8 
Bump django from 3.1.7 to 3.1.8
 2021-04-19 21:11:08 +10:00
Oliver
ebf3f6f542 Merge pull request #1488 from SchrodingersGat/suppress-warning 
Do not print EMAIL warning if in TEST mode
 2021-04-19 21:10:49 +10:00
Oliver Walters
252abb920f Do not print EMAIL warning if in TEST mode 2021-04-19 20:49:24 +10:00
dependabot[bot]
716ab4872a Bump django from 3.1.7 to 3.1.8 
Bumps [django](https://github.com/django/django) from 3.1.7 to 3.1.8.
- [Release notes](https://github.com/django/django/releases)
- [Commits](https://github.com/django/django/compare/3.1.7...3.1.8)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-04-19 10:48:19 +00:00
Oliver
afca4f244d Merge pull request #1422 from SchrodingersGat/django-latest-version 
Update requirements
 2021-04-19 20:47:57 +10:00
Oliver Walters
98be42846c Update requirements 2021-04-19 12:21:43 +10:00
Oliver
157d58b157 Merge pull request #1481 from matmair/instance-name-in-title 
Instance name in title
 2021-04-18 21:48:37 +10:00
Matthias Mair
26e12f299d New translations django.po (German) 2021-04-18 13:31:52 +02:00
Matthias Mair
00ddffa59e New translations django.po (German) 2021-04-18 13:04:25 +02:00
Matthias
6c3a66f7d6 Merge branch 'master' of https://github.com/inventree/InvenTree into price-history 2021-04-18 12:58:19 +02:00
Matthias
e668577d97 fix as noted in #1481 2021-04-18 12:31:17 +02:00
Oliver
3bb0f7dde0 Merge pull request #1480 from SchrodingersGat/docker-build-fix 
Fix directory
 2021-04-18 20:24:16 +10:00
Oliver
26c19dc77d Merge pull request #1479 from matmair/feature/translations 
Feature/translations
 2021-04-18 20:23:51 +10:00
Oliver Walters
e057d6d161 Fix directory 2021-04-18 20:00:03 +10:00
Matthias
337f680c89 Merge branch 'master' of https://github.com/inventree/InvenTree into price-history 2021-04-18 11:58:46 +02:00
Oliver
724ecebb4c Update version.py 2021-04-18 19:54:16 +10:00
Oliver
0b5557395b Update version.py 0.2.1 2021-04-18 19:53:15 +10:00
Oliver
6c410521a1 Merge pull request #1476 from SchrodingersGat/docker-improvements 
Cleanup docker files
 2021-04-18 19:52:42 +10:00
Oliver Walters
9d88d38bf8 Enforce line-endings for more file types 2021-04-18 19:39:03 +10:00
Oliver Walters
4531030551 Fix line endings 2021-04-18 19:37:11 +10:00
Oliver Walters
aced0e73c7 compose file cleanup 2021-04-18 18:58:00 +10:00
Oliver Walters
61eba2f7fc Typo fix 2021-04-18 18:54:21 +10:00
Oliver Walters
0926992b4f Updated nginx conf 2021-04-18 18:53:30 +10:00
Oliver Walters
d8e1e18f4d change web -> inventree 2021-04-18 17:21:06 +10:00