 Martins Talbergs | bbf18f3f335M | .......... [ZBXNEXT-9734] Merge branch 'feature/ZBXNEXT-7410-7.3' into feature/ZBXNEXT-9734-7.3Conflicts:
ui/app/controllers/CControllerTriggerEdit.php
ui/app/controllers/CControllerTriggerPrototypeEdit.php
ui/js/class.form.validator.js | | 2 Jira issues |
 Valdis Murzins | 737a698c495 | ..F.......[ZBXNEXT-9734] fixed inline validation for expression constructor | | ZBXNEXT-9734 |
Martins Talbergs | e450b863aba | ..F.......[ZBXNEXT-7410] empty fields are allowed #2 | | ZBXNEXT-7410 |
Martins Talbergs | fdc818930c6 | ..F.......[ZBXNEXT-7410] empty fields are allowed | | ZBXNEXT-7410 |
Valdis Murzins | 3f03f7c77c6M | ..........[ZBXNEXT-7410] updated to latest from master; no conflicts | | ZBXNEXT-7410 |
Valdis Murzins | c6b24d4fe19 | ..F.......[ZBXNEXT-7410] fixed carriage returns in textboxes and textareas | | ZBXNEXT-7410 |
 Natalja Romancaka | d32a4608355 | ..........[ZBXNEXT-9850] fixed Selenium test, added wait for Graph overlay dialog loading | | ZBXNEXT-9850 |
 Aleksandr Iantsen | bb9652b8043M | .........T [ZBX-24388] fixed a trigger expression in the Check Point Next Generation Firewall by SNMP template* commit '959931666da3c09e0a40bbba2d431fcadcffb760':
.........T [ZBX-24388] fixed a trigger expression in the Check Point Next Generation Firewall by SNMP template | | ZBX-24388 |
Aleksandr Iantsen | 959931666da | .........T [ZBX-24388] fixed a trigger expression in the Check Point Next Generation Firewall by SNMP template | | ZBX-24388 |
 Sergejs Olonkins | 080a5632e85 | ..........[ZBX-26006] fixed changelog entry | | ZBX-26006 |
 Dmitrijs Goloscapovs | 54fbf4ea49d | .......... [ZBX-26197] fixed iwyu warning(cherry picked from commit 94596ffb029753c0905cbe0dd1bef0f03056710d)
(cherry picked from commit df9ec1229c366a1a210abb5fbe9c5a64bb4c6d55)
(cherry picked from commit 1aec4e0bc5cdecdee3e040543c8fc3a03a155147) | | ZBX-26197 |
Dmitrijs Goloscapovs | e4a075ca755 | ........S. [ZBXNEXT-9718] fixed coverity warning(cherry picked from commit c8741626d04e9837a8865a0b1074bb0b56a78d9c)
(cherry picked from commit 83eac999ca67c2d80df07fd008befab2549d8e07) | | ZBXNEXT-9718 |
 Artjoms Rimdjonoks | 01c330d04fbM | ........S. [ZBX-25495] reverted escalator query fix for Oracle to optimise MySQL query, also removed redundant 'distinct' from original queryMerge in ZBX/zabbix from feature/ZBX-25495-7.3 to master
* commit '72249f75c63483304090d75f547a7a97d9e0a7bf':
........S. [ZBX-25495] updated Changelog
........S. [ZBX-25495] fixed ticket number
........S. [ZBX-20249] reverted escalator query fix for Oracle to optimise MySQL query | | 2 Jira issues |
Sergejs Olonkins | 0cf8534febe | ..........[ZBXNEXT-826] updated release version to 7.4.0rc1 | | ZBXNEXT-826 |
 Continuous Integration | 4e128b5fb7e | ..........[ZBXNEXT-826] updated release date for 7.4.0beta17.4.0beta1 | | ZBXNEXT-826 |
Sergejs Olonkins | e92a53f78e5 | ..........[ZBXNEXT-686] fixed type-o in Selenium test | | ZBXNEXT-686 |
Natalja Romancaka | d731abbb248 | ..........[ZBXNEXT-686] fixed Selenium tests, changed widget loading wait in CopyWidgets test | | ZBXNEXT-686 |
Natalja Romancaka | 9fa83fc6aea | ..........[ZBXNEXT-686] updated Selenium test, changed wait for checkAvailableItems in widgets | | ZBXNEXT-686 |
Continuous Integration | c7af7aa8b51 | ..........[ZBXNEXT-826] updated ChangeLog entries | | ZBXNEXT-826 |
Sergejs Olonkins | fe1e0b60957 | ..........[ZBXNEXT-826] updated ChangeLog | | ZBXNEXT-826 |
 Natalja Romancaka | 38092affb1aM | .......... [DEV-4265] added item tags to setTriggerProblem method in Selenium framework* commit '237bdeecd5835c01343a003a63b14916c214d4c0':
