Age | Commit message (Collapse) | Author |
|
and media types
|
|
hosts
|
|
and media types
|
|
and media types
|
|
and media types
|
|
and media types
|
|
and media types
|
|
(cherry picked from commit 24eba35aeab1f7f5735cfe3a4458b65f616986eb)
|
|
includes list (libs folder)
(cherry picked from commit 135765dc3e9a5f85af765a18008b18bd5770126b)
|
|
|
|
and media types
|
|
and media types
|
|
|
|
outdated templates
|
|
|
|
search filters and web.favorite.graphids, where source is graphid
|
|
and media types
|
|
the 'alerts' table for Oracle backend
|
|
|
|
and media types
|
|
- create/src/schema.tmpl
- src/libs/zbxdbupgrade/dbupgrade_5050.c
- ui/assets/styles/blue-theme.css
- ui/assets/styles/dark-theme.css
- ui/assets/styles/hc-dark.css
- ui/assets/styles/hc-light.css
- ui/include/defines.inc.php
|
|
|
|
|
|
|
|
|
|
Resolved conflicts in:
- create/src/schema.tmpl
- src/libs/zbxdbupgrade/dbupgrade_5050.c
- ui/include/defines.inc.php
|
|
and media types
|
|
feature/ZBXNEXT-7049-5.5
|
|
- create/src/dashboards.tmpl
- create/src/schema.tmpl
- src/libs/zbxdbupgrade/dbupgrade_5050.c
- ui/include/defines.inc.php
|
|
* commit 'de01d155af97ac554486098eb3e0a277f878f2c0':
.........T [ZBX-19704] fixed item pattern in "Zabbix server health" dashboard
|
|
ssh://git.zabbix.lan:7999/zbx/zabbix into feature/ZBXNEXT-7049-5.5
|
|
ssh://git.zabbix.com:7999/zbx/zabbix into feature/ZBXNEXT-7085-5.5
|
|
|
|
|
|
|
|
|
|
|
|
messages
* commit '26dcc0b43620fc086bef92acbf4d73166f8f1684':
..F....... [ZBXNEXT-6250] minor code refactoring
.......... [ZBXNEXT-6250] added new notify_if_canceled field to data.tmpl
........S. [ZBXNEXT-6250] removed redundant blank line
.......... [ZBXNEXT-6250] typo fix
.......... [ZBXNEXT-6250] typo fix
.......... [ZBXNEXT-6250] updated integration tests
........S. [ZBXNEXT-6250] changed log message string (AmE)
.D........ [ZBXNEXT-6250] fixed changelog
ADF....... [ZBXNEXT-6250] implemented escallation cancellation frontend and API part
........S. [ZBX-20177] updated constant names (server part)
........S. [ZBXNEXT-6250] changed field name
........S. [ZBXNEXT-6250] initial commit
|
|
|
|
to 1024 characters
|
|
|
|
|
|
|
|
|
|
API part
|
|
- create/src/schema.tmpl
- src/libs/zbxdbupgrade/dbupgrade_5050.c
- ui/include/defines.inc.php
|
|
|
|
|
|
|
|
|