17447 Commits

Author	SHA1	Message	Date
alejandro-campos	4722d4a08b	changed setup option text	2019-09-10 11:38:02 +02:00
alejandro-campos	93b9c76f58	Merge branch 'develop' into ent-4047-Simplificacion-de-la-configuracion-del-sistema-de-email	2019-09-10 10:50:53 +02:00
alejandro-campos	c2e47e0ffa	Revert "ddded comment" ... This reverts commit 4ec832f523.	2019-09-10 10:06:33 +02:00
alejandro-campos	4ec832f523	ddded comment	2019-09-10 10:03:30 +02:00
artica	ae474a2731	Auto-updated build strings.	2019-09-06 00:01:10 +02:00
Daniel Rodriguez	d02f3621f3	Merge branch 'ent-3813-Autocompletado-de-campo-Proxy-auth-server-al-crear-webserver-module' into 'develop' ... Removed autofill proxi in auth server See merge request artica/pandorafms!2361	2019-09-05 18:29:43 +02:00
Daniel Rodriguez	64fc679d89	Merge branch 'ent-4599-no-se-muestran-items-vista-de-consola-visual-de-meta' into 'develop' ... Fixed some errors in visual console See merge request artica/pandorafms!2708	2019-09-05 15:27:41 +02:00
marcos.alconada	9e4b5ca5c8	Merge remote-tracking branch 'origin/develop' into ent-4457-bug-visual-style-font	2019-09-05 12:03:37 +02:00
marcos.alconada	c12d672109	Add visual condition for JA and CH Lenguage	2019-09-05 12:01:25 +02:00
Daniel Maya	86cf025317	Fixed some errors in visual console	2019-09-05 11:58:15 +02:00
Daniel Rodriguez	c0a0364164	Merge branch 'ent-4608-Bug-en-el-visor-de-eventos-cuando-el-lenguaje-esta-en-español' into 'develop' ... fix bug in events advanced filter: default option other than All See merge request artica/pandorafms!2706	2019-09-05 11:39:45 +02:00
alejandro-campos	42fad5acb1	fix bug in events advanced filter: default option other than All	2019-09-05 10:37:12 +02:00
artica	a4739e4891	Auto-updated build strings.	2019-09-05 00:01:07 +02:00
artica	61c75118f2	Auto-updated build strings.	2019-09-04 00:01:10 +02:00
Daniel Rodriguez	8493ec20eb	Merge branch 'ent-4580-8639-errores-al-generar-informes-dinamicos' into 'develop' ... Fixed date limit in historical_data See merge request artica/pandorafms!2695	2019-09-03 18:37:55 +02:00
Daniel Rodriguez	f126b8b2a2	Merge branch 'ent-4503-XML-bloquea-vista-101-de-consola' into 'develop' ... Escape the double quotes that may have the name of the module - #4503 See merge request artica/pandorafms!2680	2019-09-03 17:09:21 +02:00
Daniel Rodriguez	66f6267495	Merge branch 'ent-4575-Problema-permisos-en-vista-de-gráficas-dentro-de-un-agente' into 'develop' ... Change permissions to save custom graph in agent view - #4575 See merge request artica/pandorafms!2689	2019-09-03 17:08:48 +02:00
Daniel Rodriguez	a5fe2a913f	Merge branch 'ent-4478-no-carga-valores-actuales-al-editar-accion-alerta' into 'develop' ... Fixed alert actions bug See merge request artica/pandorafms!2636	2019-09-03 17:08:17 +02:00
Daniel Rodriguez	2f0a19ae6e	Merge branch 'ent-4446-Bug-Creacion-filtro-SNMP' into 'develop' ... Fixed bug create snmp filter - #4446 See merge request artica/pandorafms!2638	2019-09-03 17:07:27 +02:00
Daniel Rodriguez	b3b0f082d7	Merge branch 'ent-4484-Acceso-update-manager-offline-en-open' into 'develop' ... Don't allow access to update manager offline in community edition - #4484 See merge request artica/pandorafms!2648	2019-09-03 13:37:02 +02:00
Daniel Rodriguez	81511d1ac4	Merge branch 'ent-4422-campos-vacios-al-crear-modulos-wb' into 'develop' ... Fixed empty http_auth_user and pass See merge request artica/pandorafms!2656	2019-09-03 12:09:04 +02:00
artica	fa39119264	Auto-updated build strings.	2019-09-03 00:01:12 +02:00
Daniel Rodriguez	20cc562911	Merge branch 'ent-3895-Pete-permisos-al-intentar-borrar-un-report-sin-seleccionar-ninguno-en-los-checkboxs' into 'develop' ... Fixed bug in report deletions See merge request artica/pandorafms!2362	2019-09-02 13:18:20 +02:00
Daniel Maya	6c51c4e1e9	Fixed date limit in historical_data	2019-09-02 11:18:04 +02:00
artica	d6b91e9fce	Auto-updated build strings.	2019-09-02 00:01:15 +02:00
artica	aea8a6b3c7	Auto-updated build strings.	2019-09-01 00:01:07 +02:00
artica	fe7ec38cef	Auto-updated build strings.	2019-08-31 00:01:12 +02:00
Daniel Rodriguez	c47b24d84c	Merge branch 'ent-4278-Bug-ACL-al-cargar-o-gestionar-filtros-de-eventos' into 'develop' ... Fixed bug permissions on filter events- 4278 See merge request artica/pandorafms!2671	2019-08-30 16:07:45 +02:00
Daniel Rodriguez	aa383e3f56	Merge branch 'ent-4513-bugs-en-password-policy' into 'develop' ... fixed visual error See merge request artica/pandorafms!2678	2019-08-30 14:35:57 +02:00
Daniel Rodriguez	c46686981e	Merge branch 'ent-4547-Entities-extrañas-en-el-CSV-del-Review-Logs' into 'develop' ... modified function to export audit csv to decode entities as separator See merge request artica/pandorafms!2692	2019-08-30 14:29:44 +02:00
Daniel Rodriguez	e322e58dbb	Merge branch 'ent-4371-noticias-modales-no-funcionan' into 'develop' ... Fixed error with news modal windows See merge request artica/pandorafms!2655	2019-08-30 14:25:43 +02:00
Daniel Rodriguez	71a6394967	Merge branch 'ent-4357-fallo-visual-en-el-menu-topology-maps' into 'develop' ... add space in networkp map See merge request artica/pandorafms!2661	2019-08-30 14:22:39 +02:00
Daniel Rodriguez	258a2f41ce	Merge branch 'ent-4363-Marquesinas-ilegibles-desde-Firefox' into 'develop' ... Reduced the speed of events marquee - #4363 See merge request artica/pandorafms!2653	2019-08-30 14:19:47 +02:00
Daniel Rodriguez	191161dbfc	Merge branch '4474-Paginacion-SNMP-se-pierde-al-actualizar-Intracom' into 'develop' ... Fixed pagination bug See merge request artica/pandorafms!2637	2019-08-30 14:13:29 +02:00
Daniel Rodriguez	ab5ad9a459	Merge branch 'ent-4519-iconos-no-alineados-en-reporting-builder' into 'develop' ... fixed error See merge request artica/pandorafms!2665	2019-08-30 14:12:42 +02:00
Daniel Rodriguez	85b7ee034f	Merge branch 'ent-4524-Campo-Command-en-respuestas-de-eventos' into 'develop' ... Changed input for textarea in command field - #4524 See merge request artica/pandorafms!2676	2019-08-30 14:12:21 +02:00
Daniel Rodriguez	f292780aa2	Merge branch 'ent-4377-Fallo-al-listar-los-items-de-tipo-text-en-los-reports-de-metaconsola' into 'develop' ... Added item type text to list of items- #4377 See merge request artica/pandorafms!2652	2019-08-30 14:11:18 +02:00
Daniel Rodriguez	cbfb8b1e89	Merge branch 'ent-4389-Error-al-mostrar-el-nombre-de-un-agente-en-la-edicion-de-un-item-de-un-report' into 'develop' ... Show alias instead of name - #4389 See merge request artica/pandorafms!2651	2019-08-30 14:10:52 +02:00
Daniel Rodriguez	1ca7e03fa4	Merge branch 'ent-4523-fallos-en-black-theme' into 'develop' ... Changed background-color in request new licence See merge request artica/pandorafms!2673	2019-08-30 14:10:04 +02:00
marcos.alconada	d650ff6959	fixed error	2019-08-30 11:28:24 +02:00
manuel	94e377c3c3	Merge branch 'develop' into ent-3813-Autocompletado-de-campo-Proxy-auth-server-al-crear-webserver-module ... Conflicts: pandora_console/godmode/agentes/configurar_agente.php	2019-08-30 09:46:27 +02:00
alejandro-campos	f423ddc42f	modified function to export audit csv to decode entities as separator	2019-08-30 09:42:58 +02:00
manuel	ce4f4f003d	Merge branch 'develop' into ent-3895-Pete-permisos-al-intentar-borrar-un-report-sin-seleccionar-ninguno-en-los-checkboxs ... Conflicts: pandora_console/godmode/reporting/reporting_builder.php	2019-08-30 09:30:11 +02:00
artica	79298d0b8e	Auto-updated build strings.	2019-08-30 00:01:09 +02:00
manuel	b6870178c9	Fixed minor error	2019-08-29 15:21:39 +02:00
Tatiana Llorente	94195cf70a	Change permissions to save custom graph in agent view - #4575	2019-08-29 11:27:40 +02:00
artica	1c4b639deb	Auto-updated build strings.	2019-08-29 00:01:08 +02:00
Daniel Maya	5ad22620b9	mr power up	2019-08-28 12:49:41 +02:00
Daniel Maya	94d797b4b7	Fixed session garbage collector	2019-08-28 11:33:02 +02:00
Alejandro Fraguas	21712c5c23	Merge branch 'ent-4565-No-funciona-el-filtro-de-servidor-en-la-vista-de-eventos-de-la-metaconsola' into 'develop' ... Fixed bug in metaconsole filter events See merge request artica/pandorafms!2683	2019-08-28 09:20:18 +02:00