.......... [DEV-4265] added check to keep unique tag pair
.......... [DEV-4265] removed trailing comma
.......... [DEV-4265] added item tags to setTriggerProblem method in Selenim framework | | DEV-4265 |
Dmitrijs Goloscapovs | 5db386f3754 | .......PS. [ZBX-26197] fixed max repetition count not being inherited by host created by LLDMerge in ZBX/zabbix from feature/ZBX-26197-7.0 to release/7.0
* commit 'bece2e66202b79dbeb19eb68599b8365ef4894ec':
.......... [ZBX-26197] added changelog
.......PS. [ZBX-26197] fixed partial maxreps update
.......PS. [ZBX-26197] changed data type to int
.......PS. [ZBX-26197] fixed warning
.......PS. [ZBX-26197] fixed wrong type in audit
.......PS. [ZBX-26197] fixed line length
.... | | ZBX-26197 |
Dmitrijs Goloscapovs | 46d571f4c67 | ........S. [ZBXNEXT-9718] added additional log message to assist in finding which item causes exhaustion of value cacheMerge in ZBX/zabbix from feature/ZBXNEXT-9718-7.0 to release/7.0
* commit 'b89562c5109796cd79afac1d7a0e1de413abeb95':
.......... [ZBXNEXT-9718] fixed changelog
.......... [ZBXNEXT-9718] reworded wording
.......PS. [ZBXNEXT-9718] separated warnings
.......... [ZBXNEXT-9718] added changelog
.......... [ZBXNEXT-9718] added changelog
.......PS. [ZBXNEXT-9718] reworded message
.......... | | ZBXNEXT-9718 |
Continuous Integration | 167b387d055 | ..........[ZBXNEXT-826] updated ChangeLog entries | | ZBXNEXT-826 |
 Eliza Sekace | 9241eaec4eaM | ..F....... [ZBXNEXT-9850] moved graphs and graph prototypes to mvc model and refactored edit forms to modal windows* commit 'b7e995d0c61112f24cbb8bafce0c1e9349678ee0': (42 commits)
.......... [ZBXNEXT-9850] removed unnecessary variables
.......... [ZBXNEXT-9850] removed unnecessary dialog call
.......... [ZBXNEXT-9850] fixed minor syntax issue
..F....... [ZBXNEXT-9850] fixed consistent rules order
.......... [ZBXNEXT-9850] revert the changes in testInheritanceGraph simple create test
.......... ... | | ZBXNEXT-9850 |
Sergejs Olonkins | 706593ef4ab | ..........[ZBXNEXT-686] fixed IDs in data test SQL in API tests after latest template build | | ZBXNEXT-686 |
Sergejs Olonkins | f1092290627 | ..........[ZBXNEXT-686] fixed IDs in data test SQL after latest template build | | ZBXNEXT-686 |
Continuous Integration | e8c7d40a5f2 | ..........[ZBXNEXT-826] automatic deployment of official Zabbix templates and media types | | ZBXNEXT-826 |
 Deniss Ponomarenko | b7e995d0c61 | ..........[ZBXNEXT-9850] removed unnecessary variables | | ZBXNEXT-9850 |
Deniss Ponomarenko | 4223356d44b | ..........[ZBXNEXT-9850] removed unnecessary dialog call | | ZBXNEXT-9850 |
 Evgenii Gordymov | 18cb0206ffdM | .........T [ZBX-26074] fixed authentication settings in README.md* commit '67c726fd70c2d762a1c6ec49227eb4399a59f8de':
