Commits
Alexander Vladishev authored 25afbcdb3e8M
..F....... [ZBXNEXT-2102,ZBXNEXT-3921] updated to the latest ZBXNEXT-2102-master; fixed conflicts in: - frontends/php/app/controllers/CControllerWidgetTrigOverView.php - frontends/php/app/controllers/CControllerDashbrdWidgetConfig.php - frontends/php/app/controllers/CControllerWidgetDataOverView.php - frontends/php/app/controllers/CControllerWidgetSysmapView.php - frontends/php/app/controllers/CControllerWidgetActionLogView.php - frontends/php/app/views/monitoring.dashboard.config.php - frontends/php/include/classes/widgets/CActionLogWidgetForm.php - frontends/php/include/classes/widgets/CUrlWidgetForm.php - frontends/php/include/classes/widgetfields/CWidgetField.php - frontends/php/include/classes/widgetfields/CWidgetFieldCheckbox.php - frontends/php/include/classes/widgetfields/CWidgetFieldRadioButtonList.php
Showing diff to63f87075318