Oliver Walters 0134597747 Merge remote-tracking branch 'inventree/master' into label-api ... # Conflicts: # InvenTree/locale/de/LC_MESSAGES/django.po # InvenTree/locale/en/LC_MESSAGES/django.po # InvenTree/locale/es/LC_MESSAGES/django.po		2021-01-14 23:56:23 +11:00
..
migrations	Added missing migration file	2021-01-13 14:57:16 -05:00
__init__.py	Added User API and serializer	2017-04-20 22:40:59 +10:00
admin.py	Separated category from part permissions and location from stock item permissions	2021-01-13 13:35:49 -05:00
apps.py	PEP fixes	2020-10-04 00:43:02 +10:00
models.py	Merge remote-tracking branch 'inventree/master' into label-api	2021-01-14 23:56:23 +11:00
serializers.py	Include PK in user serializer	2019-06-23 22:44:57 +10:00
tests.py	Fixed permission assign test unit	2020-10-05 10:52:47 -05:00
urls.py	Tests for retrieving user auth tokens	2019-09-07 23:41:15 +10:00
views.py	Improvements for token authentication	2020-04-18 12:06:50 +10:00