.........T [ZBX-26074] fixed authentication settings in README.md | | ZBX-26074 |
Deniss Ponomarenko | 1242e7ef3db | ..........[ZBXNEXT-9850] fixed minor syntax issue | | ZBXNEXT-9850 |
Martins Talbergs | 6fde6aa0a52 | ..F.......[ZBXNEXT-9850] fixed consistent rules order | | ZBXNEXT-9850 |
Eliza Sekace | ee737e0e457 | ..F....... [ZBX-25603] fixed Tag for matching field visibility* commit '174537e54418d90039c6a9ffe5f55930257479d2':
.......... [ZBX-25603] made ChangeLog message more descriptive
..F....... [ZBX-25603] fixed Tag for matching field visibility
..F....... [ZBX-25603] fixed Tag for matching field visibility
(cherry picked from commit 35ddd370dfae4fa71ddd4fddb895b222bb6aad2f) | | ZBX-25603 |
Eliza Sekace | 3c11793ebe0 | ..F....... [ZBX-25928] fixed error handling for incorrect parameters in item and trigger popup URLs* commit '5ba8f0badc418ba204b5b4c2bf11219db3ad2501':
.......... [ZBX-25928] added some fixes to testInheritanceTriggerPrototype tests
..F....... [ZBX-25928] fixed trigger configuration form links; updated trigger prototype list data retrieval when invalid context is provided
.......... [ZBX-25928] added some fixes to testDocumentationLinks tests
.......... [ZBX-25928] updated testUrlPar... | | ZBX-25928 |
Deniss Ponomarenko | 0a2bc4c50f5 | ..........[ZBXNEXT-9850] revert the changes in testInheritanceGraph simple create test | | ZBXNEXT-9850 |
Continuous Integration | 78b01042a89 | ..........[ZBX-1357] automatic update of translation strings | | ZBX-1357 |
 Iryna Sharha | 5eeb96dc6aa | ..F....... [ZBX-25683] fixed Ctrl+Arrow shortcuts does not work in preprocessing form* commit '7be5479b2471473779e4c6ac1839c9887ced23e3':
..F....... [ZBX-25683] fixed keyboard navigation in sortable context
..F....... [ZBX-25683] fixed Ctrl+Arrow shortcuts does not work in preprocessing form
(cherry picked from commit 48684f5e6925264c4a240d9ffcc1df7dcc923b0d) | | ZBX-25683 |
Deniss Ponomarenko | a9ff8f21bcf | ..........[ZBXNEXT-9850] fixed regression tests based on reviewer comments | | ZBXNEXT-9850 |
Dmitrijs Goloscapovs | 120f9db56f8 | .......... [ZBX-26080] fixed iwyu warning(cherry picked from commit fca482785b9ec6fc1b5343124f2b8c3185904966) | | ZBX-26080 |
Martins Talbergs | b5a755d76a3 | ..F.......[ZBXNEXT-7410] fixed validate fields for action | | ZBXNEXT-7410 |
Dmitrijs Goloscapovs | 7ed321e6652 | ...G...PS.[ZBX-26080] fixed old file descriptors being hold when external log rotation is used | | ZBX-26080 |
Natalja Romancaka | 68f9372b4e9 | ..........[ZBXNEXT-686] updated Selenium framework, added shape-rendering for line, ellipse and circle for map screenhots | | ZBXNEXT-686 |
Natalja Romancaka | ab58f69fce4 | ..........[ZBXNEXT-686] updated Selenium tests, added check for filter opening and wait for host change in multiselect | | ZBXNEXT-686 |
Iryna Sharha | e9f14997937M | ..F....... [ZBX-25849] fixed first scale value appearance for SVG Graph right Y-axis* commit 'df1f1a575e7448318a21e829802791cbbd484ce9':
..F....... [ZBX-25849] fixed coding style
..F....... [ZBX-25849] removed unused ZBX_ARROW_SIZE and ZBX_ARROW_OFFSET constants
..F....... [ZBX-25849] fixed branch structure after merge | | ZBX-25849 |
 Michael Veksler | 0ecfc917d11 | .......PS. [ZBX-25146] fixed iwyu warning(cherry picked from commit d5c9d62499162bd46264111de4edfd05b9572f04) | | ZBX-25146 |
Deniss Ponomarenko | 4f2e895afc9 | ..........[ZBXNEXT-9850] updated one empty multiselect scenaria to overlay form | | ZBXNEXT-9850 |
Artjoms Rimdjonoks | cf70d307544M | ...G......[ZBX-26121] added default flags to net.dns.get arguments when none are specified | | ZBX-26121 |
Deniss Ponomarenko | 924f405b8bb | ..........[ZBXNEXT-9850] added additional dialog wait | | ZBXNEXT-9850 |
Evgenii Gordymov | 67c726fd70c | .........T [ZBX-26074] fixed authentication settings in README.md | | ZBX-26074 |
