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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Automatic PR to nightly from 2023-05-08T06:04:57Z #5229

Merged
merged 15 commits into from
May 8, 2023
Merged

Conversation

milkmaker
Copy link
Collaborator

@milkmaker milkmaker commented May 8, 2023

馃摑 Brief description

Merge pull request #5090 from mailcow/staging
Merge pull request #5115 from mailcow/staging
Merge pull request #5132 from mailcow/staging
Merge pull request #5144 from mailcow/staging
Merge pull request #5148 from mailcow/staging
Merge pull request #5151 from mailcow/staging
Merge pull request #5154 from mailcow/staging
[Web] Fix temporary email aliases sorting
[Dockerapi] Fix typo in dockerapi sieve print
[Web] hide user tabs if acl is missing
Add IP Connect Inc
[Web] fix rspamd table on sm devices
Fix typo in mobileconfig redirect
[Web] fix rspamd table scan_time on sm devices
Merge pull request #5165 from mailcow/staging
[Web] fix bcc localdest selectpicker
Merge pull request #5198 from mailcow/fix/sorting-tla
Merge pull request #5204 from mailcow/fix/rspamd-table
Merge pull request #5202 from mailcow/feat/user-acl-tabs
Merge pull request #5220 from mailcow/fix/bcc-selectpicker
Merge pull request #5211 from goodygh/5175-fix-mobileconfig-redirect
Merge pull request #5201 from mailcow/fix/sieve-print
Merge pull request #5203 from mailcow/feat/bad_asn

馃捇 Commits

馃搧 Modified files

data/Dockerfiles/dockerapi/dockerapi.py | 2 +-
data/conf/rspamd/custom/bad_asn.map | 3 +-
data/web/inc/triggers.inc.php | 2 +-
data/web/js/build/013-mailcow.js | 10 ++++++
data/web/js/site/debug.js | 22 +++++--------
data/web/js/site/mailbox.js | 56 +++++++++++++++++++--------------
data/web/js/site/user.js | 25 +++++++++++----
data/web/templates/user.twig | 20 +++++++++---
8 files changed, 88 insertions(+), 52 deletions(-)

@milkmaker
Copy link
Collaborator Author

Thanks for contributing!

I noticed that you didn't select staging as your base branch. Please change the base branch to staging.
See the attached picture on how to change the base branch to staging:

check_prs_if_on_staging.png

[Web] fix rspamd table on sm devices
@milkmaker
Copy link
Collaborator Author

Thanks for contributing!

I noticed that you didn't select staging as your base branch. Please change the base branch to staging.
See the attached picture on how to change the base branch to staging:

check_prs_if_on_staging.png

[Web] hide user tabs if acl is missing
@milkmaker
Copy link
Collaborator Author

Thanks for contributing!

I noticed that you didn't select staging as your base branch. Please change the base branch to staging.
See the attached picture on how to change the base branch to staging:

check_prs_if_on_staging.png

[Web] fix bcc localdest selectpicker
@milkmaker
Copy link
Collaborator Author

Thanks for contributing!

I noticed that you didn't select staging as your base branch. Please change the base branch to staging.
See the attached picture on how to change the base branch to staging:

check_prs_if_on_staging.png

@milkmaker
Copy link
Collaborator Author

Thanks for contributing!

I noticed that you didn't select staging as your base branch. Please change the base branch to staging.
See the attached picture on how to change the base branch to staging:

check_prs_if_on_staging.png

[Dockerapi] Fix typo in dockerapi sieve print
@milkmaker
Copy link
Collaborator Author

Thanks for contributing!

I noticed that you didn't select staging as your base branch. Please change the base branch to staging.
See the attached picture on how to change the base branch to staging:

check_prs_if_on_staging.png

Add IP Connect Inc to bad_asn.map
@milkmaker
Copy link
Collaborator Author

Thanks for contributing!

I noticed that you didn't select staging as your base branch. Please change the base branch to staging.
See the attached picture on how to change the base branch to staging:

check_prs_if_on_staging.png

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants