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

11946 Commits

Author SHA1 Message Date
Tatiana Llorente 9d3426c0e9 Ent 4897 filtro erroneo de eventos al clickar en grafica events 24h de agente 2 2019-12-10 15:29:35 +01:00
Daniel Rodriguez f9c4a826d5 Merge branch 'ent-4982-Tree-View-Module-groups' into 'develop' 
Added Group by in tree view

See merge request artica/pandorafms!2903
 2019-12-10 13:46:27 +01:00
Luis 6ba4a26564 Added timeoout option to command event responses 2019-12-10 11:54:30 +01:00
vgilc 325eff607e Merge branch 'ent-3903-Dashboard-mostrar-leyenda-en-mapa-de-servicio' into 'develop' 
changes in service map widget: always show legend and fix visual problem

See merge request artica/pandorafms!2889
 2019-12-10 11:53:37 +01:00
vgilc aadb2ea783 Merge branch 'ent-4427-Funcion-API-validate_event_by_id' into 'develop' 
Ent 4427 funcion api validate event by

See merge request artica/pandorafms!2639
 2019-12-10 11:51:37 +01:00
vgilc 8d0b86c420 Merge branch 'ent-4481-entities-en-graficas-personalizadas-bullet-chart' into 'develop' 
remove entities custom graph bullet chart

See merge request artica/pandorafms!2640
 2019-12-10 11:50:57 +01:00
vgilc 418cf73c87 Merge branch 'ent-4506-item-de-consola-visual-tipo-line-imborrable-y-problemas-al-colocarlo' into 'develop' 
Fixed bug in visual console line item

See merge request artica/pandorafms!2885
 2019-12-10 11:49:42 +01:00
vgilc e9de1df431 Merge branch 'ent-4713-Revisar-funcion-groups-get-id-recursive' into 'develop' 
fix minor bug in function groups_get_id_recursive

See merge request artica/pandorafms!2842
 2019-12-10 11:47:13 +01:00
vgilc 7db5f8b9b1 Merge branch 'ent-4887-service-tree-view-no-carga' into 'develop' 
Solved issue with query

See merge request artica/pandorafms!2858
 2019-12-10 11:46:17 +01:00
vgilc f55a5c484e Merge branch 'ent-4961-Ventana-filtro-de-eventos-muy-pequeña-si-el-nombre-de-filtro-es-muy-grande' into 'develop' 
Ent 4961 ventana filtro de eventos muy pequeña si el nombre de filtro es muy grande

See merge request artica/pandorafms!2880
 2019-12-10 11:35:41 +01:00
vgilc f1e648404c Merge branch 'ent-4999-9146-Ventanas-info-agentes-en-gis-no-funcionan-bien' into 'develop' 
fix bug when selecting and unselecting feature in gis maps

See merge request artica/pandorafms!2905
 2019-12-10 11:32:56 +01:00
vgilc 1b2d4e233a Merge branch 'ent-5006-Bug-al-eliminar-un-nodo-de-un-mapa-de-red-y-mover-otro-elemento' into 'develop' 
Ent 5006 bug al eliminar un nodo de un mapa de red y mover otro elemento

See merge request artica/pandorafms!2907
 2019-12-10 11:30:28 +01:00
