diff options
| author | Alexander Shubin <aleksandrs.subins@zabbix.com> | 2021-04-21 18:47:38 +0300 |
|---|---|---|
| committer | Alexander Shubin <aleksandrs.subins@zabbix.com> | 2021-04-21 18:48:44 +0300 |
| commit | 3c287c84ee3d6a903d6212c9327b21b440449c9e (patch) | |
| tree | 9138ad10ea521667ff6cdce108f6b5f2a996ca29 /ChangeLog.d | |
| parent | 32ff300227fa33aa4c18efbd462eacd9b5c3aed6 (diff) | |
| parent | 88171d023e0a90a7e10d7848d910ccc832bc100c (diff) | |
A.F....... [ZBXNEXT-6411] updated to latest from master; resolved conflicts in:
- ui/app/controllers/CControllerPopupImport.php
- ui/include/classes/import/CConfigurationImport.php
- ui/include/classes/import/CImportReferencer.php
- ui/include/classes/import/converters/C52ImportConverter.php
Diffstat (limited to 'ChangeLog.d')
| -rw-r--r-- | ChangeLog.d/bugfix/ZBX-18912 | 1 | ||||
| -rw-r--r-- | ChangeLog.d/bugfix/ZBX-19199 | 1 | ||||
| -rwxr-xr-x | ChangeLog.d/bugfix/ZBX-19210 | 1 | ||||
| -rw-r--r-- | ChangeLog.d/bugfix/ZBX-19220 | 1 |
4 files changed, 0 insertions, 4 deletions
diff --git a/ChangeLog.d/bugfix/ZBX-18912 b/ChangeLog.d/bugfix/ZBX-18912 deleted file mode 100644 index f1f9497c646..00000000000 --- a/ChangeLog.d/bugfix/ZBX-18912 +++ /dev/null @@ -1 +0,0 @@ -........S. [ZBX-18912] fixed escalation message is using template message instead of custom message in actions (asestakovs) diff --git a/ChangeLog.d/bugfix/ZBX-19199 b/ChangeLog.d/bugfix/ZBX-19199 deleted file mode 100644 index b79b6871d36..00000000000 --- a/ChangeLog.d/bugfix/ZBX-19199 +++ /dev/null @@ -1 +0,0 @@ -..F....... [ZBX-19199] fixed console errors when updating problem widgets when other popups are active (averza) diff --git a/ChangeLog.d/bugfix/ZBX-19210 b/ChangeLog.d/bugfix/ZBX-19210 deleted file mode 100755 index 6d3a9f1c6c2..00000000000 --- a/ChangeLog.d/bugfix/ZBX-19210 +++ /dev/null @@ -1 +0,0 @@ -..F....... [ZBX-19210] fixed css file versioning for custom themes (ashubin) diff --git a/ChangeLog.d/bugfix/ZBX-19220 b/ChangeLog.d/bugfix/ZBX-19220 deleted file mode 100644 index bd4f1197a30..00000000000 --- a/ChangeLog.d/bugfix/ZBX-19220 +++ /dev/null @@ -1 +0,0 @@ -.........T [ZBX-19220] fixed broken link to Hikvision camera manufacturer page (abakaldin) |