Zabbix / Zabbix / 38e016142d9

Commits

No tags

Eliza Sekace authored 38e016142d9M24 Mar 2025

.......... [ZBX-25928] updated to latest from release/7.2; resolved conflicts in:
- ui/app/controllers/CControllerTriggerPrototypeEdit.php

Showing diff to2462e65373d

build/win32/project
- Makefile_pcre.inc
ChangeLog.d
- bugfix
  - ZBX-25419
  - ZBX-25607
  - ZBX-25651
  - ZBX-26029
  - ZBX-26066
- feature
  - ZBXNEXT-9809
create/src
- dashboards.tmpl
- data.tmpl
- schema.tmpl
- templates-aa.tmpl
- templates-ab.tmpl
- templates-ac.tmpl
include
- version.h
- zbxcacheconfig.h
- zbxcachehistory.h
- zbxdbsyncer.h
sass/stylesheets/sass
- screen.scss
src
- go
  - conf
    - zabbix_agent2.conf
    - zabbix_agent2.win.conf
  - pkg/version
    - version.go
  - plugins/smart
    - README.md
    - smart.go
    - smart_test.go
    - smartfs.go
- libs
  - zbxavailability
    - avail_manager.c
  - zbxcacheconfig
    - dbconfig.c
    - dbconfig.h
    - proxy_group.c
  - zbxcachehistory
    - cachehistory.c
  - zbxdb
    - dbmisc.c
  - zbxdbsyncer
    - dbsyncer.c
  - zbxdbupgrade
  - zbxdbwrap
    - host.c
  - zbxexpr
    - macro.c
  - zbxparam
    - param.c
  - zbxrtc
    - rtc_service.c
  - zbxstr
    - str.c
- zabbix_java/src/com/zabbix/gateway
  - GeneralInformation.java
- zabbix_proxy
  - proxyconfigwrite
    - proxyconfigwrite.c
  - proxy.c
- zabbix_server
  - autoreg
    - autoreg_server.c
  - connector
    - connector_manager.c
  - dbconfigworker
    - dbconfigworker.c
  - operations
    - operations.c
  - service
    - service_manager.c
  - server.c
templates
tests/libs
ui
- app
- assets/styles
  - blue-theme.css
  - dark-theme.css
  - hc-dark.css
  - hc-light.css
- include
  - classes
    - api
      - clients
        CLocalApiClient.php
      - wrappers
        CFrontendApiWrapper.php
    - core
      - CJsonRpc.php
      - ZBase.php
    - helpers
      - CTriggerGeneralHelper.php
    - scim
      - HttpResponse.php
  - views/js
    - item.preprocessing.js.php
    - itemtest.js.php
  - config.inc.php
  - defines.inc.php
  - forms.inc.php
  - page_header.php
  - triggers.inc.php
- js
- locale
  - ar/LC_MESSAGES
    - frontend.po
  - bg/LC_MESSAGES
    - frontend.po
  - ca/LC_MESSAGES
    - frontend.po
  - cs/LC_MESSAGES
    - frontend.po
  - da/LC_MESSAGES
    - frontend.po
  - de/LC_MESSAGES
    - frontend.po
  - el/LC_MESSAGES
    - frontend.po
  - en_GB/LC_MESSAGES
    - frontend.po
  - en_US/LC_MESSAGES
    - frontend.pot
  - es/LC_MESSAGES
    - frontend.po
  - fa/LC_MESSAGES
    - frontend.po
  - fi/LC_MESSAGES
    - frontend.po
  - fr/LC_MESSAGES
    - frontend.po
  - he/LC_MESSAGES
    - frontend.po
  - hr/LC_MESSAGES
    - frontend.po
  - hu/LC_MESSAGES
    - frontend.po
  - id/LC_MESSAGES
    - frontend.po
  - it/LC_MESSAGES
    - frontend.po
  - ja/LC_MESSAGES
    - frontend.po
  - ka/LC_MESSAGES
    - frontend.po
  - kk/LC_MESSAGES
    - frontend.po
  - ko/LC_MESSAGES
    - frontend.po
  - lt/LC_MESSAGES
    - frontend.po
  - lv/LC_MESSAGES
    - frontend.po
  - nb_NO/LC_MESSAGES
    - frontend.po
  - nl/LC_MESSAGES
    - frontend.po
  - pl/LC_MESSAGES
    - frontend.po
  - pt_BR/LC_MESSAGES
    - frontend.po
  - pt_PT/LC_MESSAGES
    - frontend.po
  - ro/LC_MESSAGES
    - frontend.po
  - ru/LC_MESSAGES
    - frontend.po
  - sk/LC_MESSAGES
    - frontend.po
  - sr/LC_MESSAGES
    - frontend.po
  - sv_SE/LC_MESSAGES
    - frontend.po
  - th/LC_MESSAGES
    - frontend.po
  - tr/LC_MESSAGES
    - frontend.po
  - uk/LC_MESSAGES
    - frontend.po
  - vi/LC_MESSAGES
    - frontend.po
  - zh_CN/LC_MESSAGES
    - frontend.po
  - zh_TW/LC_MESSAGES
    - frontend.po
- tests
  - include
  - selenium
- widgets/topitems/actions
- api_jsonrpc.php
- api_scim.php
- httpconf.php
- sysmap.php
ChangeLog

Display entire source for this file Unified diff
Side-by-side diff
Ignore whitespace
Show whitespace characters
Hide e-diff
Color accessibility
build/win32/project/Makefile_pcre.inc
Modified

Zabbix

Jira Issues