Skip to content

Commit

Permalink
Merge pull request #103 from James1345/develop
Browse files Browse the repository at this point in the history
release 3.1.5
  • Loading branch information
belugame authored Jul 13, 2018
2 parents 8d708e7 + 441b587 commit 1c8f710
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 1 deletion.
6 changes: 6 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
######
3.1.5
######
- Make AuthTokenAdmin more compatible with big user tables
- Extend docs regarding usage of Token Authentication as single authentication method.

######
3.1.4
######
Expand Down
4 changes: 4 additions & 0 deletions docs/changes.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
#Changelog

## 3.1.5
- Make AuthTokenAdmin more compatible with big user tables
- Extend docs regarding usage of Token Authentication as single authentication method.

## 3.1.4
- Fix compability with django-rest-swagger (bad inheritance)

Expand Down
2 changes: 2 additions & 0 deletions knox/admin.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
from django.contrib import admin
from knox import models


@admin.register(models.AuthToken)
class AuthTokenAdmin(admin.ModelAdmin):
list_display = ('digest', 'user', 'created',)
fields = ()
raw_id_fields = ('user',)
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# Versions should comply with PEP440. For a discussion on single-sourcing
# the version across setup.py and the project code, see
# https://packaging.python.org/en/latest/single_source_version.html
version='3.1.4',
version='3.1.5',
description='Authentication for django rest framework',
long_description=long_description,

Expand Down

0 comments on commit 1c8f710

Please sign in to comment.