tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
29,324 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

15673 Commits

Author SHA1 Message Date
Daniel Barbero Martin 5eb719ecaa Merge remote-tracking branch 'origin/develop' into ent-3943-Plantillas-de-alerta-con-varios-horarios 2022-02-01 07:59:52 +01:00
artica 9e12abcfc6 Auto-updated build strings. 2022-02-01 01:00:17 +01:00
Daniel Barbero Martin 15ada66942 alert template schedule pandora_enterprise#3943 2022-01-31 16:50:48 +01:00
Daniel Barbero Martin c02abbc508 alert template schedule pandora_enterprise#3943 2022-01-31 13:45:44 +01:00
Daniel Barbero Martin 9ad6b8abaa Merge remote-tracking branch 'origin/develop' into ent-3943-Plantillas-de-alerta-con-varios-horarios 2022-01-31 08:05:42 +01:00
artica 73b754f52d Auto-updated build strings. 2022-01-31 01:00:10 +01:00
artica 8001f6b1f2 Auto-updated build strings. 2022-01-30 01:00:15 +01:00
artica 6ffef13b9a Auto-updated build strings. 2022-01-29 01:00:20 +01:00
Daniel Barbero Martin 392a9223e8 alert template schedule pandora_enterprise#3943 2022-01-28 14:06:31 +01:00
Daniel Barbero Martin 2e5f778703 Merge remote-tracking branch 'origin/develop' into ent-3943-Plantillas-de-alerta-con-varios-horarios 2022-01-28 07:58:58 +01:00
artica b23f101812 Auto-updated build strings. 2022-01-28 01:00:20 +01:00
Daniel Barbero Martin a4f092f0a0 alert template schedule pandora_enterprise#3943 2022-01-27 17:02:24 +01:00
Daniel Barbero Martin b8a3dccc8d Merge remote-tracking branch 'origin/develop' into ent-3943-Plantillas-de-alerta-con-varios-horarios 2022-01-27 08:09:14 +01:00
artica 4da16bedf8 Auto-updated build strings. 2022-01-27 01:00:23 +01:00
Daniel Barbero Martin 89931ef564 alert template schedule #3943 2022-01-26 16:52:48 +01:00
Daniel Barbero Martin 74f73e2004 Merge remote-tracking branch 'origin/develop' into ent-3943-Plantillas-de-alerta-con-varios-horarios 
Conflicts:
	pandora_console/include/styles/pandora.css
 2022-01-26 08:10:40 +01:00
Daniel Barbero Martin 1a6127624e alert template schedule 2022-01-26 08:07:00 +01:00
artica 11e0c99e74 Auto-updated build strings. 2022-01-26 01:00:23 +01:00
vgilc a32fe84ca0 Merge branch 'ent-8454-Error-SQL-en-bulk-operations-en-copia-de-modulos' into 'develop' 
fixed bulk copy of modules with percent character

See merge request artica/pandorafms!4639
 2022-01-25 10:41:43 +00:00
vgilc 6edc6c6d40 Merge branch 'ent-8437-SQL-Injection-en-API' into 'develop' 
sanitize sql inputs

See merge request artica/pandorafms!4629
 2022-01-25 10:30:01 +00:00
vgilc f2d0ecc304 Merge branch 'ent-7485-12717-incluir-botones-de-generacion-de-informe-en-vista-html' into 'develop' 
Added combo with all export formats to report html view

See merge request artica/pandorafms!4638
 2022-01-25 10:29:00 +00:00
vgilc 4b85e93490 Merge branch 'ent-8222-Nueva-grafica-desde-la-vista-de-modulos-Histograma' into 'develop' 
Ent 8222 nueva grafica desde la vista de modulos histograma

See merge request artica/pandorafms!4637
 2022-01-25 10:28:18 +00:00
vgilc b547278930 Merge branch 'ent-7988-no-se-puede-cambiar-la-skin-de-pandora-en-entorno-meta-nodo-sincronizados' into 'develop' 
Ent 7988 no se puede cambiar la skin de pandora en entorno meta nodo sincronizados

See merge request artica/pandorafms!4633
 2022-01-25 10:27:25 +00:00
vgilc 6c2ada3948 Merge branch 'ent-8202-consolas-visuales-hbars' into 'develop' 
Clean magic number and define dynamic width

Closes pandora_enterprise#8202

See merge request artica/pandorafms!4630
 2022-01-25 10:26:14 +00:00
