Просмотр исходного кода

Merge branch 'staging/1.4.9' into main

Jaap Marcus 4 лет назад
Родитель
Сommit
df55ecf10e

+ 9 - 0
CHANGELOG.md

@@ -1,6 +1,15 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [1.4.9] - Service release 
+
+### Bugfixes
+
+- Updated jQuery and jQuery UI to the latest version due to a vulnerability in jQuery. @dependabot
+- Fixed bug in /etc/dovecot/conf.d/10-ssl.conf for new installs
+- Fixed bug with notifications
+- Fixed translation string @myrevery 
+
 ## [1.4.8] - Service release 
 
 ### Features

+ 1 - 1
install/hst-install-debian.sh

@@ -23,7 +23,7 @@ HESTIA_INSTALL_DIR="$HESTIA/install/deb"
 VERBOSE='no'
 
 # Define software versions
-HESTIA_INSTALL_VER='1.4.9~alpha'
+HESTIA_INSTALL_VER='1.4.9'
 pma_v='5.1.1'
 rc_v="1.4.11"
 multiphp_v=("5.6" "7.0" "7.1" "7.2" "7.3" "7.4" "8.0")

+ 1 - 1
install/hst-install-ubuntu.sh

@@ -23,7 +23,7 @@ HESTIA_INSTALL_DIR="$HESTIA/install/deb"
 VERBOSE='no'
 
 # Define software versions
-HESTIA_INSTALL_VER='1.4.9~alpha'
+HESTIA_INSTALL_VER='1.4.9'
 pma_v='5.1.1'
 rc_v="1.4.11"
 multiphp_v=("5.6" "7.0" "7.1" "7.2" "7.3" "7.4" "8.0")

+ 7 - 0
install/upgrade/versions/1.4.9.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+# Hestia Control Panel upgrade script for target version 1.4.9
+
+#######################################################################################
+#######                      Place additional commands below.                   #######
+#######################################################################################

+ 1 - 1
src/deb/hestia/control

@@ -1,7 +1,7 @@
 Source: hestia
 Package: hestia
 Priority: optional
-Version: 1.4.9~alpha
+Version: 1.4.9
 Section: admin
 Maintainer: HestiaCP <info@hestiacp.com>
 Homepage: https://www.hestiacp.com

+ 0 - 1
web/inc/main.php

@@ -319,7 +319,6 @@ function send_email($to, $subject, $mailtext, $from, $from_name) {
 
     $mail->Subject = $subject;
     $content = $mailtext;
-    $mail->AltBody($content);
     $content = nl2br($content);
     $mail->MsgHTML($content);
     $mail->Send();

BIN
web/locale/en/LC_MESSAGES/hestiacp.mo


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
web/locale/languages.json


BIN
web/locale/nl/LC_MESSAGES/hestiacp.mo


+ 1 - 1
web/templates/includes/css.html

@@ -23,5 +23,5 @@
     }
 ?>
 <link href="/css/dependencies/animate.min.css?<?=JS_LATEST_UPDATE?>" rel="stylesheet" rel="preload" />
-<link href="/css/dependencies/jquery-ui.structure.min.css?<?=JS_LATEST_UPDATE?>" rel="stylesheet" rel="preload" />
+<link href="/css/dependencies/jquery-ui.custom.min.css?<?=JS_LATEST_UPDATE?>" rel="stylesheet" rel="preload" />
 <link href="/css/dependencies/fontawesome.min.css?<?=JS_LATEST_UPDATE?>" rel="stylesheet" rel="preload" />

Некоторые файлы не были показаны из-за большого количества измененных файлов