5147 Commits

Author	SHA1	Message	Date
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
Tatiana Llorente	c652f758f4	Changed label agent version for agents with satellite os	2019-11-12 13:06:59 +01:00
fbsanchez	307eabc7b9	Merge remote-tracking branch 'origin/develop' into ent-EDF	2019-11-07 18:33:37 +01:00
Tatiana Llorente	90912e2636	Hide agent info when only GIS data is displayed and it is empty	2019-11-07 09:52:06 +01:00
fbsanchez	79d165b164	Merge remote-tracking branch 'origin/develop' into ent-EDF	2019-11-06 20:01:28 +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
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
Daniel Rodriguez	137571f2d1	Merge branch 'ent-4856-8969-Filtro-user-ack-evento-no-funciona-del-todo-bien' into 'develop' ... user ack filter in event list not displaying users with all group See merge request artica/pandorafms!2860	2019-11-06 14:45:09 +01:00
Daniel Rodriguez	d460429509	Merge branch 'ent-4898-No-funciona-filtro-de-eventos-cuando-el-idioma-del-usuario-está-en-catalán' into 'develop' ... Fixed agent name and error lenght See merge request artica/pandorafms!2845	2019-11-06 13:14:06 +01:00
alejandro-campos	e9b516c399	change access permission to users in user ack filter in event list	2019-11-06 12:56:42 +01:00
manuel	a486738920	Fixed visual styles ticket 4809	2019-11-06 10:31:26 +01:00
Daniel Rodriguez	0f2d30698c	Merge branch 'ent-4872-Cambiar-titulo-a-archivo-XML-de-los-templates-de-reports' into 'develop' ... Ent 4872 cambiar titulo a archivo xml de los templates de reports See merge request artica/pandorafms!2862	2019-11-05 17:03:53 +01:00
Daniel Rodriguez	0e628a365d	Merge branch 'ent-4625-Cambiar-titulo-a-archivo-CSV-de-la-vista-de-eventos' into 'develop' ... Ent 4625 cambiar titulo a archivo csv de la vista de eventos See merge request artica/pandorafms!2783	2019-11-05 16:57:23 +01:00
fbsanchez	58cbc3c738	Merge remote-tracking branch 'origin/develop' into ent-EDF ... Conflicts: pandora_console/extras/mr/33.sql pandora_console/pandoradb_data.sql	2019-11-05 15:17:09 +01:00
Tatiana Llorente	945383b8ec	Changed name of xml report	2019-11-05 12:43:08 +01:00
Tatiana Llorente	32f4ad2c4f	Changed name of variable filter in menu	2019-11-05 11:20:57 +01:00
alejandro-campos	9fc635a7a9	user ack filter in event list not displaying users with all group	2019-11-05 11:03:28 +01:00
Tatiana Llorente	e94d8726c7	Changed date in webchat	2019-11-04 13:59:30 +01:00
Daniel Maya	8573add0b3	Fixed agent name and error lenght	2019-10-30 13:01:59 +01:00
alejandro-campos	14230d218a	fix bug in snmp console filter	2019-10-29 16:14:33 +01:00
fbsanchez	ccf971c2eb	Merge remote-tracking branch 'origin/develop' into ent-4769-modulos-ssh-php-perl	2019-10-28 12:18:19 +01:00
Daniel Rodriguez	0cf3e01f74	Merge branch 'ent-1880-Umbrales-inversos-en-negativo' into 'develop' ... Ent 1880 umbrales inversos en negativo See merge request artica/pandorafms!2818	2019-10-22 12:56:21 +02:00
Daniel Rodriguez	13898da4c1	Merge branch 'ent-4733-no-funciona-buscador-general-de-politicas' into 'develop' ... fixed minor error See merge request artica/pandorafms!2777	2019-10-18 11:42:30 +02:00
Tatiana Llorente	adf3b08537	Add text (inv) in the help of the thresholds for inverse intervals - #1880	2019-10-17 11:50:50 +02:00
Tatiana Llorente	5264de2008	Merge branch 'develop' into 'ent-4720-Redireccion-erronea-de-Meta-a-Nodo-desde-Eventos' ... Conflicts: pandora_console/operation/events/events.php	2019-10-17 09:27:00 +02:00
Daniel Rodriguez	b6db2aa041	Merge branch 'ent-4684-migracion-de-mapas-open-y-enterprise-de-v6-a-v7' into 'develop' ... Fixed open and enterprise network map migration See merge request artica/pandorafms!2745	2019-10-16 19:03:24 +02:00
Alejandro Fraguas	ca5a31db6a	Merge branch 'ent-3830-autorrefresh-en-mapas-gis' into 'develop' ... add gis maps to autorefresh list See merge request artica/pandorafms!2731	2019-10-15 13:21:19 +02:00
Alejandro Fraguas	78610b127c	Merge branch 'ent-4682-Comentarios-en-eventos-no-se-ven-en-metaconsola' into 'develop' ... Ent 4682 comentarios en eventos no se ven en metaconsola See merge request artica/pandorafms!2775	2019-10-15 11:42:00 +02:00
Alejandro Fraguas	8407d7fe9a	Merge branch 'ent-3913-gis-data-refresh-bug' into 'develop' ... Added current gis location to agent gis view list See merge request artica/pandorafms!2772	2019-10-14 15:57:27 +02:00
Daniel Barbero	8af72c1c9d	add Remote CMD	2019-10-09 17:26:06 +02:00
Tatiana Llorente	d2dc6ba9c1	Merge remote-tracking branch 'origin/develop' into ent-4720-Redireccion-erronea-de-Meta-a-Nodo-desde-Eventos ... Conflicts: pandora_console/operation/events/events.php	2019-10-08 09:14:08 +02:00
Tatiana Llorente	8a85edac93	Merge remote-tracking branch 'origin/develop' into ent-4720-Redireccion-erronea-de-Meta-a-Nodo-desde-Eventos	2019-10-08 08:59:39 +02:00
Daniel Rodriguez	d198cc3297	Merge branch 'ent-4567-Habilitar-borrado-masivo-de-traps-con-permisos-AW' into 'develop' ... Changed permissions to delete traps to IM - #4567 See merge request artica/pandorafms!2690	2019-10-07 17:08:32 +02:00
Daniel Rodriguez	debbbdc4e5	Merge branch 'ent-4726-truncado-eventos-texto-muy-largo' into 'develop' ... Improved truncate system and solved issue See merge request artica/pandorafms!2774	2019-10-07 13:49:57 +02:00
Tatiana Llorente	305d74878c	Changed title of csv in events - #4625	2019-10-04 11:51:30 +02:00
Kike	b25c9ca793	Merge remote-tracking branch 'origin/develop' into 4689-mostrar-instrucciones-en-la-vista-de-eventos ... Conflicts: pandora_console/include/functions_events.php	2019-10-03 15:59:15 +02:00
marcos.alconada	6f14aa3d2a	Merge remote-tracking branch 'origin/develop' into ent-4583-hint-mal-construido-en-editar-usuario-home-screen	2019-10-03 14:17:23 +02:00
fbsanchez	e25d83b836	more comprehensible vc form display flow	2019-10-03 11:05:21 +02:00
fbsanchez	722ba58085	more comprehensible vc form display flow	2019-10-03 11:04:13 +02:00
fbsanchez	79dca2fe6b	Php OO form load	2019-10-02 18:37:50 +02:00
Kike	f34d30dd39	Fixed loop on network map migration process	2019-10-02 12:38:13 +02:00
Daniel Barbero Martin	c5022fc243	continue VC	2019-10-02 12:28:17 +02:00
marcos.alconada	d539b935bc	fixed minor error	2019-10-02 11:27:52 +02:00
marcos.alconada	a44e1feeb4	fixed error comments events	2019-10-01 16:24:02 +02:00
Jose Gonzalez	f55b2ce80f	Improved truncate system and solved issue	2019-10-01 11:22:25 +02:00
Luis Calvo	0aa73b1a60	Added current gis location to agent gis view list	2019-09-30 14:58:44 +02:00
Tatiana Llorente	9875b7c701	Added link to go to agent view (node) from metaconsole in events view - #4720	2019-09-30 13:31:15 +02:00
Daniel Barbero	d35a5d4f71	continue VC form create items	2019-09-27 15:44:39 +02:00
Daniel Barbero	cf0ad42e2a	Merge remote-tracking branch 'origin/develop' into new-vc-line-element	2019-09-27 08:20:29 +02:00
alejandro-campos	96622933fc	added new section in integria setup to configure different options for event responses and alert created tickets	2019-09-26 13:22:10 +02:00