Merge branch 'dev' into fix-typo

This commit is contained in:
Trenton H 2025-03-06 19:32:30 -08:00 committed by GitHub
commit dd2468218b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 370 additions and 384 deletions

View File

@ -0,0 +1,18 @@
{% extends "paperless-ngx/base.html" %}
{% load i18n %}
{% block head_title %}
{% trans "Paperless-ngx account inactive" %}
{% endblock head_title %}
{% block form_top_content %}
<h4>{% translate "Account inactve." %}</h4>
{% endblock form_top_content %}
{% block form_content %}
{% url 'account_login' as login_url %}
<p>{% translate "This account is inactive." %}</p>
<div class="d-grid mt-3">
<a class="btn btn-lg btn-primary" href="{{ login_url }}">{% translate "Return to login" %}</a>
</div>
{% endblock form_content %}

File diff suppressed because it is too large Load Diff

View File

@ -278,10 +278,15 @@ urlpatterns = [
include(
[
# see allauth/account/urls.py
# login, logout, signup
# login, logout, signup, account_inactive
path("login/", allauth_account_views.login, name="account_login"),
path("logout/", allauth_account_views.logout, name="account_logout"),
path("signup/", allauth_account_views.signup, name="account_signup"),
path(
"account_inactive/",
allauth_account_views.account_inactive,
name="account_inactive",
),
# password reset
path(
"password/",