From 4907f702c8e2018869bb3553ede13d873cb8e493 Mon Sep 17 00:00:00 2001 From: Peter Date: Wed, 2 Mar 2022 18:22:27 +0100 Subject: [PATCH 1/5] Fix issue forms --- .github/ISSUE_TEMPLATE/{Bug_report.md => Bug_report.yml} | 0 .../ISSUE_TEMPLATE/{Feature_request.md => Feature_request.yml} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename .github/ISSUE_TEMPLATE/{Bug_report.md => Bug_report.yml} (100%) rename .github/ISSUE_TEMPLATE/{Feature_request.md => Feature_request.yml} (100%) diff --git a/.github/ISSUE_TEMPLATE/Bug_report.md b/.github/ISSUE_TEMPLATE/Bug_report.yml similarity index 100% rename from .github/ISSUE_TEMPLATE/Bug_report.md rename to .github/ISSUE_TEMPLATE/Bug_report.yml diff --git a/.github/ISSUE_TEMPLATE/Feature_request.md b/.github/ISSUE_TEMPLATE/Feature_request.yml similarity index 100% rename from .github/ISSUE_TEMPLATE/Feature_request.md rename to .github/ISSUE_TEMPLATE/Feature_request.yml From 5541f84c3c392f79f4d981deaffa4cac0ac5aed2 Mon Sep 17 00:00:00 2001 From: Peter Date: Wed, 2 Mar 2022 18:22:55 +0100 Subject: [PATCH 2/5] [GH-Actions][stale] Update to v5.0.0 --- .github/workflows/close_old_issues_and_prs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/close_old_issues_and_prs.yml b/.github/workflows/close_old_issues_and_prs.yml index 76c93159..e746bc6f 100644 --- a/.github/workflows/close_old_issues_and_prs.yml +++ b/.github/workflows/close_old_issues_and_prs.yml @@ -14,7 +14,7 @@ jobs: pull-requests: write steps: - name: Mark/Close Stale Issues and Pull Requests 🗑️ - uses: actions/stale@v4 + uses: actions/stale@v5.0.0 with: repo-token: ${{ secrets.STALE_ACTION_PAT }} days-before-stale: 60 From b82009665670c55376d27149a25be23ed16c5814 Mon Sep 17 00:00:00 2001 From: andryyy Date: Mon, 14 Mar 2022 08:35:00 +0100 Subject: [PATCH 3/5] [Web] Delete related spam aliases when deleting alias domain --- data/web/inc/functions.mailbox.inc.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/data/web/inc/functions.mailbox.inc.php b/data/web/inc/functions.mailbox.inc.php index 21b6b130..dccdcd93 100644 --- a/data/web/inc/functions.mailbox.inc.php +++ b/data/web/inc/functions.mailbox.inc.php @@ -4054,6 +4054,10 @@ function mailbox($_action, $_type, $_data = null, $_extra = null) { $stmt->execute(array( ':alias_domain' => $alias_domain, )); + $stmt = $pdo->prepare("DELETE FROM `spamalias` WHERE `address` LIKE :domain"); + $stmt->execute(array( + ':domain' => '%@'.$alias_domain, + )); $stmt = $pdo->prepare("DELETE FROM `bcc_maps` WHERE `local_dest` = :alias_domain"); $stmt->execute(array( ':alias_domain' => $alias_domain, From 769e08843bf733430017a4130629acc30d99cebb Mon Sep 17 00:00:00 2001 From: andryyy Date: Mon, 14 Mar 2022 13:10:39 +0100 Subject: [PATCH 4/5] [Helper] Backup and restore: Use bullseye-slim --- helper-scripts/backup_and_restore.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helper-scripts/backup_and_restore.sh b/helper-scripts/backup_and_restore.sh index 189a6607..9f7533ca 100755 --- a/helper-scripts/backup_and_restore.sh +++ b/helper-scripts/backup_and_restore.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -DEBIAN_DOCKER_IMAGE="debian:buster-slim" +DEBIAN_DOCKER_IMAGE="debian:bullseye-slim" if [[ ! -z ${MAILCOW_BACKUP_LOCATION} ]]; then BACKUP_LOCATION="${MAILCOW_BACKUP_LOCATION}" From d52323df2dc8689224d704e3d69f793f40ec852f Mon Sep 17 00:00:00 2001 From: DerLinkman Date: Thu, 17 Mar 2022 21:57:27 +0100 Subject: [PATCH 5/5] [WEB] Changed Version to footer margin top to 20px --- data/web/css/build/008-mailcow.css | 1 + 1 file changed, 1 insertion(+) diff --git a/data/web/css/build/008-mailcow.css b/data/web/css/build/008-mailcow.css index d7533424..d04feb25 100644 --- a/data/web/css/build/008-mailcow.css +++ b/data/web/css/build/008-mailcow.css @@ -207,6 +207,7 @@ legend { } .footer .version { margin-left: auto; + margin-top: 20px; } .slave-info { padding: 15px 0px 15px 15px;