Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

20240315 partners #901

Merged
merged 10 commits into from
Apr 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@ updates:
- dependency-name: "sass"
groups:
npm-webapp:
patterns:
- "*"
update-types:
- "minor"
- "patch"
Expand All @@ -40,8 +38,6 @@ updates:
time: "05:00"
groups:
pip-api:
patterns:
- "*"
update-types:
- "minor"
- "patch"
Expand Down
2 changes: 1 addition & 1 deletion api/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.11-alpine
FROM python:3.11.8-alpine

COPY --from=trajano/alpine-libfaketime /faketime.so /lib/libfaketime.so
RUN mkdir -p /etc/faketime
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<targetdate type="java.sql.Date">{{ donation.due | date:"d.m.Y H:i:s" }}</targetdate>

{# deSEC donation #}
<zweck type="java.lang.String">deSEC Spende/Donation authorized at {{ donation.created | date:"Y-m-d H:i:s" }} UTC</zweck>
<zweck type="java.lang.String">Thank you - deSEC Spende/Donation authorized at {{ donation.created | date:"Y-m-d H:i:s" }} UTC</zweck>

{# direct debit type: one-off #}
<sequencetype type="java.lang.String">OOFF</sequencetype>
Expand Down
6 changes: 3 additions & 3 deletions api/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
captcha~=0.5.0
celery~=5.3.6
coverage~=7.4.3
coverage~=7.4.4
cryptography~=42.0.5
Django~=5.0.3
Django~=5.0.4
django-cors-headers~=4.3.1
djangorestframework~=3.14.0
django-celery-email~=3.0.0
django-netfields~=1.3.2
django-pgtrigger~=4.11.0
django-pgtrigger~=4.11.1
django-prometheus~=2.3.1
dnspython~=2.6.1
httpretty~=1.0.5 # 1.1 breaks tests. Does not run in production, so stick to it.
Expand Down
4 changes: 2 additions & 2 deletions dev
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env bash

docker-compose -f docker-compose.yml -f docker-compose.dev.yml --env-file env-dev build "$@" \
&& docker-compose -f docker-compose.yml -f docker-compose.dev.yml --env-file env-dev up "$@"
docker compose -f docker-compose.yml -f docker-compose.dev.yml --env-file env-dev build "$@" \
&& docker compose -f docker-compose.yml -f docker-compose.dev.yml --env-file env-dev up "$@"
29 changes: 29 additions & 0 deletions www/webapp/src/assets/non-free/dns4eu.logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
99 changes: 99 additions & 0 deletions www/webapp/src/assets/non-free/eu.logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
147 changes: 0 additions & 147 deletions www/webapp/src/assets/non-free/sox.logo.svg

This file was deleted.

Loading
Loading