Merge branch 'hotfix/5.9.4'

This commit is contained in:
Yuri Kuznetsov
2020-07-16 20:15:21 +03:00
5 changed files with 9 additions and 4 deletions
+5
View File
@@ -27,6 +27,11 @@
* these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
************************************************************************/
/************************************************************************
* This file contains code parts copied from TCPDF software library
* that is published under GNU Lesser General Public License.
************************************************************************/
namespace Espo\Core\Pdf;
define('K_TCPDF_EXTERNAL_CONFIG', true);
+1 -1
View File
@@ -74,7 +74,7 @@ class Sender
$handler = curl_init($webhook->get('url'));
curl_setopt($handler, \CURLOPT_RETURNTRANSFER, true);
curl_setopt($handler, \CURLOPT_FOLLOWLOCATION, true);
curl_setopt($handler, \CURLOPT_SSL_VERIFYPEER, false);
curl_setopt($handler, \CURLOPT_SSL_VERIFYPEER, true);
curl_setopt($handler, \CURLOPT_HEADER, true);
curl_setopt($handler, \CURLOPT_CUSTOMREQUEST, 'POST');
curl_setopt($handler, \CURLOPT_CONNECTTIMEOUT, $connectTimeout);
@@ -269,7 +269,7 @@
"systemRequirements": "System Requirements for EspoCRM.",
"apiUsers": "Separate users for integration purposes.",
"webhooks": "Manage webhooks.",
"emailAddresses": "All emailes addresses stored in the system.",
"emailAddresses": "All email addresses stored in the system.",
"phoneNumbers": "All phone numbers stored in the system.",
"dashboardTemplates": "Deploy dashboards to users.",
"layoutSets": "Collections of layouts that can be assigned to teams & portals.",
@@ -67,7 +67,7 @@
"removeDuplicates": "This will permanently remove all imported records that were recognized as duplicates.",
"confirmRevert": "This will remove all imported records permanently. Are you sure?",
"confirmRemoveDuplicates": "This will permanently remove all imported records that were recognized as duplicates. Are you sure?",
"confirmRemoveImportLog" : "This will remove the import log. All imported records will be kept. You won't be able to revert import results. Are you sure you?",
"confirmRemoveImportLog" : "This will remove the import log. All imported records will be kept. You won't be able to revert import results. Are you sure?",
"removeImportLog": "This will remove the import log. All imported records will be kept. Use it if you are sure that import is fine."
},
"fields": {
+1 -1
View File
@@ -501,7 +501,7 @@ define('ui', [], function () {
},
error: function (message) {
Espo.Ui.notify(message, 'error', 2000);
Espo.Ui.notify(message, 'error', 4000);
},
info: function (message) {