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

Merge branch 'release' into staging/1.4.14

Raphael Schneeberger 4 лет назад
Родитель
Сommit
a8b3e3d5ab
2 измененных файлов с 4 добавлено и 2 удалено
  1. 2 0
      CHANGELOG.md
  2. 2 2
      install/upgrade/upgrade.conf

+ 2 - 0
CHANGELOG.md

@@ -72,6 +72,8 @@ All notable changes to this project will be documented in this file.
 - Fixed UI issues after upgrade jQuery + jQuery UI to last version (#2021 and #2032) + [forum](https://forum.hestiacp.com/t/confusion-about-send-welcome-email-checkbox/4259/11)
 - Fixed security issues in caching templates of Nginx when used as Reverse Proxy
 - Fixed an issue with deleting multiple mail accounts (#2047)
+- Fixed an issue with phpmailer + non latin characters (#2050) thanks @Faymir
+- Remove caching template for CraftCMS (#2039) @anvme 
 - Fixed an issue with phpmailer + non latin characters (#2050) thanks @Faymir 
 - Fix Unable to load dynamic library 'pdo_mysql.so' after php reinstalling (#2069)
 

+ 2 - 2
install/upgrade/upgrade.conf

@@ -32,12 +32,12 @@ UPGRADE_UPDATE_PHPMYADMIN='false'
 UPGRADE_UPDATE_ROUNDCUBE='false'
 
 # Update rainloop to the latest version during upgrade
-UPGRADE_UPDATE_RAINLOOP='true'
+UPGRADE_UPDATE_RAINLOOP='false'
 
 # Update the File Manager or it's configuration file
 # UPGRADE_UPDATE_FILEMANAGER: Performs an upgrade/repair install of the File Manager
 # UPGRADE_UPDATE_FILEMANAGER_CONFIG: Updates only the configuration file
-UPGRADE_UPDATE_FILEMANAGER='true'
+UPGRADE_UPDATE_FILEMANAGER='false'
 UPGRADE_UPDATE_FILEMANAGER_CONFIG='false'
 
 # Post installation clean-up