Commit Graph

13248 Commits

Author SHA1 Message Date
Oliver
ea3133be1d Combine docker-build and docker-test CI steps
- We are building anyway, may as well test
2022-05-18 15:11:37 +10:00
Oliver
fd2ec03fab
Merge pull request #2993 from SchrodingersGat/webp-support
webp image support
2022-05-18 14:43:28 +10:00
Oliver
f53c8865ad Only run docker build on push 2022-05-18 14:14:40 +10:00
Oliver
810671f423 Yet another fix 2022-05-18 13:40:57 +10:00
Oliver
0f1dd3fe65 Same fix for config file test 2022-05-18 13:02:23 +10:00
Oliver
e57087de63 Fix unit test 2022-05-18 12:19:10 +10:00
Oliver
3b53260d75 Allow some variation in unit test 2022-05-18 11:51:14 +10:00
Oliver
2cfa4c0a16 Merge remote-tracking branch 'matmair/webp-support' into webp-support
# Conflicts:
#	InvenTree/InvenTree/tests.py
2022-05-18 11:13:26 +10:00
Matthias Mair
21750c92d3
remove branch from test 2022-05-18 02:33:09 +02:00
Matthias Mair
c4208782c5
Update docker_test.yaml 2022-05-18 02:31:04 +02:00
Matthias
9a0189b6bb
fix env name 2022-05-18 02:30:07 +02:00
Matthias
bdf28b72df
fix default 2022-05-18 02:25:44 +02:00
Matthias
4ac7d9626c
add missing test from merge back in 2022-05-18 02:07:28 +02:00
Matthias
9b37760856
fix assertations 2022-05-18 02:06:00 +02:00
Matthias
a570dab5e5
generalise function to make new methods simpler 2022-05-18 02:04:15 +02:00
Matthias
ca7fb691ac
make change patch simpler 2022-05-18 02:02:14 +02:00
Matthias
9f0b00cc0e
replace old function 2022-05-18 02:01:52 +02:00
Matthias
6e19187929
add missing import 2022-05-18 02:01:25 +02:00
Matthias
dc4affb3c5
Merge branch 'webp-support' of https://github.com/matmair/InvenTree into webp-support 2022-05-18 01:58:44 +02:00
Matthias
278c9dbf05
Merge branch 'master' of https://github.com/inventree/InvenTree into webp-support 2022-05-18 01:55:41 +02:00
Oliver
db75c31f6d
Translation merge (#3022)
* updated translation base

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2022-05-18 08:27:42 +10:00
Matthias Mair
a40f189c7a
Use unierest mock for env setting 2022-05-17 19:23:50 +02:00
Oliver
a8eef0870c
Merge pull request #3010 from SchrodingersGat/shipment-assign-fix
SalesOrderShipment allocation fix
2022-05-17 20:25:57 +10:00
Oliver
d16a880417
Update README.md
Add link to coveralls badge
2022-05-17 20:19:12 +10:00
Oliver Walters
f4b470c396 Merge remote-tracking branch 'inventree/master' into shipment-assign-fix 2022-05-17 18:48:57 +10:00
Oliver Walters
dc2351748c Merge remote-tracking branch 'inventree/master' into webp-support 2022-05-17 18:48:19 +10:00
Oliver
b08a98f7a4
Merge pull request #3018 from SchrodingersGat/remove-unicode-literals
Remove more python2 stuff
2022-05-17 17:26:55 +10:00
Oliver
9bcbaaa5f5 Remove more python2 stuff 2022-05-17 16:57:31 +10:00
Oliver
c4dfb03fd2
Merge pull request #3017 from SchrodingersGat/build-output-delete-fix
Bug Fix: Build output delete API endpoint
2022-05-17 16:33:37 +10:00
Oliver
e7b458978c More unit tests 2022-05-17 15:10:48 +10:00
Oliver
01a30935f0 Add unit tests for BuildOutputDelete serializer 2022-05-17 14:20:41 +10:00
Oliver
5a0acedce6 Add unit tests for BuildOutputCreate serializer 2022-05-17 13:00:53 +10:00
Oliver
256451d82b Fix context such that build output can be deleted 2022-05-17 11:52:42 +10:00
Oliver
334025b844
Merge pull request #3014 from matmair/matmair/issue3005
Add more tests for offload_task
2022-05-17 11:11:20 +10:00
Matthias
fb55f5d2a2
convert remaining function 2022-05-17 01:32:08 +02:00
Matthias
728cccc469
fix assertation 2022-05-17 00:53:51 +02:00
Oliver Walters
825c50a438 Change import style 2022-05-17 08:40:43 +10:00
Matthias
09af7d964d
raise a warning for assertations 2022-05-17 00:24:02 +02:00
Oliver Walters
aa7fcb3601 Remove status_code addition 2022-05-17 08:23:39 +10:00
Matthias
b3e42f5fb0
Add tests for offloading 2022-05-17 00:13:39 +02:00
Matthias
3e859f7abb
fix assertation 2022-05-16 23:51:17 +02:00
Matthias
9f3fdcb590
make test simpler 2022-05-16 23:43:07 +02:00
Matthias
09bda7e516
add checks for old_error_log 2022-05-16 23:42:09 +02:00
Matthias
f3c4720f5b
extend update check 2022-05-16 23:41:33 +02:00
Matthias Mair
2ec59a6ad2 extend tests for task_delete_succ 2022-05-16 19:45:00 +02:00
Matthias Mair
eb24bf78b8 external api failures are not covered 2022-05-16 19:39:43 +02:00
Matthias Mair
fc8a63325e that was a stupid misstake 2022-05-16 18:57:27 +02:00
Matthias Mair
07711b8e74 fix check 2022-05-16 18:34:02 +02:00
Matthias Mair
79b4b23a07 pep fix 2022-05-16 18:33:49 +02:00
Matthias Mair
763cd13b7c use a function if it was passed 2022-05-16 18:30:37 +02:00