Oliver Walters cb3c86f87a Merge remote-tracking branch 'inventree/master' into currency-support ...

# Conflicts:
#	InvenTree/InvenTree/settings.py
#	InvenTree/InvenTree/urls.py
#	InvenTree/templates/InvenTree/settings/tabs.html
#	InvenTree/users/models.py
#	requirements.txt

IMPORTANT: Had to merge some migration files due to different migrations applied on the part model tables

2020-11-12 17:24:48 +11:00

..

migrations

Change label for permissions to match django permission names

2020-10-06 09:28:05 +11:00

__init__.py

Added User API and serializer

2017-04-20 22:40:59 +10:00

admin.py

Fixed style

2020-10-06 10:40:58 -05:00

apps.py

PEP fixes

2020-10-04 00:43:02 +10:00

models.py

Merge remote-tracking branch 'inventree/master' into currency-support

2020-11-12 17:24:48 +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