Commits
Alexander Vladishev authored e2287b52ae1M
A.F.....S. [ZBXNEXT-8087] reverted removed template nesting * commit '45d2abc7cc8711875af510bfb79375ffae22e0e0': .D........ [ZBXNEXT-826] removed dublicate of the ChangeLog entry A......... [ZBXNEXT-8087] fixed coding style for graphGeneral.validateCreate method A......... [ZBXNEXT-8087] fixed coding style A......... [ZBXNEXT-8087] fixed coding style A......... [ZBXNEXT-8087] fixed errors when importing template with delete template linkage option selected A......... [ZBXNEXT-8087] fixed coding style for CGraphGeneral::validateUpdate() A......... [ZBXNEXT-8087] fixed not importing url_name parameter for triggers and trigger prototypes A......... [ZBXNEXT-8087] fixed output parameters for host group, template group, template get in CConfiguration::importcompare() ..F....... [ZBXNEXT-8087] removed unnecessary file; minor style fix A.F....... [ZBXNEXT-7951] improved import process; resolved conflicts in: ui/app/views/popup.import.php, ui/include/classes/api/services/CConfiguration.php, ui/include/classes/api/services/CHostPrototype.php, ui/include/classes/api/services/CItemGeneral.php, ui/include/classes/api/services/CItemPrototype.php, ui/include/classes/api/services/CValueMap.php, ui/include/classes/export/CConfigurationExport.php, ui/include/classes/import/CConfigurationImport.php, ui/include/classes/import/CConfigurationImportcompare.php, ui/include/classes/widgets/fields/CWidgetFieldMultiSelectUser.php .D........ [ZBXNEXT-8087] added changelog A......... [ZBXNEXT-8087] removed extra uuid storing when existing item or item prototype of template become inherited as the result of linking the another template with the same item key A.F.I...S. [ZBXNEXT-8087] reverted removing of the template nesting
Showing diff to45d2abc7cc8