Skip to content
Snippets Groups Projects
This project is mirrored from https://github.com/Mailu/Mailu. Pull mirroring updated .
  1. Mar 26, 2024
    • bors-mailu[bot]'s avatar
      Merge #3205 · 01cdacfc
      bors-mailu[bot] authored
      3205: Fix bug 3068. Spam messages were always marked as read. (backport #3204) r=mergify[bot] a=mergify[bot]
      
      ## What type of PR?
      
      bug-fix
      
      ## What does this PR do?
      When `Enable marking spam mails as read`  was disabled, spam messages were still marked as read. This PR resolves this defect.
      
      ### Related issue(s)
      - Auto close an issue like: closes #3068
      
      ## Prerequisites
      Before we can consider review and merge, please make sure the following list is done and checked.
      If an entry in not applicable, you can check it or remove it from the list.
      
      - [x] In case of feature or enhancement: documentation updated accordingly
      - [x] Unless it's docs or a minor change: add [changelog](https://mailu.io/master/contributors/workflow.html#changelog) entry file.
      <hr>This is an automatic backport of pull request #3204 done by [Mergify](https://mergify.com
      
      ).
      
      Co-authored-by: default avatarDimitri Huisman <diman@huisman.xyz>
      2.0.40
      01cdacfc
  2. Mar 25, 2024
  3. Mar 11, 2024
    • bors-mailu[bot]'s avatar
      Merge #3190 · e4264938
      bors-mailu[bot] authored
      3190: Ensure we always send an ISRG root for DANE (backport #3188) r=mergify[bot] a=mergify[bot]
      
      This is an automatic backport of pull request #3188 done by [Mergify](https://mergify.com).
      Cherry-pick of 494147ee has failed:
      ```
      On branch mergify/bp/2.0/pr-3188
      Your branch is ahead of 'origin/2.0' by 2 commits.
        (use "git push" to publish your local commits)
      
      You are currently cherry-picking commit 494147ee.
        (fix conflicts and run "git cherry-pick --continue")
        (use "git cherry-pick --skip" to skip this patch)
        (use "git cherry-pick --abort" to cancel the cherry-pick operation)
      
      Changes to be committed:
      	modified:   core/nginx/letsencrypt.py
      
      Unmerged paths:
        (use "git add <file>..." to mark resolution)
      	both modified:   core/base/requirements-prod.txt
      	both modified:   core/nginx/config.py
      
      ```
      
      
      To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally
      
      ---
      
      
      <details>
      <summary>Mergify commands and options</summary>
      
      <br />
      
      More conditions and actions can be found in the [documentation](https://docs.mergify.com/).
      
      You can also trigger Mergify actions by commenting on this pull request:
      
      - ``@Mergifyio` refresh` will re-evaluate the rules
      - ``@Mergifyio` rebase` will rebase this PR on its base branch
      - ``@Mergifyio` update` will merge the base branch into this PR
      - ``@Mergifyio` backport <destination>` will backport this PR on `<destination>` branch
      
      Additionally, on Mergify [dashboard](https://dashboard.mergify.com) you can:
      
      - look at your merge queues
      - generate the Mergify configuration with the config editor.
      
      Finally, you can contact us on https://mergify.com
      
      
      </details>
      
      Co-authored-by: default avatarFlorent Daigniere <nextgens@freenetproject.org>
      Co-authored-by: default avatarFlorent Daigniere <nextgens@users.noreply.github.com>
      2.0.39
      e4264938
  4. Mar 10, 2024
  5. Feb 06, 2024
    • bors-mailu[bot]'s avatar
      Merge #3158 · e43f56e2
      bors-mailu[bot] authored
      3158: Add trailing semicolon for DMARC authorisation record (backport #3150) r=mergify[bot] a=mergify[bot]
      
      This is an automatic backport of pull request #3150 done by [Mergify](https://mergify.com).
      
      
      ---
      
      
      <details>
      <summary>Mergify commands and options</summary>
      
      <br />
      
      More conditions and actions can be found in the [documentation](https://docs.mergify.com/).
      
      You can also trigger Mergify actions by commenting on this pull request:
      
      - ``@Mergifyio` refresh` will re-evaluate the rules
      - ``@Mergifyio` rebase` will rebase this PR on its base branch
      - ``@Mergifyio` update` will merge the base branch into this PR
      - ``@Mergifyio` backport <destination>` will backport this PR on `<destination>` branch
      
      Additionally, on Mergify [dashboard](https://dashboard.mergify.com) you can:
      
      - look at your merge queues
      - generate the Mergify configuration with the config editor.
      
      Finally, you can contact us on https://mergify.com
      
      
      </details>
      
      Co-authored-by: default avatarsu-ex <codeworks@supercable.onl>
      Co-authored-by: default avatarFlorent Daigniere <nextgens@freenetproject.org>
      2.0.38
      e43f56e2
  6. Feb 05, 2024
  7. Jan 18, 2024
    • bors-mailu[bot]'s avatar
      Merge #3133 · 1ff33e6c
      bors-mailu[bot] authored
      3133: Fix 3129, thanks to Games-Crack (backport #3132) r=mergify[bot] a=mergify[bot]
      
      This is an automatic backport of pull request #3132 done by [Mergify](https://mergify.com).
      
      
      ---
      
      
      <details>
      <summary>Mergify commands and options</summary>
      
      <br />
      
      More conditions and actions can be found in the [documentation](https://docs.mergify.com/).
      
      You can also trigger Mergify actions by commenting on this pull request:
      
      - ``@Mergifyio` refresh` will re-evaluate the rules
      - ``@Mergifyio` rebase` will rebase this PR on its base branch
      - ``@Mergifyio` update` will merge the base branch into this PR
      - ``@Mergifyio` backport <destination>` will backport this PR on `<destination>` branch
      
      Additionally, on Mergify [dashboard](https://dashboard.mergify.com) you can:
      
      - look at your merge queues
      - generate the Mergify configuration with the config editor.
      
      Finally, you can contact us on https://mergify.com
      
      
      </details>
      
      Co-authored-by: default avatarFlorent Daigniere <nextgens@freenetproject.org>
      2.0.37
      1ff33e6c
    • Florent Daigniere's avatar
      Fix 3129, thanks to Games-Crack · 730a0e81
      Florent Daigniere authored
      (cherry picked from commit bbfde0ba)
      730a0e81
  8. Dec 28, 2023
  9. Dec 22, 2023
    • bors-mailu[bot]'s avatar
      Merge #3103 #3104 · d89b454b
      bors-mailu[bot] authored
      3103: Prevent SMTP smuggling (backport #3102) r=mergify[bot] a=mergify[bot]
      
      This is an automatic backport of pull request #3102 done by [Mergify](https://mergify.com).
      
      
      ---
      
      
      <details>
      <summary>Mergify commands and options</summary>
      
      <br />
      
      More conditions and actions can be found in the [documentation](https://docs.mergify.com/).
      
      You can also trigger Mergify actions by commenting on this pull request:
      
      - ``@Mergifyio` refresh` will re-evaluate the rules
      - ``@Mergifyio` rebase` will rebase this PR on its base branch
      - ``@Mergifyio` update` will merge the base branch into this PR
      - ``@Mergifyio` backport <destination>` will backport this PR on `<destination>` branch
      
      Additionally, on Mergify [dashboard](https://dashboard.mergify.com) you can:
      
      - look at your merge queues
      - generate the Mergify configuration with the config editor.
      
      Finally, you can contact us on https://mergify.com
      </details>
      
      3104: Do not block webmail when we have a valid SSO session (backport #3100) r=mergify[bot] a=mergify[bot]
      
      This is an automatic backport of pull request #3100 done by [Mergify](https://mergify.com).
      
      
      ---
      
      
      <details>
      <summary>Mergify commands and options</summary>
      
      <br />
      
      More conditions and actions can be found in the [documentation](https://docs.mergify.com/).
      
      You can also trigger Mergify actions by commenting on this pull request:
      
      - ``@Mergifyio` refresh` will re-evaluate the rules
      - ``@Mergifyio` rebase` will rebase this PR on its base branch
      - ``@Mergifyio` update` will merge the base branch into this PR
      - ``@Mergifyio` backport <destination>` will backport this PR on `<destination>` branch
      
      Additionally, on Mergify [dashboard](https://dashboard.mergify.com) you can:
      
      - look at your merge queues
      - generate the Mergify configuration with the config editor.
      
      Finally, you can contact us on https://mergify.com
      
      
      </details>
      
      Co-authored-by: default avatarFlorent Daigniere <nextgens@freenetproject.org>
      2.0.35
      d89b454b
    • Florent Daigniere's avatar
      Do not block webmail when we have a valid SSO sess · 258951bc
      Florent Daigniere authored
      (cherry picked from commit 325aa545)
      258951bc
    • Florent Daigniere's avatar
      Prevent SMTP smuggling · cab3e293
      Florent Daigniere authored
      (cherry picked from commit 64d83d06)
      cab3e293
  10. Nov 18, 2023
  11. Nov 15, 2023
Loading