Merge branch 'dev' into feature-ensure-codecov-upload

.devcontainer/devcontainer.json

@@ -3,7 +3,7 @@
     "dockerComposeFile": "docker-compose.devcontainer.sqlite-tika.yml",
     "service": "paperless-development",
     "workspaceFolder": "/usr/src/paperless/paperless-ngx",
-    "postCreateCommand": "/bin/bash -c uv sync --dev && uv run pre-commit install",
+    "postCreateCommand": "/bin/bash -c 'uv sync --group dev && uv run pre-commit install'",
     "customizations": {
         "vscode": {
           "extensions": [

docs/development.md

@@ -75,7 +75,7 @@ first-time setup.
 4.  Install the Python dependencies:
 
     ```bash
-    $ uv sync --dev
+    $ uv sync --group dev
     ```
 
 5.  Install pre-commit hooks:

src-ui/src/app/components/common/toast/toast.component.html

@@ -48,7 +48,7 @@
             </details>
             }
             @if (toast.action) {
-            <p class="mb-0 mt-2"><button class="btn btn-sm btn-outline-secondary" (click)="close.emit(toast); toast.action()">{{toast.actionName}}</button></p>
+            <p class="mb-0 mt-2"><button class="btn btn-sm btn-outline-secondary" (click)="closed.emit(toast); toast.action()">{{toast.actionName}}</button></p>
             }
         </div>
         <button type="button" class="btn-close ms-auto flex-shrink-0" data-bs-dismiss="toast" aria-label="Close" (click)="closed.emit(toast);"></button>

src/documents/migrations/0012_auto_20160305_0040.py

@@ -61,7 +61,7 @@ def move_documents_and_create_thumbnails(apps, schema_editor):
         ),
     )
 
-    Path(settings.SCRATCH_DIR).mkdir(parents=True, exists_ok=True)
+    Path(settings.SCRATCH_DIR).mkdir(parents=True, exist_ok=True)
 
     for f in sorted(documents):
         if not f.endswith("gpg"):

src/documents/templates/account/account_inactive.html

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

src/paperless/urls.py

@@ -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/",