07dc9a0b84
first load it does not show the data
...
Former-commit-id: 417e37dfb7acd78f3fb9e379a62534ca611aa9b1
2019-01-09 12:27:22 +01:00
8d3644b002
Merge branch '3112-Bug-en-creacion-de-alertas-en-cluster' into 'develop'
...
fix duplicated table in active-passive cluster's alert builder
See merge request artica/pandorafms!2010
Former-commit-id: 5b92294a64c3ba4baa65f6eba4087edebd450ed9
2019-01-09 10:34:30 +01:00
4f7733d8e8
Merge branch '2923-unit-y-post-process-no-se-guardan' into 'develop'
...
fixed bug: failing load of post process and unit fields in plugin component in module creation
See merge request artica/pandorafms!1912
Former-commit-id: 659495290305079e9932ab60b5fef924ef6089ed
2019-01-09 10:31:44 +01:00
344e5f1a6f
Auto-updated build strings.
...
Former-commit-id: a2919ff8afe0b64b756cc60b01a3145a02c8606a
2019-01-09 00:01:23 +01:00
f0c0a86533
LDAP no hierarchy groups on node functionallity
...
Former-commit-id: a9fe31be70e178e190c0d0bacf1dd6e27e71f03b
2019-01-08 16:42:23 +01:00
6e90172b59
Merge branch '2919-Bug-en-la-ayuda-de-plugin-en-la-creacion-de-un-modulo-de-tipo-plugin' into 'develop'
...
fixed english and spanish version of plugin-in macros help dialog
See merge request artica/pandorafms!1895
Former-commit-id: daf5cfd2aabda3284139069d403a6c327eeb682e
2019-01-08 15:38:07 +01:00
561579580e
Merge branch '2958-Bug-en-filtrado-de-módulos-en-la-creación-de-alertas' into 'develop'
...
Added parameter width id agent - #2958
See merge request artica/pandorafms!1891
Former-commit-id: 3288ce807e8ab67daab9d6f4795a263c8467bc7f
2019-01-08 13:38:35 +01:00
0445e212fe
Added default_no_hierarchy to config global variable
...
Former-commit-id: 0daba928d7adc7a848bca04b04168d05a82ea609
2019-01-08 12:54:32 +01:00
669c74c3dd
Merge branch '2838-Vista-detalle-módulo-en-tree-view' into 'develop'
...
Removed text for modules with images - #2838
See merge request artica/pandorafms!1945
Former-commit-id: f9e95e0bf3262b8783c6b48927522d12d1edc2bf
2019-01-08 12:18:36 +01:00
7300f83552
Merge branch '2955-Group-view-cuenta-módulos-de-agentes-deshabilitados' into 'develop'
...
Added disabled field in sql query - #2955
See merge request artica/pandorafms!1893
Former-commit-id: 2eaba1884722b5294698620f9ca0464b12c7bd33
2019-01-08 12:17:09 +01:00
0cb7aa3d0e
Merge branch '3047-Error-en-etiqueta-en-gráficas-horizontales' into 'develop'
...
Changed the font styles of the labels - #3047
See merge request artica/pandorafms!1982
Former-commit-id: 48a5230053344368f5858192e6eb3a4d7c42c830
2019-01-08 12:15:05 +01:00
752186cfba
conflict solved
...
Former-commit-id: 1f523d736b97c48ecfb9b39598c529e601702775
2019-01-08 11:59:50 +01:00
958dbb263e
Merge branch 'ent-3252-bug-modulecrontab' into 'develop'
...
Fixed module_crontab in first execution in Linux
Closes pandora_enterprise#3252
See merge request artica/pandorafms!2096
Former-commit-id: 82248a9030939f1e37c0e252a3ffddff3f3f485c
2019-01-08 08:44:48 +01:00
02b497c250
Auto-updated build strings.
...
Former-commit-id: 32c035216be628177ecd430d3c875e3dd504dccc
2019-01-08 00:01:27 +01:00
dd922c41fc
Auto-updated build strings.
...
Former-commit-id: bb71b724086140b69a1314f914508cdbd2fc7776
2019-01-07 00:01:28 +01:00
48f1196400
Auto-updated build strings.
...
Former-commit-id: 17e276d76c3ee7afa9866f8268d6dcb120485a0b
2019-01-06 00:02:00 +01:00
cf1d28cf8b
Auto-updated build strings.
...
Former-commit-id: ed5de54f4a19cf94fad2d6978c0229928edcec6e
2019-01-05 00:01:24 +01:00
a96606088a
Merge branch 'Tipo_de_datos_en_Module_Data_server' into 'develop'
...
Removed Web Analysis and Log4x from data server module
See merge request artica/pandorafms!1985
Former-commit-id: 53756c67551aba928a0bb545386eceeb870fc8d0
2019-01-04 16:52:28 +01:00
eb1ce680d8
added accent compatibility Dataserver
...
Former-commit-id: 039f7a5b776715c8c6a69bc6ab025dd9ff33fad9
2019-01-04 10:42:24 +01:00
cfdde23d96
Auto-updated build strings.
...
Former-commit-id: 051d9c9f6f96c740c40cf8afc900125ab5ec80e9
2019-01-04 00:01:27 +01:00
cf15f715b6
safe_input in custom_field operations Dataserver
...
Former-commit-id: 7cbb8fdb97a1265201f6dd5600ad58664cc89c29
2019-01-03 18:00:49 +01:00
05cc3d0538
Merge branch '3125_Fallo_en_calendario_Begin_Date_en_el_filtro_de_las_combined_graph' into 'develop'
...
Fixed calendar in combined graphs
See merge request artica/pandorafms!2005
Former-commit-id: a7df2231f2c3b6e94b9d3273c99112f07c258441
2019-01-03 16:41:21 +01:00
5ecc9276e0
Merge branch 'develop' into 2523-APIListar,-crear,-borrar-y-modificar-Usuarios-desde-la-API-#6167-EUComm
...
# Conflicts:
# pandora_console/include/functions_api.php
Former-commit-id: 6ba5a8f0fd2d02daca0d05e08b27981c7137f0bc
2019-01-03 16:25:40 +01:00
3a261f2558
Merge remote-tracking branch 'origin/develop' into ent-3328-7200-correcciones-consola-vmware
...
Former-commit-id: 7b2d45e6631ffd124860a20d8e67f6898534dea1
2019-01-03 14:35:32 +01:00
361b85efb8
Merge branch 'ent-3332-fallo-al-filtrar-por-grupos-en-prediction-module' into 'develop'
...
Fixed agents_get_group_agents while trying to get agent list from target group
See merge request artica/pandorafms!2107
Former-commit-id: 5c036aa603fbd341617b065dfa6bb870f652775e
2019-01-03 14:34:26 +01:00
133a5dc13e
Merge remote-tracking branch 'origin/develop' into pandora_enterprise#2987
...
Conflicts:
pandora_console/include/functions_events.php
Former-commit-id: 2c85907168c27c3707955668209ae5df2af4f4a7
2019-01-03 13:10:10 +01:00
c5501e2b0a
safe_input to custom field data received (dataserver)
...
Former-commit-id: 4f38e951d02d7e3645b632cd0e48b52647565966
2019-01-03 11:18:26 +01:00
d114a77151
Auto-updated build strings.
...
Former-commit-id: c0c7f09435de019d1dc0057f48f4e5fd964fb3da
2019-01-03 00:01:25 +01:00
17b2ff2819
Merge branch '3254-error_al_pasar_pandoradb_migrate_6_to_7' into 'develop'
...
fixed error migratesql
See merge request artica/pandorafms!2095
Former-commit-id: 672aed5f3493d7981398af0062a76c9255c0a87a
2019-01-02 11:50:32 +01:00
5c16c08d59
Auto-updated build strings.
...
Former-commit-id: 1ce399660dc1fddf4ac163fdd4b7657cef8b6594
2019-01-02 00:01:25 +01:00
ff9f6549d4
Auto-updated build strings.
...
Former-commit-id: 9cd8d22d6cab6e4edaad7c4b184ec4bb4995b54f
2019-01-01 00:01:24 +01:00
60ae0c8b78
Merge branch 'ent-3335-build_vars-fecha-mal' into 'develop'
...
changed %g to %y in date commands
See merge request artica/pandorafms!2108
Former-commit-id: 3f964c5800313ccb13367273a97af7f853692bac
2018-12-31 11:51:54 +01:00
c3daf1f995
changed %g to %y in date commands
...
Former-commit-id: 8e0c9a44ff79b049a4c9039537bbc3c23f2decfc
2018-12-31 11:44:06 +01:00
5139308723
Auto-updated build strings.
...
Former-commit-id: c78a0fd88b9100d3865413eb017d4dc0d8816b4c
2018-12-31 11:24:46 +01:00
4356a8ce8e
Auto-updated build strings.
...
Former-commit-id: 2971785cc199543f9d8e0e7fed646ec7aabd29d9
2018-12-31 00:01:23 +01:00
5e8b4b4500
Auto-updated build strings.
...
Former-commit-id: f8005483f902558687e92a128c3c138d1323b141
2018-12-30 00:01:22 +01:00
60617def24
Auto-updated build strings.
...
Former-commit-id: 5f0ff76fb4c03a0177dd9bb4b66609229cfec0b6
2018-12-29 00:01:35 +01:00
ed30441f86
fixed error migrate 6 to 7
...
Former-commit-id: 117cd6b7b16e0b8cf0c69f50e87665732e241690
2018-12-28 13:42:40 +01:00
0686982055
Fixed agents_get_group_agents while trying to get agent list from target group
...
Former-commit-id: 8a005e1574760688f5823cc854a287774c8c828b
2018-12-28 13:09:37 +01:00
ac228a7fad
fixed error in massive operation
...
Former-commit-id: 691f3557d44c686645cfa634eab3630d060def33
2018-12-28 12:14:17 +01:00
2b3a7e8a9f
Merge branch '3325-Desaparicion_de_los_desplegables_en_module_component_al_crear_un_modulo' into 'develop'
...
fixed error module editor
See merge request artica/pandorafms!2103
Former-commit-id: db42869e06f097e8d0ae54c0be31065029613107
2018-12-28 12:06:56 +01:00
fc5d3170b5
fixed warn/err messages in module_manager_editor
...
Former-commit-id: d3a30dd591470a177709b60d82041b8c21f4cce1
2018-12-28 11:57:16 +01:00
17e773adcb
Merge remote-tracking branch 'origin/develop' into 3325-Desaparicion_de_los_desplegables_en_module_component_al_crear_un_modulo
...
Former-commit-id: 9d128ea51bb2bf42c6d97c4f6b8378457028dae9
2018-12-28 11:54:12 +01:00
2260e8d82a
Merge branch 'ent-3326-7195-no-se-pueden-eliminar-elementos-de-modulo-sintetico-aritmetico' into 'develop'
...
minor fix in control messages format and processing
See merge request artica/pandorafms!2105
Former-commit-id: cc9453bfcf71cf47c8571ba338c84a5f87f0e70b
2018-12-28 11:48:56 +01:00
fcfd68f102
Auto-updated build strings.
...
Former-commit-id: 9885d1113e1e998bdb8c1d93d636c33f3dcc43c1
2018-12-28 00:01:26 +01:00
c6b9122cfc
minor fix in control messages format and processing
...
Former-commit-id: bda61b3e6d6ef74090c215f9aa9d2f3db42456bd
2018-12-27 19:16:56 +01:00
fef1b55b5b
Merge branch '3327-No_se_ve_las_piegrafica_de_los_agentes' into 'develop'
...
fixed minor error pie chart
See merge request artica/pandorafms!2104
Former-commit-id: ba77d41b0b54f462fcc3653694d352141aff00e1
2018-12-27 13:43:43 +01:00
6d8b73f72e
fix minor error module editor network
...
Former-commit-id: c0f2c03b441f939b842303186ecdf2ace5c253b6
2018-12-27 12:40:47 +01:00
a789b3350e
fixed minor error pie chart
...
Former-commit-id: e335f96e7538f939c2fd20137c19c354125f0edb
2018-12-27 10:35:31 +01:00
c0869b3c9e
fixed error module editor
...
Former-commit-id: cf2c9325c84448222743830759bb4e2716745f75
2018-12-27 10:29:12 +01:00
danielmaya
Alejandro Campos
artica
fermin831
Tatiana Llorente
Samuel Carcases
fbsanchez
samucarc
Kike
daniel