diff --git a/README.md b/README.md index 98e3be6..33c21e4 100644 --- a/README.md +++ b/README.md @@ -126,7 +126,7 @@ Note that any proxy servers that you are running in front of linkding may have t ## Development -The application is open source, so you are free to modify or contribute. The application is built using the Django web framework. You can get started by checking out the excellent Django docs: https://docs.djangoproject.com/en/3.0/. The `bookmarks` folder contains the actual bookmark application, `siteroot` is the Django root application. Other than that the code should be self-explanatory / standard Django stuff 🙂. +The application is open source, so you are free to modify or contribute. The application is built using the Django web framework. You can get started by checking out the excellent Django docs: https://docs.djangoproject.com/en/3.2/. The `bookmarks` folder contains the actual bookmark application, `siteroot` is the Django root application. Other than that the code should be self-explanatory / standard Django stuff 🙂. ### Prerequisites - Python 3 diff --git a/bookmarks/admin.py b/bookmarks/admin.py index 834723d..5cd26e1 100644 --- a/bookmarks/admin.py +++ b/bookmarks/admin.py @@ -5,7 +5,7 @@ from django.contrib.auth.models import User from django.db.models import Count, QuerySet from django.utils.translation import ngettext, gettext from rest_framework.authtoken.admin import TokenAdmin -from rest_framework.authtoken.models import Token +from rest_framework.authtoken.models import TokenProxy from bookmarks.models import Bookmark, Tag, UserProfile from bookmarks.services.bookmarks import archive_bookmark, unarchive_bookmark @@ -97,4 +97,4 @@ linkding_admin_site = LinkdingAdminSite() linkding_admin_site.register(Bookmark, AdminBookmark) linkding_admin_site.register(Tag, AdminTag) linkding_admin_site.register(User, AdminCustomUser) -linkding_admin_site.register(Token, TokenAdmin) +linkding_admin_site.register(TokenProxy, TokenAdmin) diff --git a/bookmarks/templates/settings/api.html b/bookmarks/templates/settings/api.html index e8fca55..a36b892 100644 --- a/bookmarks/templates/settings/api.html +++ b/bookmarks/templates/settings/api.html @@ -17,7 +17,7 @@

Please treat this token as you would any other credential. Any party with access to this token can access and manage all your bookmarks.

-

If you think that a token was compromised you can revoke (delete) it in the admin panel. After deleting the token, a new one will be generated when you reload this settings page.

+

If you think that a token was compromised you can revoke (delete) it in the admin panel. After deleting the token, a new one will be generated when you reload this settings page.

diff --git a/requirements.prod.txt b/requirements.prod.txt index db59848..8ba016b 100644 --- a/requirements.prod.txt +++ b/requirements.prod.txt @@ -1,20 +1,22 @@ +asgiref==3.4.1 beautifulsoup4==4.7.1 certifi==2019.6.16 -chardet==3.0.4 +charset-normalizer==2.0.4 confusable-homoglyphs==3.2.0 -Django==2.2.20 +Django==3.2.6 django-generate-secret-key==1.0.2 -django-picklefield==2.0 -django-registration==3.1.2 -django-sass-processor==0.7.3 -django-widget-tweaks==1.4.5 -djangorestframework==3.11.2 +django-picklefield==3.0.1 +django-registration==3.2 +django-sass-processor==1.0.1 +django-widget-tweaks==1.4.8 +djangorestframework==3.12.4 idna==2.8 pyparsing==2.4.7 python-dateutil==2.8.1 -pytz==2019.1 -requests==2.22.0 +pytz==2021.1 +requests==2.26.0 soupsieve==1.9.2 -sqlparse==0.3.0 -urllib3==1.25.8 +sqlparse==0.4.1 +typing-extensions==3.10.0.0 +urllib3==1.26.6 uWSGI==2.0.18 diff --git a/requirements.txt b/requirements.txt index 0997de8..947cb8b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,27 +1,29 @@ +asgiref==3.4.1 beautifulsoup4==4.7.1 certifi==2019.6.16 -chardet==3.0.4 +charset-normalizer==2.0.4 confusable-homoglyphs==3.2.0 coverage==5.5 -Django==2.2.20 -django-appconf==1.0.3 -django-compressor==2.3 +Django==3.2.6 +django-appconf==1.0.4 +django-compressor==2.4.1 django-debug-toolbar==3.2.1 django-generate-secret-key==1.0.2 -django-picklefield==2.0 -django-registration==3.1.2 -django-sass-processor==0.7.3 -django-widget-tweaks==1.4.5 -djangorestframework==3.11.2 +django-picklefield==3.0.1 +django-registration==3.2 +django-sass-processor==1.0.1 +django-widget-tweaks==1.4.8 +djangorestframework==3.12.4 idna==2.8 -libsass==0.19.2 +libsass==0.21.0 pyparsing==2.4.7 python-dateutil==2.8.1 -pytz==2019.1 +pytz==2021.1 rcssmin==1.0.6 -requests==2.22.0 +requests==2.26.0 rjsmin==1.1.0 -six==1.12.0 +six==1.16.0 soupsieve==1.9.2 -sqlparse==0.3.0 -urllib3==1.25.8 +sqlparse==0.4.1 +typing-extensions==3.10.0.0 +urllib3==1.26.6 diff --git a/siteroot/settings/base.py b/siteroot/settings/base.py index c99118e..8d141b8 100644 --- a/siteroot/settings/base.py +++ b/siteroot/settings/base.py @@ -73,6 +73,8 @@ TEMPLATES = [ }, ] +DEFAULT_AUTO_FIELD = 'django.db.models.AutoField' + WSGI_APPLICATION = 'siteroot.wsgi.application' # Database