vgilc fa0e3c4abb Merge branch 'ent-8208-bug-filtros-en-vista-de-alertas' into 'develop' 
Fix monitoring alert detail filter for defautl actions

See merge request artica/pandorafms!4558
 2022-01-25 10:24:42 +00:00
vgilc ea122aae3e Merge branch 'ent-8387-Bug-visual-al-intentar-linkar-a-un-agente-sin-permisos' into 'develop' 
Ent 8387 bug visual al intentar linkar a un agente sin permisos

See merge request artica/pandorafms!4632
 2022-01-25 10:22:42 +00:00
Daniel Barbero Martin 2519335637 Merge remote-tracking branch 'origin/develop' into ent-3943-Plantillas-de-alerta-con-varios-horarios 
Conflicts:
	pandora_console/include/styles/pandora.css
 2022-01-25 10:40:37 +01:00
vgilc 6749090cc6 Merge branch 'ent-8409-bug-widget-agent-module-view' into 'develop' 
Fix issue with modules

Closes pandora_enterprise#8409

See merge request artica/pandorafms!4616
 2022-01-25 09:28:12 +00:00
vgilc 26ef59d3b6 Merge branch 'ent-8426-Bug-al-editar-relación-en-mapa-de-red' into 'develop' 
Ent 8426 bug al editar relación en mapa de red

See merge request artica/pandorafms!4636
 2022-01-25 09:26:53 +00:00
vgilc d43b046253 Merge branch 'ent-8433-12934-Bug-en-filtro-de-eventos-con-mas-de-1-tag' into 'develop' 
fixed event view filter

See merge request artica/pandorafms!4635
 2022-01-25 09:25:47 +00:00
vgilc bf5e2096f8 Merge branch 'ent-8453-12981-Cálculo-de-SLA-en-módulo-con-dato-tipo-string' into 'develop' 
Ent 8453 12981 cálculo de sla en módulo con dato tipo string

See merge request artica/pandorafms!4642
 2022-01-25 09:22:19 +00:00
artica bdae223944 Auto-updated build strings. 2022-01-25 01:00:20 +01:00
artica cc7b87344b Auto-updated build strings. 2022-01-24 01:00:16 +01:00
artica 0ca0123a27 Auto-updated build strings. 2022-01-23 01:00:17 +01:00
artica 4781c7f680 Auto-updated build strings. 2022-01-22 01:00:22 +01:00
artica 480d475a75 Auto-updated build strings. 2022-01-21 01:00:20 +01:00
artica 42d1ccbc13 Auto-updated build strings. 2022-01-20 01:00:18 +01:00
Daniel Barbero Martin 6be6b1a95d add new macros #3763 2022-01-19 12:18:23 +01:00
Daniel Maya b01061fea1 Fixed module type 2022-01-19 11:48:20 +01:00
Daniel Barbero Martin a86ddc043f Merge remote-tracking branch 'origin/develop' into ent-8222-Nueva-grafica-desde-la-vista-de-modulos-Histograma 2022-01-19 09:56:50 +01:00
artica a8150e3cb5 Auto-updated build strings. 2022-01-19 01:00:19 +01:00
alejandro.campos@artica.es 5d59e1da3f fixed bulk copy of modules with percent character 2022-01-18 15:03:44 +01:00
Calvo c16499720e Added combo with all export formats to report html view 2022-01-18 14:54:10 +01:00
Daniel Barbero Martin a0a74cf7bb add new chart histogram 2022-01-18 13:01:49 +01:00
Daniel Maya b2fe6780ac Fixed links in networkmaps 2022-01-18 11:39:37 +01:00
Daniel Barbero Martin 4f46da6633 Merge remote-tracking branch 'origin/develop' into ent-8222-Nueva-grafica-desde-la-vista-de-modulos-Histograma 
Conflicts:
	pandora_console/include/styles/pandora.css
 2022-01-18 10:17:19 +01:00
alejandro.campos@artica.es a751fd7077 fixed event view filter 2022-01-18 09:07:49 +01:00
artica 49bf10f0f8 Auto-updated build strings. 2022-01-18 01:00:39 +01:00
Daniel Maya e8d3d93f7f Fixed pandora_black in metaconsole 2022-01-17 10:22:30 +01:00
artica 98660cd0e3 Auto-updated build strings. 2022-01-17 01:00:26 +01:00