Luis 2b03b00223 Fixed agent event graph bar and link to event list 2019-12-10 11:28:56 +01:00
artica 7a858fbc25 Auto-updated build strings. 2019-12-10 00:01:07 +01:00
artica 180d5842ee Auto-updated build strings. 2019-12-09 00:01:08 +01:00
artica 8128f2605a Auto-updated build strings. 2019-12-08 00:01:07 +01:00
artica 8f31fc21f1 Auto-updated build strings. 2019-12-07 00:01:07 +01:00
artica f477014a1b Auto-updated build strings. 2019-12-06 00:01:10 +01:00
artica 0263060639 Auto-updated build strings. 2019-12-05 00:01:09 +01:00
marcos be3dcccc4d out entities 2019-12-04 17:45:58 +01:00
marcos d6090771ef Merge remote-tracking branch 'origin/develop' into ent-4481-entities-en-graficas-personalizadas-bullet-chart 2019-12-04 17:32:38 +01:00
artica 0ba2d86971 Auto-updated build strings. 2019-12-04 00:01:08 +01:00
artica 60aaf4363e Auto-updated build strings. 2019-12-03 00:01:07 +01:00
artica 80d5eea467 Auto-updated build strings. 2019-12-02 00:01:08 +01:00
artica 882198798a Auto-updated build strings. 2019-12-01 00:01:06 +01:00
artica a6f881c6fa Auto-updated build strings. 2019-11-30 00:01:08 +01:00
artica 14999b7b84 Auto-updated build strings. 2019-11-29 00:01:08 +01:00
artica ec6d317bd4 Auto-updated build strings. 2019-11-28 00:01:09 +01:00
Daniel Barbero Martin e6afe84940 Fixed pdf 2019-11-27 15:22:39 +01:00
Luis b0d5b7223e Added report template regex to MR 2019-11-27 13:21:05 +01:00
Daniel Barbero Martin ea2c5bc8c9 Fixed translate 2019-11-27 11:49:20 +01:00
Alejandro Fraguas ed0ad76e61 Merge branch 'ent-3837-7848-campo-id_source_event-en-vista-de-eventos-y-poder-filtrar-por-este' into 'develop' 
Add new search for id source event in metaconsole

See merge request artica/pandorafms!2438
 2019-11-27 10:14:35 +01:00
artica d2fdc0cf9d Auto-updated build strings. 2019-11-27 00:01:08 +01:00
fbsanchez c985f2d5f9 Merge remote-tracking branch 'origin/ent-4610-Alertas-de-logs' into ent-EDF 
Conflicts:
	pandora_console/extras/mr/33.sql
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
 2019-11-26 10:50:51 +01:00
artica b3fa4b7b7d Auto-updated build strings. 2019-11-26 00:01:08 +01:00
Daniel Barbero 867f0cfbe9 WIP Rules alert correlation 2019-11-25 20:06:42 +01:00
fbsanchez 1b57b279fb minor changes 2019-11-25 13:03:55 +01:00
fbsanchez a854809247 Merge remote-tracking branch 'origin/develop' into ent-4610-Alertas-de-logs 2019-11-25 09:39:25 +01:00
Daniel Barbero f24034e729 Add styles Rules 2019-11-25 09:09:59 +01:00
artica 1592773b46 Auto-updated build strings. 2019-11-25 00:01:07 +01:00
artica 44311c0438 Auto-updated build strings. 2019-11-24 00:01:07 +01:00
fbsanchez ae5d7b8944 minor style fix rulebuilder 2019-11-23 13:20:19 +01:00
fbsanchez 9bfe3f3152 minor style fix rulebuilder 2019-11-23 13:16:30 +01:00
fbsanchez d3b5e7a2b0 minor style fix rulebuilder 2019-11-23 13:13:24 +01:00
fbsanchez 2f0b2c1766 minor fix css 2019-11-23 13:06:58 +01:00
fbsanchez 64e481187f RuleBuilder Style updates 2019-11-23 12:48:47 +01:00
artica 09e6615611 Auto-updated build strings. 2019-11-23 00:01:09 +01:00
fbsanchez 4e2bd7ed55 minor fixes 2019-11-22 20:49:46 +01:00
fbsanchez 5423e78d62 Merge remote-tracking branch 'origin/develop' into ent-4610-Alertas-de-logs 
Conflicts:
	pandora_console/extras/mr/33.sql
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
	pandora_console/godmode/agentes/configurar_agente.php
	pandora_console/godmode/wizards/Wizard.main.php
	pandora_console/include/functions_agents.php
	pandora_console/include/styles/alert.css
	pandora_console/pandoradb.sql
	pandora_server/lib/PandoraFMS/Recon/Base.pm
 2019-11-22 15:49:07 +01:00
fbsanchez 8001ba0d41 minor fix 2019-11-22 15:37:32 +01:00