Commits
Elina Pulke authored 98e9f5d5c41M
..F.I..... [ZBXNEXT-8453] updated to latest from master, resolved conflicts in - create/src/schema.tmpl; - src/libs/zbxdbupgrade/dbupgrade_6050.c; - ui/app/partials/configuration.tags.tab.php; - ui/app/views/js/monitoring.dashboard.view.js.php; - ui/app/views/js/monitoring.host.dashboard.view.js.php; - ui/app/views/js/monitoring.map.view.js.php; - ui/app/views/js/monitoring.problem.view.js.php; - ui/app/views/js/reports.toptriggers.list.js.php; - ui/include/classes/mvc/CLegacyAction.php; - ui/include/classes/mvc/CRouter.php; - ui/include/defines.inc.php; - ui/include/classes/routing/CUrlFactory.php; - ui/app/views/trigger.prototype.edit.php; - ui/app/views/trigger.edit.php; - ui/app/views/js/trigger.edit.js.php; - ui/app/views/trigger.prototype.list.php; - ui/app/views/trigger.list.php; - ui/app/views/js/trigger.prototype.list.js.php; - ui/app/views/js/trigger.list.js.php; - ui/include/views/js/configuration.item.prototype.list.js.php; - ui/include/views/js/tr_events.js.php;
Showing diff to5a1c03fc90f