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,170 Commits 6 Branches 99 Tags 484 MiB
373898d43e
Commit Graph

5170 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matthias
018b845415 Merge branch 'master' of https://github.com/inventree/InvenTree into feature/translation-action 2021-04-21 11:03:45 +02:00
Matthias
a36b22692e Merge branch 'master' of https://github.com/inventree/InvenTree into feature/performance-op 2021-04-21 10:47:25 +02:00
Oliver
2d59c0a119
Merge pull request #1499 from SchrodingersGat/ci-fixes 
Change file just to re-run CI
 2021-04-21 17:51:22 +10:00
Oliver Walters
3e63334125 Change file just to re-run CI 2021-04-21 17:34:56 +10:00
Oliver
cfddaadccf
Merge pull request #1492 from SchrodingersGat/build-order-simplification 
Build order simplification
 2021-04-21 17:29:24 +10:00
Oliver Walters
c0ab2d1da9 Unit test fixes 2021-04-21 17:16:07 +10:00
Oliver Walters
59341397ba Fixes 2021-04-21 16:44:18 +10:00
Oliver Walters
9b763ca715 Adds ability to specify "status" of a build output at time of completion 2021-04-21 16:44:18 +10:00
Oliver Walters
0722aea58a Further fixes for unit tests 2021-04-21 16:44:18 +10:00
Oliver Walters
debc086f89 Unit test improvements 2021-04-21 16:44:17 +10:00
Oliver Walters
715d912137 Bug fixes 2021-04-21 16:44:17 +10:00
Oliver Walters
5a44a50f3b Fix date in build table 2021-04-21 16:44:17 +10:00
Oliver Walters
76e2b67f36 Fix logic for completing builds 
- Display better messages to the user, too
 2021-04-21 16:44:17 +10:00
Oliver Walters
4420557863 Refactor various functions for assessing build allocation 2021-04-21 16:44:17 +10:00
Oliver Walters
05e2b62305 Bug fix - calculate button PK at run time!! 2021-04-21 16:44:17 +10:00
Oliver Walters
16b01ed772 significant rework of the build allocation tables / views 2021-04-21 16:44:16 +10:00
Oliver Walters
f0595cc052 Fix for display of "outstanding" allocations 2021-04-21 16:44:16 +10:00
Oliver Walters
9e470d4064 Add separate section for "untracked" part allocation 2021-04-21 16:44:16 +10:00
Oliver
852cc9c4fa
Merge pull request #1498 from SchrodingersGat/new-locales 
Add some new (empty) locale translation entries
 2021-04-21 13:27:52 +10:00
Oliver Walters
64c29d73cc gettext required for translation 2021-04-21 13:11:57 +10:00
Oliver Walters
043d929dbb Fix proper good 2021-04-21 12:57:54 +10:00
Oliver Walters
096403b429 CI file fixes 2021-04-21 12:37:20 +10:00
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