Upgrade Django major (#144)

* Bump dependency versions

* Configure default auto field implementation

* fix admin to use token proxy model

* update django docs link
This commit is contained in:
Sascha Ißbrücker 2021-08-17 05:48:45 +02:00 committed by GitHub
parent 69105d3d3c
commit cc04a17e2f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 36 additions and 30 deletions

View file

@ -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

View file

@ -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)

View file

@ -17,7 +17,7 @@
</div>
<p><strong>Please treat this token as you would any other credential.</strong> Any party with access to this
token can access and manage all your bookmarks.</p>
<p>If you think that a token was compromised you can revoke (delete) it in the <a href="{% url 'admin:authtoken_token_changelist' %}">admin panel</a>. After deleting the token, a new one will be generated when you reload this settings page.</p>
<p>If you think that a token was compromised you can revoke (delete) it in the <a href="{% url 'admin:authtoken_tokenproxy_changelist' %}">admin panel</a>. After deleting the token, a new one will be generated when you reload this settings page.</p>
</section>
</div>

View file

@ -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

View file

@ -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

View file

@ -73,6 +73,8 @@ TEMPLATES = [
},
]
DEFAULT_AUTO_FIELD = 'django.db.models.AutoField'
WSGI_APPLICATION = 'siteroot.wsgi.application'
# Database