5177 Commits

Author	SHA1	Message	Date
Tatiana Llorente	e0b69bbe3e	Ent 5101 9223 eliminacion de agentes en nodo no elimina agentes en politica de meta	2020-03-20 12:34:58 +01:00
fbsanchez	72b6e7f81a	Merge branch 'ent-5575-wizard-de-modulos-y-recon-by-steps' of brutus.artica.es:artica/pandorafms into ent-5575-wizard-de-modulos-y-recon-by-steps	2020-03-19 18:33:09 +01:00
fbsanchez	17eae7d97f	updates	2020-03-19 18:33:04 +01:00
Jose Gonzalez	7bf5764081	Added CSS changes. WIP: Backup upload	2020-03-19 18:24:52 +01:00
Jose Gonzalez	cca11f2341	WIP: Backup upload	2020-03-19 16:14:38 +01:00
tatiana	e939ac05a8	Delete groups in nodes when deleting in meta - #5138	2020-03-19 13:11:06 +01:00
fbsanchez	f58276ddbb	Templates	2020-03-18 19:31:58 +01:00
Tatiana Llorente	8c86019037	Ent 5583 bug comando de alerta	2020-03-18 12:25:29 +01:00
fbsanchez	b860c49383	target selections	2020-03-17 18:34:30 +01:00
Jose Gonzalez	c1337a4318	WIP: Backup upload	2020-03-17 18:27:56 +01:00
Jose Gonzalez	40958ae69d	WIP: Backup upload	2020-03-17 16:24:17 +01:00
Jose Gonzalez	142823eef6	WIP: Backup upload	2020-03-17 13:46:10 +01:00
fbsanchez	3a4deddc4b	Merge branch 'ent-5575-wizard-de-modulos-y-recon-by-steps' of brutus.artica.es:artica/pandorafms into ent-5575-wizard-de-modulos-y-recon-by-steps	2020-03-16 23:52:34 +01:00
fbsanchez	f3da919abc	WIP multiple changes	2020-03-16 23:52:20 +01:00
Jose Gonzalez	106f8bd1cf	Created new files with Module Blocks and changed Menu entries	2020-03-16 20:48:38 +01:00
Daniel Rodriguez	e1e76595a5	Merge branch 'ent-5365-Pestana-de-acciones-de-alertas-sin-paginacion' into 'develop' ... Ent 5365 pestana de acciones de alertas sin paginacion See merge request artica/pandorafms!3087	2020-03-16 17:19:32 +01:00
Tatiana Llorente	c7bb4f5a95	Ent 5548 usabilidad en el editor de modulos	2020-03-16 16:35:01 +01:00
Daniel Maya	fc88d265d4	Added group filter in alert list	2020-03-16 15:42:10 +01:00
fbsanchez	ce11d89953	Frontent changes	2020-03-13 14:03:50 +01:00
Daniel Maya	a7fdd4cc20	change in metaconsole advanced setup	2020-03-11 16:21:25 +01:00
fbsanchez	f0a71e01de	minor fixes	2020-03-11 13:35:31 +01:00
Luis	6721e4f5ab	Ent 5446 bug creating netflow filter	2020-03-11 11:32:21 +01:00
fbsanchez	9211396134	Merge remote-tracking branch 'origin/develop' into ent-4176-8084-8169-actualizacion-selenium-firefox-wux	2020-03-10 15:40:16 +01:00
Daniel Rodriguez	97f3902cf4	Merge branch 'ent-5431-Filtro-de-usuarios' into 'develop' ... fix bad parameter in function call See merge request artica/pandorafms!3068	2020-03-10 12:11:29 +01:00
fbsanchez	fd23ed30c5	Merge remote-tracking branch 'origin/develop' into ent-4176-8084-8169-actualizacion-selenium-firefox-wux	2020-03-04 11:37:35 +01:00
Tatiana Llorente	d799ac0739	Added pagination and filter box in alert actions - #5365	2020-03-02 16:17:45 +01:00
Tatiana Llorente	c8e492b194	Moved creation button to right side in visual maps - #5404	2020-03-02 11:41:54 +01:00
Tatiana Llorente	13466536bd	Show correct counter of deleted alerts - #5509	2020-03-02 11:23:20 +01:00
fbsanchez	b125f7618e	browser option in wux modules	2020-02-27 18:41:28 +01:00
Luis	82fe47cfd9	Ent 5312 snmp browser enchancements	2020-02-27 16:31:09 +01:00
Tatiana Llorente	ec57540fb0	Ent 5432 libreria de modulos de pandora integrada en consola	2020-02-27 11:20:24 +01:00
Daniel Rodriguez	43ca1bdc5d	Merge branch 'ent-5336-SNMP-Interface-Wizard' into 'develop' ... Fixed when you select 'show all modules' and the module is not from the interface See merge request artica/pandorafms!3056	2020-02-24 14:30:49 +01:00
alejandro-campos	4bdea42c63	fix bad parameter in function call	2020-02-24 13:16:22 +01:00
Daniel Barbero Martin	6ccc606c74	Merge remote-tracking branch 'origin/develop' into ent-5408-consola-visual-nueva-bugs	2020-02-20 08:06:59 +01:00
Daniel Rodriguez	ab568bdb52	Merge branch 'ent-5488-Mala-redireccion-en-wizard-de-wmi-que-inhabilita-la-funcionalidad' into 'develop' ... fix bug in form action See merge request artica/pandorafms!3065	2020-02-19 11:30:34 +01:00
marcos	e265bc2970	Merge remote-tracking branch 'origin/develop' into ent-4705-encriptado-de-nuevos-tokens	2020-02-19 09:31:31 +01:00
Alejandro Fraguas	1acfaa9cdc	Merge branch 'ent-5429-Cambios-en-el-editor-de-modulos' into 'develop' ... Ent 5429 cambios en el editor de modulos See merge request artica/pandorafms!3052	2020-02-18 14:03:36 +01:00
alejandro-campos	65b3b1dc36	fix bug in form action	2020-02-18 13:47:47 +01:00
marcos	7564249207	Merge remote-tracking branch 'origin/develop' into ent-4705-encriptado-de-nuevos-tokens	2020-02-17 16:15:29 +01:00
Daniel Barbero Martin	10972a2364	Fix bug icon builder view not legacy mode	2020-02-13 08:45:25 +01:00
Daniel Rodriguez	5d436d214b	Merge branch 'ent-4740-revision-completa-de-informes-templates-en-nodo' into 'develop' ... Fixed bug in prediction report item 4740 See merge request artica/pandorafms!2872	2020-02-11 15:39:26 +01:00
Daniel Maya	e65de54f39	Fixed when you select 'show all modules' and the module is not from the interface	2020-02-10 15:46:04 +01:00
Alejandro Fraguas	0538bd5185	Merge branch 'ent-5227-Problema-encoding-aplicación-politicas' into 'develop' ... Ent 5227 problema encoding aplicación politicas See merge request artica/pandorafms!3055	2020-02-10 12:14:19 +01:00
Manuel Montes	4f14921e85	Fixed bug in reports	2020-02-10 11:40:33 +01:00
alejandro-campos	b658fddfc2	visual changes in module creation	2020-02-07 13:58:26 +01:00
Jose Gonzalez	5b08e71ec6	Solved issue with UTF8 chars in configuration_data field	2020-02-06 13:02:58 +01:00
Daniel Rodriguez	1cca736953	Merge branch 'ent-4788-Icono-GIS-en-Setup-desaparecido' into 'develop' ... Ent 4788 icono gis en setup desaparecido See merge request artica/pandorafms!2843	2020-02-05 12:35:50 +01:00
Daniel Rodriguez	8b60daa9ba	Merge branch 'ent-5362-9464-Fallo-en-vista-de-agente-con-modulos-generic_string' into 'develop' ... fix module string data with html special chars breaking html in page See merge request artica/pandorafms!3042	2020-02-04 10:10:07 +01:00
Daniel Rodriguez	32cb47fb71	Merge branch 'ent-5251-9432-No-se-pueden-crear-usuarios-con-password-policy-activado' into 'develop' ... Fixed password policy See merge request artica/pandorafms!3020	2020-02-03 16:06:43 +01:00
Alejandro Fraguas	6aae378b37	Merge branch 'ent-4533-descuadre-visual-usuarios-metaconsola' into 'develop' ... ajuste visual en tabla user management See merge request artica/pandorafms!2682	2020-02-03 13:55:42 +01:00
alejandro-campos	73f3dfac85	fix module string data with html special chars breaking html in page	2020-01-31 11:53:42 +01:00
marcos	d5016d4943	Merge remote-tracking branch 'origin/develop' into ent-4705-encriptado-de-nuevos-tokens	2020-01-28 10:08:01 +01:00
Daniel Barbero Martin	0dabab11cf	Merge remote-tracking branch 'origin/develop' into new-vc-line-element ... Conflicts: pandora_console/install.php	2020-01-27 16:19:32 +01:00
Daniel Rodriguez	28392b71ef	Merge branch 'ent-5066-9061-Crear-Failover-en-Informe-de-disponibilidad' into 'develop' ... availability failover See merge request artica/pandorafms!3015	2020-01-27 10:48:50 +01:00
Daniel Barbero Martin	aea073b4d5	Merge remote-tracking branch 'origin/develop' into new-vc-line-element	2020-01-24 11:41:35 +01:00
Daniel Barbero Martin	fe697a98ec	fixed errors VC	2020-01-23 19:54:47 +01:00
marcos	79a34ac756	Merge remote-tracking branch 'origin/develop' into ent-4705-encriptado-de-nuevos-tokens	2020-01-23 11:06:15 +01:00
vgilc	2447514c41	Merge branch 'ent-4259-el-id-del-agente-con-remote-config-se-corta-en-la-vista-de-manage-resolucion-portatil' into 'develop' ... Fix visual problems with agent details See merge request artica/pandorafms!2625	2020-01-23 10:11:35 +01:00
Daniel Barbero Martin	6c6403336f	Merge remote-tracking branch 'origin/develop' into new-vc-line-element	2020-01-23 08:14:24 +01:00
marcos	823fb30db7	Merge remote-tracking branch 'origin/develop' into ent-4705-encriptado-de-nuevos-tokens	2020-01-22 13:42:58 +01:00
vgilc	69d9051339	Merge branch 'ent-5172-metaconcola-informes-ajustes-para-agrupados' into 'develop' ... Fixed visual bug in grouped report item See merge request artica/pandorafms!2992	2020-01-22 12:20:05 +01:00
Daniel Maya	32b28bea0c	Added warning in update manager offline	2020-01-22 11:10:02 +01:00
Daniel Maya	428e0ffbd7	Fixed password policy	2020-01-21 17:31:21 +01:00
marcos	76ed257287	Merge remote-tracking branch 'origin/develop' into ent-4705-encriptado-de-nuevos-tokens	2020-01-21 15:23:26 +01:00
Daniel Barbero Martin	89e83e38e0	Merge remote-tracking branch 'origin/develop' into new-vc-line-element ... Conflicts: pandora_console/include/javascript/pandora.js	2020-01-21 08:28:00 +01:00
Alejandro Campos	e7769b8bf4	Merge branch 'develop' into 'ent-4967-9083-Valores-unidades-en-graficas-no-son-por-1024' ... # Conflicts: # pandora_console/extras/mr/35.sql	2020-01-20 12:00:42 +01:00
Daniel Barbero Martin	536af6f33a	Merge remote-tracking branch 'origin/develop' into new-vc-line-element	2020-01-19 11:37:18 +01:00
Daniel Rodriguez	96eebe4310	Merge branch 'ent-5135-No-funciona-la-exploracion-SNMP-remota' into 'develop' ... Added port option on server configuration to be used when connecting to execution server See merge request artica/pandorafms!3012	2020-01-17 14:40:58 +01:00
alejandro-campos	8778553cca	Merge branch 'ent-5135-No-funciona-la-exploracion-SNMP-remota' of https://brutus.artica.es:8081/artica/pandorafms into ent-5135-No-funciona-la-exploracion-SNMP-remota	2020-01-16 17:42:45 +01:00
alejandro-campos	fb7cb57f03	added check to disable satellite servers from exec servers available in snmp wizard in case it is not a satellite agent or has remote config	2020-01-16 17:42:31 +01:00
Daniel Barbero Martin	d5e21499c2	Merge remote-tracking branch 'origin/develop' into new-vc-line-element	2020-01-16 14:08:07 +01:00
Tatiana Llorente	0980c9a74a	Ent 5261 cambio de control de intervalo en alertas	2020-01-16 13:50:39 +01:00
Marcos Alconada	5268c23c7a	Merge branch 'develop' into 'ent-4705-encriptado-de-nuevos-tokens' ... # Conflicts: # pandora_console/include/functions_config.php	2020-01-16 09:23:42 +01:00
Daniel Barbero Martin	4a1801bc50	Merge remote-tracking branch 'origin/develop' into new-vc-line-element	2020-01-16 08:04:18 +01:00
Daniel Maya	c68f83f013	availability failover	2020-01-15 17:16:46 +01:00
Alejandro Campos	c389769602	Merge branch 'develop' into 'ent-5135-No-funciona-la-exploracion-SNMP-remota' ... # Conflicts: # pandora_console/extras/mr/35.sql	2020-01-15 17:12:32 +01:00
alejandro-campos	d9062def99	Merge branch 'ent-4967-9083-Valores-unidades-en-graficas-no-son-por-1024' of https://brutus.artica.es:8081/artica/pandorafms into ent-4967-9083-Valores-unidades-en-graficas-no-son-por-1024	2020-01-15 16:01:11 +01:00
alejandro-campos	3f26f2ef6f	fix bug when deleting custom units and changed default value for byte multiplier	2020-01-15 16:00:33 +01:00
alejandro-campos	8b6c1261a9	change order of form port input	2020-01-15 15:37:42 +01:00
alejandro-campos	5eb2953810	Added port option on server configuration to be used when connecting to execution server	2020-01-14 15:43:17 +01:00
Tatiana Llorente	95600412e1	Minor visual changes in alert list	2020-01-14 13:14:09 +01:00
Alejandro Campos	dcd2aae3c5	Merge branch 'develop' into 'ent-4967-9083-Valores-unidades-en-graficas-no-son-por-1024' ... # Conflicts: # pandora_console/extras/mr/35.sql	2020-01-14 10:28:55 +01:00
Daniel Barbero	ed53399c3c	Merge remote-tracking branch 'origin/develop' into new-vc-line-element	2020-01-14 09:34:31 +01:00
Daniel Maya	7204e7c0f2	Ent 4862 mas opciones en los filtros de severidad	2020-01-13 18:24:29 +01:00
Luis	db49db3711	report font not depending of custom report front enabled	2020-01-13 18:21:48 +01:00
Daniel Maya	49e03f5e44	Fixed XSS vulnerability	2020-01-13 11:29:18 +01:00
Daniel Barbero Martin	fe46a2a74e	Merge remote-tracking branch 'origin/develop' into new-vc-line-element	2020-01-13 08:07:20 +01:00
alejandro-campos	78df8dcb95	prevent user creation with leading or trailing spaces in user id	2020-01-10 13:50:04 +01:00
alejandro-campos	ec6a763aa2	add check to prevent user creation with an id with trailing spaces	2020-01-10 13:24:00 +01:00
Jose Gonzalez	4670ed922a	Added control for correct UTF8 encoding	2020-01-09 17:25:24 +01:00
Tatiana Llorente	665e9e4c98	Show gis icon only if enabled gis	2020-01-08 15:57:18 +01:00
Tatiana Llorente	f61ba42dd7	Resolve conflicts	2020-01-08 15:48:07 +01:00
Tatiana Llorente	7701ff7ad1	Resolve conflicts	2020-01-08 15:44:59 +01:00
Tatiana Llorente	eb222cc82f	Merge remote-tracking branch 'origin/develop' into ent-4788-Icono-GIS-en-Setup-desaparecido ... Conflicts: pandora_console/godmode/setup/setup.php	2020-01-08 15:41:45 +01:00
Daniel Barbero Martin	c4f0305f9b	Merge remote-tracking branch 'origin/develop' into new-vc-line-element	2020-01-08 08:29:59 +01:00
Alejandro Campos	0468c85a4d	Merge branch 'develop' into 'ent-4967-9083-Valores-unidades-en-graficas-no-son-por-1024' ... # Conflicts: # pandora_console/godmode/setup/setup_visuals.php	2020-01-07 12:00:27 +01:00
Daniel Rodriguez	eea9b0337c	Merge branch 'ent-5081-Fallo-estético-en-el-Update-manager-Offline' into 'develop' ... Ent 5081 fallo estético en el update manager offline See merge request artica/pandorafms!2977	2020-01-07 11:12:59 +01:00
alejandro-campos	7c952eaaa8	changes visual setup	2020-01-07 10:56:37 +01:00
vgilc	5f3889b5f6	Merge branch 'ent-4573-Cambio-en-el-switch-de-deshabilitar-agentes' into 'develop' ... Change label for disabled status - #4573 See merge request artica/pandorafms!2693	2020-01-07 10:48:11 +01:00
vgilc	22e0a4c818	Merge branch 'ent-4620-Campo-module-inservible-en-open' into 'develop' ... Ent 4620 campo module inservible en open See merge request artica/pandorafms!2721	2020-01-07 10:46:13 +01:00
Daniel Rodriguez	997d1e46e5	Merge branch 'ent-4996-no-funciona-el-select-multiple-de-agente-en-el-wizard-de-consolas-visuales' into 'develop' ... Added hint See merge request artica/pandorafms!2904	2020-01-07 09:26:11 +01:00
Tatiana Llorente	4cd1ca38a4	Ent 5091 unificacion de tamaño de letra en informes	2020-01-07 09:25:31 +01:00
Daniel Barbero Martin	5e008e684d	Merge remote-tracking branch 'origin/develop' into new-vc-line-element	2020-01-02 17:45:52 +01:00
Alejandro Fraguas	ec950b199e	Merge branch 'ent-4488-Añadir-confirmacion-al-borrado-de-consolas-visuales' into 'develop' ... Ent 4488 añadir confirmacion al borrado de consolas visuales See merge request artica/pandorafms!2859	2019-12-26 13:42:28 +01:00
manuel	3f09d13941	Fixed visual bug in grouped report item	2019-12-24 10:25:32 +01:00
Alejandro Fraguas	c91290f062	Merge branch 'ent-4955-Bug-nombre-y-descripcion-items-informes' into 'develop' ... Changed title name or description in items table of reports See merge request artica/pandorafms!2875	2019-12-23 17:13:39 +01:00
Alejandro Fraguas	7b97855dd7	Merge branch 'ent-3607-fallos-visuales-en-la-vista-de-plugin-de-la-metaconsola' into 'develop' ... Fixed file.png in plugin See merge request artica/pandorafms!2725	2019-12-23 17:10:56 +01:00
Alejandro Fraguas	7f61caaa15	Merge branch 'ent-5034-Bug-al-copiar-acción-de-alerta' into 'develop' ... Ent 5034 bug al copiar acción de alerta See merge request artica/pandorafms!2921	2019-12-23 10:51:10 +01:00
Alejandro Fraguas	fa34170e34	Merge branch 'ent-5117-problemas-con-el-inventory-en-meta' into 'develop' ... Fixed bug in inventory item See merge request artica/pandorafms!2975	2019-12-23 10:23:21 +01:00
Alejandro Fraguas	69159d158d	Merge branch 'ent-1786-Rango-de-tiempo-en-container-graphs' into 'develop' ... Ent 1786 rango de tiempo en container graphs See merge request artica/pandorafms!2931	2019-12-23 10:18:39 +01:00
Alejandro Fraguas	c5af1823e3	Merge branch 'ent-2023-Poder-editar-la-opcion-Safe-operation-mode-mediante-Bulk-operations' into 'develop' ... Ent 2023 poder editar la opcion safe operation mode mediante bulk operations See merge request artica/pandorafms!2918	2019-12-23 10:18:14 +01:00
Tatiana Llorente	4aa57143e7	Fixed visual bug in update manager offline	2019-12-19 09:42:54 +01:00
marcos	b551f1a13c	update	2019-12-18 17:48:29 +01:00
manuel	9e88c1c2c2	Fixed bug in inventory item	2019-12-18 17:00:14 +01:00
marcos	91fe85e90e	updates2	2019-12-18 15:15:25 +01:00
Daniel Barbero	49ab5e95aa	Merge remote-tracking branch 'origin/develop' into new-vc-line-element	2019-12-18 07:50:08 +01:00
marcos	168dfcf32d	minnor error	2019-12-17 15:23:01 +01:00
Tatiana Llorente	eca876212c	Ent 5095 visualizacion formato de fechas	2019-12-17 12:15:51 +01:00
Daniel Barbero	d77d50bb74	Merge remote-tracking branch 'origin/develop' into new-vc-line-element	2019-12-17 08:26:04 +01:00
Daniel Rodriguez	ad9879bc1e	Merge branch 'ent-5158-Informes-SQL-en-la-meta' into 'develop' ... Fixed item sql See merge request artica/pandorafms!2966	2019-12-16 18:23:17 +01:00
fbsanchez	ded6dcb41a	Merge remote-tracking branch 'origin/develop' into ent-5108-ws-cookie-parser	2019-12-16 16:44:02 +01:00
Daniel Maya	8bde504fc2	Fixed item sql	2019-12-16 15:50:21 +01:00
fbsanchez	abd2213e71	Menu entry for websocket engine settings	2019-12-16 15:42:54 +01:00
Daniel Rodriguez	24838cad0f	Merge branch 'ent-4233-Modificación-en-la-función-genérica-de-render-de-fecha-hora' into 'develop' ... Added compact mode to show timestamp - #4233 See merge request artica/pandorafms!2688	2019-12-16 11:48:09 +01:00
artica	b71752ea03	Merge remote-tracking branch 'remotes/origin/ent-5108-ws-cookie-parser' into develop	2019-12-16 11:23:06 +01:00
Tatiana Llorente	b38c396837	Change date in hover in compact mode	2019-12-13 13:40:19 +01:00
fbsanchez	a558152cb2	minor fix	2019-12-13 13:20:44 +01:00
fbsanchez	ad6ea431bf	minor fix, hide quickshell settings while disabled	2019-12-13 13:13:09 +01:00
fbsanchez	bd1954ce38	Setup Websocket engine, unified	2019-12-13 13:11:38 +01:00
Daniel Barbero	9e01cb097c	Merge remote-tracking branch 'origin/develop' into new-vc-line-element	2019-12-13 13:02:04 +01:00
Daniel Rodriguez	13ac0a6229	Merge branch 'ent-5082-setup-visual-styles-reports' into 'develop' ... Grouped report items on styles conf. Fixed font bug See merge request artica/pandorafms!2953	2019-12-13 11:51:56 +01:00
fbsanchez	3b5ebd0bf7	Better quickshell integration and fixes	2019-12-13 11:46:44 +01:00
Daniel Barbero	319b3e604f	Merge remote-tracking branch 'origin' into new-vc-line-element	2019-12-13 08:15:23 +01:00
Manuel Montes	a2162948b4	Fixed minor bugs in metaconsole reports	2019-12-12 18:12:42 +01:00
vgilc	0a7f24192e	Merge branch 'ent-5110-formulario-de-modulos-remotos-erroneo' into 'develop' ... Fixed bug in module creation view See merge request artica/pandorafms!2954	2019-12-12 17:07:35 +01:00
Daniel Rodriguez	3223e0a8e1	Merge branch 'ent-4865-8983-modulos-snmp-v3-politicas' into 'develop' ... Fixed snmp input See merge request artica/pandorafms!2914	2019-12-12 17:01:12 +01:00
Daniel Barbero	63dd3c48f8	Merge remote-tracking branch 'origin/develop' into new-vc-line-element ... Conflicts: pandora_console/include/javascript/pandora.js	2019-12-12 16:32:32 +01:00
manuel	2504a3dc09	Fixed bug in module creation view	2019-12-12 13:50:35 +01:00
Daniel Rodriguez	ab1c6e17ca	Merge branch 'ent-4508-desajustes-y-bug-en-open' into 'develop' ... fixed minnor error See merge request artica/pandorafms!2929	2019-12-12 11:03:22 +01:00
Manuel Montes	7ea61b7424	Added controls on report items	2019-12-12 09:11:15 +01:00
Luis Calvo	a364af3b2d	Grouped report items on styles conf. Fixed font bug	2019-12-11 18:32:49 +01:00
vgilc	0d16bc3188	Merge branch '4605-Bug-Wizard-SNMP' into 'develop' ... Modified type of module when use SNMP Agent Wizard See merge request artica/pandorafms!2947	2019-12-11 16:24:29 +01:00
daniel	3dbdfdb6eb	Fix Landscape reports	2019-12-11 15:07:38 +01:00
Jose Gonzalez	62de2fe396	Modified type of module when use SNMP Agent Wizard	2019-12-10 15:37:04 +01:00
vgilc	bc1109e0ae	Merge branch 'ent-5049-crear-accion-de-alerta-solo-deja-elegir-el-grupo-all' into 'develop' ... Fixed bugs in alert actions See merge request artica/pandorafms!2942	2019-12-10 15:32:51 +01:00
vgilc	1e0818786b	Merge branch 'ent-4652-ajustar-posicion-del-label-el-item-imagen-estatica-de-consolas-visuales' into 'develop' ... Adjusted margin on static image item See merge request artica/pandorafms!2895	2019-12-10 11:56:06 +01:00
Luis	6ba4a26564	Added timeoout option to command event responses	2019-12-10 11:54:30 +01:00
vgilc	7a616018a1	Merge branch 'ent-4619-fallos-css-advanced-options-agentes-open' into 'develop' ... fixed visual error See merge request artica/pandorafms!2758	2019-12-10 11:48:45 +01:00
alejandro-campos	5880bec88a	changes in module data formatting when printed across the application and new setup options	2019-12-05 17:41:44 +01:00
manuel	85f4301e4c	Fixed bugs in alert actions	2019-12-05 16:43:26 +01:00
vgilc	810fe8f860	Revert "Merge branch 'ent-4968-Comandos-de-alerta-con-saltos-de-linea' into 'develop'" ... This reverts merge request !2886	2019-12-03 15:59:08 +01:00
vgilc	809628560b	Merge branch 'ent-4968-Comandos-de-alerta-con-saltos-de-linea' into 'develop' ... Ent 4968 comandos de alerta con saltos de linea See merge request artica/pandorafms!2886	2019-12-03 15:53:23 +01:00
Tatiana Llorente	fecd2c74b5	Added button to refresh graph in container graphs	2019-12-03 13:00:59 +01:00
marcos	d7288114ad	fixed minnor error	2019-12-02 18:17:54 +01:00
Tatiana Llorente	0420a439d1	Send params to copy and delete action alert by post	2019-11-28 11:51:32 +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
Tatiana Llorente	d8e1786830	Added Save Operation Mode option in agents bulk operations	2019-11-26 16:44:53 +01:00
Daniel Maya	d89ec20c52	Fixed snmp input	2019-11-25 17:24:28 +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
marcos	21bf49c218	update id_source_event	2019-11-22 13:38:08 +01:00
daniel	960326b980	Add menu omnishell	2019-11-21 18:21:46 +01:00
manuel	e4ba7ccde0	Added hint	2019-11-21 12:06:00 +01:00
fbsanchez	624a1e0086	WIP alert correlation	2019-11-20 18:17:43 +01:00
Daniel Barbero Martin	1b5dcc3e28	Fixed errors in remote command	2019-11-19 12:35:52 +01:00
manuel	fe1e7da0ed	Adjusted margin on static image item	2019-11-18 17:36:16 +01:00
fbsanchez	61eb7f0635	Merge remote-tracking branch 'origin/ent-4226-mejoras-plugin-sap' into ent-EDF	2019-11-18 09:55:15 +01:00
marcos	91f28384b8	changed sap icon button	2019-11-15 16:22:30 +01:00
fbsanchez	8edbb74354	discovery help link and minor fixes	2019-11-14 21:52:02 +01:00
fbsanchez	f69b86663a	Merge remote-tracking branch 'origin/ent-4226-mejoras-plugin-sap' into ent-EDF ... Conflicts: pandora_console/extras/mr/33.sql pandora_console/godmode/wizards/Wizard.main.php	2019-11-14 21:40:35 +01:00
marcos	f348310675	ADD function to get SAP agents and sap view to sap agents	2019-11-14 19:01:23 +01:00
fbsanchez	0d3817d64d	dynamic toggle in wizard input printForm	2019-11-14 17:45:45 +01:00
Tatiana Llorente	9a17a02d61	Fixed bug with line breaks in alert commands	2019-11-14 12:29:02 +01:00
Alejandro Fraguas	0199c6312a	Merge branch 'ent-4752-Herramientas-de-diagnostico' into 'develop' ... refactoriced diagnostics pandoraFMS See merge request artica/pandorafms!2809	2019-11-14 11:49:23 +01:00
marcos	a8b6f40ca1	change sap view menu position	2019-11-14 10:51:00 +01:00
fbsanchez	83590146b1	Merge remote-tracking branch 'origin/develop' into ent-4774-welcome-to-pandorafms	2019-11-13 17:38:24 +01:00
fbsanchez	9b1a3a9cd1	Firts_task => first_task	2019-11-13 14:58:53 +01:00
Daniel Rodriguez	f844c660af	Merge branch 'ent-4766-feedback-de-ayudas' into 'develop' ... add feedback See merge request artica/pandorafms!2813	2019-11-13 13:43:08 +01:00
fbsanchez	875d4430a7	Merge remote-tracking branch 'origin/ent-EDF' into ent-4772-omnishell	2019-11-13 12:21:42 +01:00
fbsanchez	b11dbc639f	Merge remote-tracking branch 'origin/ent-4752-Herramientas-de-diagnostico' into ent-EDF ... Conflicts: pandora_console/general/header.php	2019-11-13 12:20:29 +01:00
Daniel Barbero Martin	7103317bc2	Merge remote-tracking branch 'origin/develop' into ent-4752-Herramientas-de-diagnostico ... Conflicts: pandora_console/general/header.php pandora_console/include/styles/pandora.css	2019-11-13 12:12:17 +01:00
marcos	fe45afa662	Merge remote-tracking branch 'origin/develop' into ent-4226-mejoras-plugin-sap	2019-11-13 12:01:36 +01:00
Daniel Rodriguez	d4c4b3c2d8	Merge branch 'ent-4664-Bug-Automatically-combined-graph' into 'develop' ... Ent 4664 bug automatically combined graph See merge request artica/pandorafms!2776	2019-11-13 10:01:19 +01:00
fbsanchez	d1fbd36a97	WIP omnishell	2019-11-12 19:31:38 +01:00
Daniel Rodriguez	073ca73b2a	Merge branch 'ent-4670-Cambiar-tamaño-fuente-en-informes' into 'develop' ... Added token in visual styles to change the font size in items of reports - #4670 See merge request artica/pandorafms!2798	2019-11-12 18:09:39 +01:00
fbsanchez	b9633933e1	Merge remote-tracking branch 'origin/develop' into ent-4774-welcome-to-pandorafms ... Conflicts: pandora_console/extras/mr/33.sql pandora_console/general/header.php	2019-11-12 14:17:45 +01:00
marcos	7b06ceaafc	add sap menu	2019-11-12 10:54:36 +01:00
fbsanchez	19d06dc061	Merge remote-tracking branch 'origin/ent-EDF' into ent-4226-mejoras-plugin-sap	2019-11-12 10:19:34 +01:00
Tatiana Llorente	5ea93011d3	Changed title name or description in items table of reports	2019-11-12 09:53:10 +01:00
fbsanchez	53954ec853	Merge branch 'ent-4774-welcome-to-pandorafms' into ent-EDF	2019-11-11 14:26:23 +01:00
fbsanchez	65f5223698	validation alerts	2019-11-11 14:26:04 +01:00
fbsanchez	0b610cd8ba	Merge branch 'ent-4774-welcome-to-pandorafms' into ent-EDF	2019-11-11 13:39:08 +01:00
fbsanchez	430af38fa6	minor fixes in flow control	2019-11-11 13:38:27 +01:00
manuel	ea83ee1292	Fixed bug in prediction report item 4740	2019-11-08 12:06:06 +01:00
fbsanchez	d9d8cbfd35	Merge remote-tracking branch 'origin/ent-EDF' into ent-4772-omnishell	2019-11-07 19:43:18 +01:00
Alejandro Fraguas	adc0f24f8e	Merge branch 'ent-3178-integrar-terminal-web-en-la-consola-de-pandora-y-explorar-otras-utilidades-anyterm-replace' into 'develop' ... Ent 3178 integrar terminal web en la consola de pandora y explorar otras utilidades anyterm replace See merge request artica/pandorafms!2825	2019-11-07 15:48:12 +01:00
fbsanchez	79d165b164	Merge remote-tracking branch 'origin/develop' into ent-EDF	2019-11-06 20:01:28 +01:00
Tatiana Llorente	90d567a064	Merge branch 'develop' into 'ent-4664-Bug-Automatically-combined-graph' ... Conflicts: pandora_console/godmode/reporting/graphs.php	2019-11-06 17:48:51 +01:00
Daniel Rodriguez	e81932cf0d	Merge branch 'ent-4809-Seleccion-de-tamaño-de-fuente-en-Agent-detail' into 'develop' ... Fixed visual styles ticket 4809 See merge request artica/pandorafms!2867	2019-11-06 16:23:51 +01:00
Daniel Rodriguez	0647b156a5	Merge branch 'ent-4904-8870-No-se-puede-ver-usuarios-sin-permisos-AR' into 'develop' ... fix bug in user list permission checks See merge request artica/pandorafms!2865	2019-11-06 16:06:49 +01:00
fbsanchez	98237a8d34	Merge remote-tracking branch 'origin/develop' into ent-EDF ... Conflicts: pandora_console/general/header.php	2019-11-06 15:36:53 +01:00