Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/zabbix/zabbix.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-11-09..F....... [ZBX-20320] updated to master; resolved conflicts in ↵Elina Pulke
CWidgetHelper.php, screen.scss
2022-11-09.......... [ZBXNEXT-826] updated release version [6.4.0beta4]Sergejs Maklakovs
2022-11-08.......... [ZBXNEXT-826] updated release date and fixed version [6.4.0beta3]Sergejs Maklakovs
2022-11-04.......... [ZBXNEXT-7469] updated to latest master; conflicts resolved in:Alexander Shubin
# ui/include/classes/api/services/CConfiguration.php # ui/include/classes/core/ZBase.php # ui/include/classes/import/converters/C62ImportConverter.php
2022-11-03.......... [ZBXNEXT-6980] reverted changes for dependent item testJanis Freibergs
2022-11-03A......... [ZBXNEXT-6980] changed wording of some messages; simplified code; ↵Janis Freibergs
temporarily unlocked dependent item test
2022-11-02..F....... [ZBXNEXT-7469] implemented inaccessible widgets #3Andrejs Verza
2022-11-02..F....... [ZBXNEXT-7469] implemented inaccessible widgetsAndrejs Verza
2022-11-02.......... [ZBXNEXT-6470,ZBXNEXT-6980] updated to latest from master; no ↵Vladimirs Maksimovs
conflicts
2022-11-01.......... [ZBXNEXT-7469] updated to latest master; conflicts resolved in:Alexander Shubin
# src/libs/zbxdbupgrade/dbupgrade_6030.c # ui/app/views/reports.auditlog.list.php
2022-10-31.......... [ZBX-20320] updated to latest from master; no conflictsElina Pulke
2022-10-28.......... [ZBXNEXT-826] updated release version [6.4.0beta3]Sergejs Maklakovs
2022-10-27A.F....... [ZBXNEXT-6470,ZBXNEXT-6980] implemented audit logging of item and ↵Vladimirs Maksimovs
item prototype API objects
2022-10-26..F....... [ZBXNEXT-7469] updated importers, exporters and converters for ↵Andrejs Verza
widget types
2022-10-26.......... [ZBXNEXT-6980] reverted changes of ZBXNEXT-6980, resolved conflictsJanis Freibergs
This reverts commit 5b20be857c69198a8a70cf42d3b8d22269677b19, reversing changes made to 927ff75d353fd714513265ac30680bcd1556b4f6. - ui/tests/selenium/testPageMassUpdateItemPrototypes.php
2022-10-21.......... [ZBXNEXT-6980] reverted state after checking testDependentItems; ↵Janis Freibergs
removed unused variable export
2022-10-21A......... [ZBXNEXT-6980] removed unused function parameter; temporarily ↵Janis Freibergs
reduced ZBX_DEPENDENT_ITEM_MAX_COUNT for test run
2022-10-21.......... [ZBXNEXT-6980] updated to latest from master; resolved conflictsJanis Freibergs
- ui/tests/selenium/testFormTriggerPrototype.php
2022-10-18.......... [ZBXNEXT-7469] updated to latest master; conflicts resolved in:Alexander Shubin
# create/src/schema.tmpl # src/libs/zbxdbupgrade/dbupgrade_6030.c # ui/app/views/monitoring.problem.view.php # ui/app/views/popup.massupdate.service.php # ui/include/classes/widgets/CWidgetHelper.php # ui/include/classes/widgets/fields/CWidgetFieldMsHost.php # ui/include/classes/widgets/fields/CWidgetFieldMsService.php # ui/include/classes/widgets/fields/CWidgetFieldMsSla.php # ui/include/classes/widgets/forms/CWidgetFormDataOver.php # ui/include/classes/widgets/forms/CWidgetFormGeoMap.php # ui/include/classes/widgets/forms/CWidgetFormProblemHosts.php # ui/include/classes/widgets/forms/CWidgetFormProblems.php # ui/include/classes/widgets/forms/CWidgetFormProblemsBySv.php # ui/include/classes/widgets/forms/CWidgetFormTopHosts.php # ui/include/classes/widgets/forms/CWidgetFormTrigOver.php # ui/include/classes/widgets/forms/CWidgetFormWeb.php # ui/include/defines.inc.php
2022-10-12.......... [ZBXNEXT-6470,ZBXNEXT-6980] updated to latest from master; ↵Vladimirs Maksimovs
resolved conflicts in: # ui/disc_prototypes.php # ui/include/views/configuration.item.prototype.edit.php # ui/items.php
2022-10-12.......... [ZBXNEXT-7469] added dbpatchDmitrijs Goloscapovs
2022-10-11........S. [ZBXNEXT-7972] changed the database version numbersKonstantins Prutkovs
2022-10-07..F....... [ZBXNEXT-7469] reverted changes for disabling add widget ↵Alexander Shubin
controls; fixed code style; moved widget constants from defines
2022-10-05..F....... [ZBXNEXT-7469] fixed code style; updated module manager; updated ↵Alexander Shubin
widgets constants
2022-10-03..F....... [ZBXNEXT-7469] moved constants from defines to widget classAlexander Shubin
2022-10-03..F....... [ZBXNEXT-7469] fixed widget default refresh rateAlexander Shubin
2022-09-30..F....... [ZBXNEXT-7469] fixed clock widget paddings and updated constansAlexander Shubin
2022-09-30.......... [ZBXNEXT-826] updated release version [6.4.0beta2]Natalja Romancaka
2022-09-29.......... [ZBXNEXT-6470,ZBXNEXT-6980] updated to latest from master; ↵Vladimirs Maksimovs
resolved conflicts in: # ui/disc_prototypes.php # ui/include/classes/api/managers/CHttpTestManager.php # ui/include/classes/api/managers/CItemManager.php # ui/include/classes/api/services/CHttpTest.php # ui/include/defines.inc.php # ui/items.php # ui/tests/unit/include/classes/validators/CApiInputValidatorTest.php
2022-09-29.......... [ZBXNEXT-826] updated release version and date [6.4.0beta1]Sergejs Maklakovs
2022-09-27..F....... [ZBXNEXT-7912] updated to latest from master; resolved one conflictReinis Detlavs
2022-09-24A.F....... [ZBX-21097] fixed filtering by "Resource ID" and "Recordset ID" ↵Alexander Vladishev
fields for "Audit log" page
2022-09-23.......... [ZBXNEXT-7912] updated to latest masterDmitrijs Goloscapovs
2022-09-22.......... [ZBXNEXT-3290] merged branch 'master' of ↵Andris Zeila
ssh://git.zabbix.com:7999/zbx/zabbix into feature/ZBXNEXT-3290-6.3
2022-09-22.......... [ZBXNEXT-7971] updated to the latest master; fixed conflicts in:Alexander Vladishev
- src/libs/zbxdbupgrade/dbupgrade_6030.c - ui/include/defines.inc.php - create/src/schema.tmpl
2022-09-19.......... [ZBXNEXT-3290] merged branch 'master' of ↵Andris Zeila
ssh://git.zabbix.com:7999/zbx/zabbix into feature/ZBXNEXT-3290-6.3
2022-09-16.......... [ZBXNEXT-2557] merged with the latest masterMihails Prihodko
2022-09-15.......... [ZBXNEXT-826] updated release version [6.4.0alpha2]Sergejs Maklakovs
2022-09-15.......... [ZBXNEXT-3290] merged branch 'master' of ↵Andris Zeila
ssh://git.zabbix.com:7999/zbx/zabbix into feature/ZBXNEXT-3290-6.3
2022-09-14A.F.I..... [ZBXNEXT-7971] increased max length of the "URL (after login)" fieldAlexander Vladishev
2022-09-12.......... [ZBXNEXT-2557] merged with the latest masterMihails Prihodko
2022-09-12.......... [ZBXNEXT-6797] merged with the latest masterMihails Prihodko
2022-09-09.......... [ZBXNEXT-3496,ZBXNEXT-7880] fixed db patch after versionsAleksejs Sestakovs
2022-09-09.......... [ZBXNEXT-2557] merged with the latest masterMihails Prihodko
2022-09-09.......... [ZBXNEXT-3290] merged branch 'master' of ↵Andris Zeila
ssh://git.zabbix.com:7999/zbx/zabbix into feature/ZBXNEXT-3290-6.3
2022-09-08.......... [ZBXNEXT-6797] merged with the latest masterMihails Prihodko
2022-09-08....I..... [ZBXNEXT-6797] increased host metadata length in table ↵Mihails Prihodko
proxy_autoreg_host
2022-09-08....I..... [ZBX-20943] fixed DB version errorMihails Prihodko
2022-09-08...GI...S. [ZBXNEXT-6797] increased host metadata lengthMihails Prihodko
2022-09-07.......... [ZBX-20943] updated to the latest masterMihails Prihodko