git subrepo commit (merge) mailcow/src/mailcow-dockerized
subrepo: subdir: "mailcow/src/mailcow-dockerized"
merged: "2866fb80"
upstream: origin: "https://github.com/mailcow/mailcow-dockerized.git"
branch: "master"
commit: "a366494c"
git-subrepo: version: "0.4.6"
origin: "???"
commit: "???"
Change-Id: I26ce31f84c1ff9e905669570f9fc7eb754ce6c1c
diff --git a/mailcow/src/mailcow-dockerized/data/web/admin.php b/mailcow/src/mailcow-dockerized/data/web/admin.php
index 93a6c22..ebddb7b 100644
--- a/mailcow/src/mailcow-dockerized/data/web/admin.php
+++ b/mailcow/src/mailcow-dockerized/data/web/admin.php
@@ -64,6 +64,7 @@
$dkim_blind_domains[$blind]['dkim'] = $dkim;
}
}
+
// rsettings
$rsettings = array_map(function ($rsetting){
$rsetting['details'] = rsettings('details', $rsetting['id']);
@@ -78,6 +79,7 @@
'data' => file_get_contents('/rspamd_custom_maps/' . $rspamd_regex_map)
];
}
+
// cors settings
$cors_settings = cors('get');
$cors_settings['allowed_origins'] = str_replace(", ", "\n", $cors_settings['allowed_origins']);
diff --git a/mailcow/src/mailcow-dockerized/data/web/api/openapi.yaml b/mailcow/src/mailcow-dockerized/data/web/api/openapi.yaml
index 18e8093..1d26216 100644
--- a/mailcow/src/mailcow-dockerized/data/web/api/openapi.yaml
+++ b/mailcow/src/mailcow-dockerized/data/web/api/openapi.yaml
@@ -2031,7 +2031,7 @@
- domain.tld
- domain2.tld
properties:
- items:
+ items:
type: array
items:
type: string
diff --git a/mailcow/src/mailcow-dockerized/data/web/css/build/013-mailcow.css b/mailcow/src/mailcow-dockerized/data/web/css/build/013-mailcow.css
deleted file mode 100644
index 374d484..0000000
--- a/mailcow/src/mailcow-dockerized/data/web/css/build/013-mailcow.css
+++ /dev/null
@@ -1,372 +0,0 @@
-@font-face {
- font-family: 'Noto Sans';
- font-style: normal;
- font-weight: 400;
- src: local(''),
- url('/fonts/noto-sans-v12-latin_greek_cyrillic-regular.woff2') format('woff2'),
- url('/fonts/noto-sans-v12-latin_greek_cyrillic-regular.woff') format('woff');
-}
-
-@font-face {
- font-family: 'Noto Sans';
- font-style: normal;
- font-weight: 700;
- src: local(''),
- url('/fonts/noto-sans-v12-latin_greek_cyrillic-700.woff2') format('woff2'),
- url('/fonts/noto-sans-v12-latin_greek_cyrillic-700.woff') format('woff');
-}
-
-@font-face {
- font-family: 'Noto Sans';
- font-style: italic;
- font-weight: 400;
- src: local(''),
- url('/fonts/noto-sans-v12-latin_greek_cyrillic-italic.woff2') format('woff2'),
- url('/fonts/noto-sans-v12-latin_greek_cyrillic-italic.woff') format('woff');
-}
-
-@font-face {
- font-family: 'Noto Sans';
- font-style: italic;
- font-weight: 700;
- src: local(''),
- url('/fonts/noto-sans-v12-latin_greek_cyrillic-700italic.woff2') format('woff2'),
- url('/fonts/noto-sans-v12-latin_greek_cyrillic-700italic.woff') format('woff');
-}
-#maxmsgsize { min-width: 80px; }
-#slider1 .slider-selection {
- background: #FFD700;
-}
-#slider1 .slider-track-high {
- background: #FF4500;
-}
-#slider1 .slider-track-low {
- background: #66CD00;
-}
-.striped:nth-child(odd) {
- background-color: #fff;
-}
-.striped:nth-child(even) {
- background-color: #fafafa;
- border:1px solid white;
-}
-.btn {
- text-transform: none;
-}
-.btn * {
- pointer-events: none;
-}
-.textarea-code {
- font-family:Consolas,Monaco,Lucida Console,Liberation Mono,DejaVu Sans Mono,Bitstream Vera Sans Mono,Courier New, monospace;
- background:transparent !important;
-}
-.navbar-nav {
- margin: 0;
-}
-.navbar-nav .nav-item {
- flex-direction: column;
- display: flex;
- padding: 0 10px !important;
-}
-.navbar-nav .nav-link {
- height: 44px;
- display: flex;
- align-items: center;
- padding: 0 10px !important;
-}
-.navbar-fixed-bottom .navbar-collapse,
-.navbar-fixed-top .navbar-collapse {
- max-height: 1000px
-}
-.bi {
- display: inline-block;
- font-size: 12pt;
-}
-.btn .bi {
- display: inline-block;
- font-size: inherit;
-}
-.btn-group-xs > .btn, .btn-xs {
- padding: .25rem .4rem;
- font-size: .875rem;
- line-height: 1rem;
- border-radius: .2rem;
-}
-.icon-spin {
- animation-name: spin;
- animation-duration: 2000ms;
- animation-iteration-count: infinite;
- animation-timing-function: linear;
- -webkit-animation: spin 2000ms infinite linear;
-}
-.dropdown-menu {
- font-size: 0.9rem;
-}
-@-webkit-keyframes spin {
- 0% {
- -webkit-transform: rotate(0deg);
- transform: rotate(0deg);
- }
- 100% {
- -webkit-transform: rotate(359deg);
- transform: rotate(359deg);
- }
-}
-@keyframes spin {
- 0% {
- -webkit-transform: rotate(0deg);
- transform: rotate(0deg);
- }
- 100% {
- -webkit-transform: rotate(359deg);
- transform: rotate(359deg);
- }
-}
-@keyframes blink {
- 50% {
- color: transparent
- }
-}
-.loader-dot {
- animation: 1s blink infinite
-}
-.loader-dot:nth-child(2) {
- animation-delay: 250ms
-}
-.loader-dot:nth-child(3) {
- animation-delay: 500ms
-}
-
-pre{white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-o-pre-wrap;word-wrap:break-word;}
-/* Fix modal moving content left */
-body.modal-open {
- overflow: inherit;
- padding-right: inherit !important;
-}
-body {
- font-family: "Noto Sans","Helvetica Neue",Helvetica,Arial,sans-serif;
- font-size: 10.5pt;
- line-height: 1.5;
-}
-html {
- font-family: "Noto Sans","Helvetica Neue",Helvetica,Arial,sans-serif;
- font-size: 10.5pt;
- line-height: 1.5;
-}
-#mailcow-alert {
- position: fixed;
- bottom: 8px;
- right: 25px;
- min-width: 350px;
- max-width: 550px;
- z-index: 2000;
-}
-.input-group-sm .btn { margin-top: 0 !important }
-legend {
- -webkit-user-select: none;
- -moz-user-select: none;
- -ms-user-select: none;
- -o-user-select: none;
- user-select: none;
- font-size: 1.2rem;
-}
-.navbar .navbar-brand {
- padding-top: 5px;
-}
-.navbar .navbar-brand img {
- height: 40px;
-}
-.mailcow-logo img {
- max-width: 250px;
-}
-.lang-link-disabled a {
- pointer-events: none;
-}
-.lang-link-disabled {
- cursor: not-allowed;
-}
-.overlay {
- background: #fff;
- position: absolute;
- z-index: 10000;
- top: 0; right: 0; bottom: 0; left: 0;
- opacity: 0.7;
-}
-.bootstrap-select.btn-group .no-results {
- display: none;
-}
-.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-secondary {
- color: rgb(197, 197, 197) !important;
-}
-.haveibeenpwned {
- cursor: pointer;
- -webkit-user-select: none;
- -moz-user-select: none;
- -ms-user-select: none;
- user-select: none;
-}
-.full-width-select {
- width: 100%!important;
-}
-.tooltip {
- font-family: inherit;
- font-size: 0.8rem;
-}
-.progress-bar {
- font-size: 0.8rem;
- line-height: 14px;
-}
-.footer {
- margin-top: 27px;
- margin-bottom: 20px;
- color: #959595;
- display: flex;
- flex-direction: column;
-}
-.footer .version {
- margin-left: auto;
- margin-top: 20px;
-}
-.slave-info {
- padding: 15px 0px 15px 15px;
- font-weight: bold;
-}
-.alert-hr {
- margin:3px 0px;
- border-bottom:1px solid #f5f5f5!important;
- opacity: 0.3;
-}
-.btn-input-missing,
-.btn-input-missing:hover,
-.btn-input-missing:active,
-.btn-input-missing:focus,
-.btn-input-missing:active:hover,
-.btn-input-missing:active:focus {
- color: #000 !important;
- background-color: #ff2f24 !important;
- border-color: #e21207 !important;
-}
-.navbar-nav > li {
- font-size: 1rem !important;
-}
-.dropdown-menu > li > a {
- font-size: 1rem !important;
-}
-.label {
- font-size:inherit;
-}
-[class^="bi-"]::before, [class*=" bi-"]::before {
- vertical-align: -0.2em !important;
-}
-legend > [class^="bi-"]::before, legend > [class*=" bi-"]::before {
- vertical-align: 0em !important;
-}
-code {
- font-size: inherit;
-}
-.bootstrap-select.btn-group.show-tick .dropdown-menu li.selected a span.check-mark {
- margin-top: 0px;
-}
-.flag-icon {
- margin-right: 5px;
-}
-
-.dropdown-header {
- font-weight: 600;
-}
-
-
-.tag-box {
- display: flex;
- flex-wrap: wrap;
- height: auto;
-}
-.tag-badge {
- transition: 200ms linear;
- margin-top: 5px;
- margin-bottom: 5px;
- margin-left: 2px;
- margin-right: 2px;
-}
-.tag-badge.btn-badge {
- cursor: pointer;
-}
-.tag-badge .bi {
- font-size: 12px;
-}
-.tag-badge.btn-badge:hover {
- filter: brightness(0.9);
-}
-.tag-input {
- margin-left: 10px;
- border: 0 !important;
- flex: 1;
- height: 24px;
- min-width: 150px;
-}
-.tag-input:focus {
- outline: none;
-}
-.tag-add {
- padding: 0 5px 0 5px;
- align-items: center;
- display: inline-flex;
-}
-
-#dnstable {
- overflow-x: auto!important;
-}
-.well {
- border: 1px solid #dfdfdf;
- background-color: #f9f9f9;
- padding: 10px;
-}
-
-
-.btn-check-label {
- color: #555;
-}
-
-.caret {
- transform: rotate(0deg);
-}
-a[aria-expanded='true'] > .caret,
-button[aria-expanded='true'] > .caret {
- transform: rotate(-180deg);
-}
-
-.list-group-details {
- background: #fff;
-}
-.list-group-header {
- background: #f7f7f7;
-}
-
-
-.bg-primary, .alert-primary, .btn-primary {
- background-color: #0F688D !important;
- border-color: #0d526d !important;
-}
-.bg-info, .alert-info, .btn-info {
- background-color: #148DBC !important;
- border-color: #127ea8 !important;
-}
-
-.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-secondary {
- color: rgb(137 137 137)!important;
-}
-
-.progress {
- background-color: #d5d5d5;
-}
-
-
-.btn-outline-secondary:hover {
- background-color: #f0f0f0;
-}
-.btn.btn-outline-secondary {
- border-color: #cfcfcf !important;
-}
-.btn-check:checked+.btn-outline-secondary, .btn-check:active+.btn-outline-secondary, .btn-outline-secondary:active, .btn-outline-secondary.active, .btn-outline-secondary.dropdown-toggle.show {
- background-color: #f0f0f0 !important;
-}
diff --git a/mailcow/src/mailcow-dockerized/data/web/css/build/014-responsive.css b/mailcow/src/mailcow-dockerized/data/web/css/build/014-responsive.css
deleted file mode 100644
index a987727..0000000
--- a/mailcow/src/mailcow-dockerized/data/web/css/build/014-responsive.css
+++ /dev/null
@@ -1,214 +0,0 @@
-.btn-xs-lg>.lang-sm:after {
- margin-left: 4px;
-}
-
-.bootstrap-select {
- max-width: 350px;
-}
-
-.card-login .apps .btn {
- width: auto;
- float: left;
- margin-right: 10px;
- margin-top: auto;
-}
-.card-login .apps .btn:hover {
- margin-top: 1px !important;
- border-bottom-width: 3px;
-}
-
-.responsive-tabs .nav-tabs {
- display: none;
-}
-
-.dataTables_paginate.paging_simple_numbers .pagination {
- display: flex;
- flex-wrap: wrap;
-}
-
-@media (min-width: 768px) {
- .responsive-tabs .nav-tabs {
- display: flex;
- }
-
- .responsive-tabs .card .card-body.collapse {
- display: block;
- }
-}
-
-
-@media (max-width: 767px) {
- .responsive-tabs .tab-pane {
- display: block !important;
- opacity: 1;
- }
-
- .card-login .apps .btn {
- width: 100%;
- float: none;
- margin-bottom: 10px;
- }
-
- .card-login .apps .btn {
- border-bottom-width: 4px;
- }
-
- .xs-show {
- display: block !important;
- }
-
- .recent-login-success {
- font-size: 14px;
- margin-top: 10px !important;
- }
- .pull-xs-right {
- float: right !important;
- }
- .pull-xs-right .dropdown-menu {
- right: 0;
- left: auto;
- }
- .text-xs-left {
- text-align: left;
- }
- .text-xs-bold {
- font-weight: bold;
- }
- .text-xs-bold .small {
- font-weight: normal;
- text-align: justify;
- }
- .btn.d-block {
- width: 100%;
- white-space: normal;
- }
- .btn.btn-xs-half,
- .btn.d-block.btn-xs-half {
- width: 50%;
- }
- .btn.btn-xs-third,
- .btn.d-block.btn-xs-third {
- width: 33.33%;
- }
- .btn.btn-xs-quart,
- .btn.d-block.btn-xs-quart {
- width: 25%;
- }
- .btn.d-block.btn-sm,
- .btn-xs-lg {
- padding: .5rem 1rem;
- line-height: 20px;
- }
- .input-xs-lg {
- height: 47px;
- padding: 13px 16px;
- }
- .btn-group:not(.input-group-btn) {
- display: flex;
- flex-wrap: wrap;
- }
- .btn-group.nowrap {
- flex-wrap: nowrap;
- }
- .btn-group.nowrap .dropdown-menu {
- width: 100%;
- }
- .card-login .btn-group {
- display: block;
- }
- .mass-actions-user .btn-group {
- float: none;
- }
- div[class^='mass-actions'] .dropdown-menu,
- .card-xs-lg .dropdown-menu,
- .dropdown-menu.login {
- width: 100%;
- }
- div[class^='mass-actions'] .btn-group .dropdown-menu {
- top: 50%;
- }
- div[class^='mass-actions'] .btn-group .btn-group .dropdown-menu,
- div.mass-actions-quarantine .btn-group .dropdown-menu,
- .card-xs-lg .dropdown-menu {
- top: 100%;
- }
- div[class^='mass-actions'] .dropdown-menu>li>a,
- .card-xs-lg .dropdown-menu>li>a,
- .dropdown-menu.login>li>a {
- padding: 8px 20px;
- }
- div[class^='mass-actions'] .dropdown-header {
- font-size: 14px;
- font-weight: bold;
- }
- .top100 {
- top: 100% !important;
- }
- .top33 {
- top: 33% !important;
- }
- .footable-filtering .form {
- width: 65%;
- }
- .btn-xs-lg>.lang-sm:after {
- top: 1px;
- }
- .pagination {
- margin-bottom: 5px;
- }
- .mass-actions-mailbox {
- padding: 0;
- }
- .card-xs-lg .card-header {
- height: 66px;
- line-height: 47px;
- }
- .card-xs-lg .btn-group .btn {
- padding-right: 5px;
- padding-left: 5px;
- }
- .bootstrap-select:not([class*=col-]):not([class*=form-control]):not(.input-group-btn) {
- width: 100%;
- }
- .btn-group:not(.bootstrap-select) {
- width: auto !important;
- }
- .bootstrap-select {
- max-width: 100%;
- }
- .bootstrap-select.btn-group.show-tick .dropdown-menu li a span.text {
- margin-right: 14px;
- white-space: normal;
- }
- .btn-group > .btn-group {
- flex-basis: 100%;
- }
- .btn-group .btn {
- display: flex !important;
- align-items: center;
- justify-content: center;
- }
- .btn-group .btn i {
- margin-right: 5px;
- }
- .card-login .btn-group .btn {
- display: block !important;
- }
-
- .dt-sm-head-hidden .dtr-title {
- display: none !important;
- }
-
-}
-
-@media (max-width: 350px) {
- .mailcow-logo img {
- max-width: 250px;
- }
-}
-
-@media (min-width: 1400px) {
- .container-xxl, .container-xl, .container-lg, .container-md, .container-sm, .container {
- max-width: 1600px;
- }
-}
\ No newline at end of file
diff --git a/mailcow/src/mailcow-dockerized/data/web/css/build/015-datatables.css b/mailcow/src/mailcow-dockerized/data/web/css/build/015-datatables.css
deleted file mode 100644
index e5518ff..0000000
--- a/mailcow/src/mailcow-dockerized/data/web/css/build/015-datatables.css
+++ /dev/null
@@ -1,80 +0,0 @@
-.dataTables_info {
- margin: 15px 0 !important;
- padding: 0px !important;
-}
-.dataTables_paginate, .dataTables_length, .dataTables_filter {
- margin: 15px 0 !important;
-}
-.dtr-details {
- width: 100%;
-}
-.table-striped>tbody>tr:nth-of-type(odd) {
- background-color: #F2F2F2;
-}
-td.child>ul>li {
- display: flex;
-}
-table.dataTable>tbody>tr.child ul.dtr-details>li {
- border-bottom: 1px solid rgba(0, 0, 0, 0.129);
- padding: 0.5em 0;
-}
-table.dataTable.dtr-inline.collapsed>tbody>tr>td.dtr-control:before:hover,
-table.dataTable.dtr-inline.collapsed>tbody>tr>th.dtr-control:before:hover {
- background-color: #5e5e5e;
-}
-table.dataTable.dtr-inline.collapsed>tbody>tr>td.dtr-control:before,
-table.dataTable.dtr-inline.collapsed>tbody>tr>th.dtr-control:before,
-table.dataTable td.dt-control:before {
- background-color: #979797 !important;
- border: 1.5px solid #616161 !important;
- border-radius: 2px !important;
- color: #fff;
- height: 1em;
- width: 1em;
- line-height: 1.25em;
- border-radius: 0px;
- box-shadow: none;
- font-size: 14px;
- transition: 0.5s all;
-}
-table.dataTable.dtr-inline.collapsed>tbody>tr.parent>td.dtr-control:before,
-table.dataTable.dtr-inline.collapsed>tbody>tr.parent>th.dtr-control:before,
-table.dataTable td.dt-control:before {
- background-color: #979797 !important;
-}
-table.dataTable.dtr-inline.collapsed>tbody>tr>td.child,
-table.dataTable.dtr-inline.collapsed>tbody>tr>th.child,
-table.dataTable.dtr-inline.collapsed>tbody>tr>td.dataTables_empty {
- background-color: #fbfbfb;
-}
-table.dataTable.table-striped>tbody>tr>td {
- vertical-align: middle;
-}
-table.dataTable.table-striped>tbody>tr>td>input[type="checkbox"] {
- margin-top: 7px;
-}
-td.dtr-col-lg {
- min-width: 350px;
- word-break: break-word;
-}
-td.dtr-col-md {
- min-width: 250px;
- word-break: break-word;
-}
-td.dtr-col-sm {
- min-width: 125px;
- word-break: break-word;
-}
-.dt-data-w100 .dtr-data {
- width: 100%;
-}
-li .dtr-data {
- word-break: break-all;
- flex: 1;
- padding-left: 5px;
- padding-right: 5px;
-}
-table.dataTable>tbody>tr.child span.dtr-title {
- width: 30%;
- max-width: 250px;
-}
\ No newline at end of file