Skip to content

Commit 1cdfdb6

Browse files
authored
Merge pull request watchdogpolska#2296 from watchdogpolska/develop
v1.5.52
2 parents f9231dd + f1d57b4 commit 1cdfdb6

File tree

39 files changed

+2470
-4829
lines changed

39 files changed

+2470
-4829
lines changed

.contrib/docker/Dockerfile.gulp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
FROM node:22
1+
FROM node:24
22
WORKDIR /app
33
VOLUME /app
4-
CMD ["bash","-c", "npm install && npx update-browserslist-db@latest && npm rebuild node-sass && npx gulp build"]
5-
#CMD ["bash","-c", " npm install ; npm rebuild node-sass ; npx gulp build ; sleep infinity "]
4+
CMD ["bash","-c", "npm install && npx update-browserslist-db@latest && npx gulp build"]
5+
# CMD ["bash","-c", " npm install ; npx gulp build ; sleep infinity "]

.contrib/docker/Dockerfile.maildump

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ WORKDIR /data
77
# Install python dependencies
88
ENV PYTHONUNBUFFERED=1
99
RUN apt-get update && apt-get -y --no-install-recommends install curl mc nano
10-
RUN pip install --upgrade pip
10+
RUN pip install --upgrade pip setuptools
1111
RUN pip install --no-cache-dir maildump
1212
CMD ["bash", "-c", "maildump --http-ip 0.0.0.0 --smtp-ip 0.0.0.0 --db feder_sent_mail.sqlite"]

.pre-commit-config.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,18 @@ default_language_version:
1717
minimum_pre_commit_version: "1.20.0"
1818
repos:
1919
- repo: https://github.com/adamchainz/django-upgrade
20-
rev: 1.28.0
20+
rev: 1.29.1
2121
hooks:
2222
- id: django-upgrade
2323
args: [--target-version, "4.2"]
2424
- repo: https://github.com/asottile/pyupgrade
25-
rev: v3.20.0
25+
rev: v3.21.1
2626
hooks:
2727
- id: pyupgrade
2828
args:
2929
- --py310-plus
3030
- repo: https://github.com/pycqa/isort
31-
rev: 6.0.1
31+
rev: 7.0.0
3232
hooks:
3333
- id: isort
3434
args:
@@ -39,7 +39,7 @@ repos:
3939
- --skip-glob
4040
- "**/migrations/*.py"
4141
- repo: https://github.com/sirosen/check-jsonschema
42-
rev: 0.34.0
42+
rev: 0.34.1
4343
hooks:
4444
- id: check-github-workflows
4545
- id: check-readthedocs
@@ -49,8 +49,8 @@ repos:
4949
- id: yamllint
5050
args: [-c, .yamllint.yml]
5151
# exclude: (feder/letters/logs/cassettes/.*|docker-compose.yml)
52-
- repo: https://github.com/psf/black
53-
rev: 25.9.0
52+
- repo: https://github.com/psf/black-pre-commit-mirror
53+
rev: 25.11.0
5454
hooks:
5555
- id: black
5656
args:

feder/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# PEP 396: The __version__ attribute's value SHOULD be a string.
2-
__version__ = "1.5.50"
2+
__version__ = "1.5.52"
33

44

55
# Compatibility to eg. django-rest-framework

feder/assets/scss/style.scss

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
@use 'sass:color';
2-
@use 'fontawesome';
3-
@use 'brands';
4-
@use 'regular';
5-
@use 'solid';
2+
// @use "variables" with (
3+
// $font-path: "../webfonts"
4+
// );
5+
// @use 'fontawesome';
6+
// @use 'solid';
7+
// @use 'brands';
8+
// @use 'regular';
69
@import 'variables';
710
@import 'bootstrap';
811
@import "layout";

feder/cases/locale/pl/LC_MESSAGES/django.po

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: cases 0.1.0\n"
99
"Report-Msgid-Bugs-To: \n"
10-
"POT-Creation-Date: 2024-03-13 19:23+0100\n"
10+
"POT-Creation-Date: 2025-11-14 18:12+0100\n"
1111
"PO-Revision-Date: 2023-10-30 18:16+0124\n"
1212
"Last-Translator: <piotr.iwanski@gmail.com>\n"
1313
"Language-Team: Adam Dobrawy <naczelnik@jawnosc.tk>\n"
@@ -93,7 +93,7 @@ msgid "Last request"
9393
msgstr "Ostatni wniosek"
9494

9595
#: feder/cases/models.py:266 feder/cases/models.py:267
96-
#: feder/cases/models.py:356
96+
#: feder/cases/models.py:359
9797
msgid "Case"
9898
msgstr "Sprawa"
9999

0 commit comments

Comments
 (0)