Oliver Walters 731ec25b24 Merge remote-tracking branch 'inventree/master' into django-q ...

# Conflicts:
#	.github/workflows/style.yaml
#	.travis.yml
#	InvenTree/InvenTree/settings.py

2021-03-31 22:17:38 +11:00

..

barcodes

Rename "barcode" module to "barcodes" to prevent import shadowing

2021-02-22 15:15:25 +11:00

build

HTML / CSS fixes

2021-03-29 16:36:27 +11:00

common

Merge remote-tracking branch 'inventree/master' into django-q

2021-03-31 22:17:38 +11:00

company

HTML / CSS fixes

2021-03-29 16:36:27 +11:00

img_source

…

InvenTree

Merge remote-tracking branch 'inventree/master' into django-q

2021-03-31 22:17:38 +11:00

label

Adds body styling to label base

2021-03-02 14:05:52 +11:00

locale

finished german translation, small corrections

2021-03-28 18:09:35 +02:00

order

Fix flake issues

2021-03-31 17:20:12 +11:00

part

HTML / CSS fixes

2021-03-29 16:36:27 +11:00

plugins

Improve settings.py

2020-11-13 13:38:01 +11:00

report

Bug fix

2021-03-11 17:11:57 +11:00

script

Add script to calculate translation stats

2021-01-18 19:13:52 +11:00

stock

HTML / CSS fixes

2021-03-29 16:36:27 +11:00

templates

Merge remote-tracking branch 'inventree/master' into django-q

2021-03-31 22:17:38 +11:00

users

Merge remote-tracking branch 'inventree/master' into django-q

2021-03-31 22:17:38 +11:00

config_template.yaml

Reintroduce default database config

2021-03-30 21:18:09 +11:00

gunicorn.conf.py

PEP fix

2020-12-14 10:44:38 +11:00

manage.py

…