Skip to content
Snippets Groups Projects
Verified Commit 7b1b8e09 authored by Jonathan Weth's avatar Jonathan Weth :keyboard:
Browse files

Merge branch 'master' into...

Merge branch 'master' into 601-attributeerror-at-data_check-nonetype-object-has-no-attribute-_meta-ticket-75816
parents a28bafee 58de54a9
No related branches found
No related tags found
1 merge request!882Resolve "AttributeError at /data_check/' · NoneType' object has no attribute '_meta' [Ticket#75816]"
Pipeline #49313 failed
......@@ -18,12 +18,14 @@ Added
~~~~~
* OpenID Connect RSA keys can now be passed as string in config files
* Views filtering for person names now also search the username of a linked user
Fixed
~~~~~
* GroupManager.get_queryset() returned an incomplete QuerySet
* OAuth was broken by a non-semver-adhering django-oauth-toolkit update
* Too long texts in chips didn't result in a larger chip.
* The data check results list view didn't work if a related object had been deleted in the meanwhile.
Changed
......@@ -36,6 +38,7 @@ Changed
* Name collisions are resolved by prefixing with the app label
* Apps can extend SHELL_PLUS_APP_PREFIXES and SHELL_PLUS_DONT_LOAD
* [Docker] Base image now contains curl, grep, less, sed, and pspg
* Views raising a 404 error can now customise the message that is displayed on the error page
* OpenID Connect is enabled by default now, without RSA support
......
......@@ -19,6 +19,7 @@ ENV ALEKSIS_static__root /usr/share/aleksis/static
ENV ALEKSIS_media__root /var/lib/aleksis/media
ENV ALEKSIS_backup__location /var/lib/aleksis/backups
ENV ALEKSIS_dev__uwsgi__celery false
ENV PSQL_PAGER=pspg
# Install necessary Debian and PyPI packages for build and runtime
RUN apt-get -y update && \
......@@ -28,11 +29,15 @@ RUN apt-get -y update && \
eatmydata apt-get install -y --no-install-recommends \
build-essential \
chromium \
curl \
dumb-init \
gettext \
grep \
less \
libpq-dev \
libssl-dev \
postgresql-client-14 \
pspg \
python3-dev \
python3-magic \
python3-pip \
......
......@@ -54,6 +54,7 @@ class PersonFilter(FilterSet):
"additional_name__icontains",
"last_name__icontains",
"short_name__icontains",
"user__username__icontains",
],
label=_("Search by name"),
)
......
......@@ -377,6 +377,12 @@ span.badge .material-icons {
margin-left: -2px;
}
.chip {
padding: 8px 12px;
height: auto;
line-height: 16px;
}
/*+++++++++*/
/* Buttons */
/*+++++++++*/
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment