5147 Commits

Author	SHA1	Message	Date
alejandro.campos@artica.es	84ca3c040c	fix query	2022-03-25 11:04:14 +01:00
Daniel Rodriguez	64947b75cd	Merge branch 'ent-8338-POST-Dejar-de-codificar-los-custom-data-en-base64-eventos' into 'develop' ... change storage format of custom data field in DB See merge request artica/pandorafms!4766	2022-03-24 16:19:39 +00:00
alejandro.campos@artica.es	24d144ae26	minor fix	2022-03-23 17:23:45 +01:00
alejandro.campos@artica.es	c7dd55e959	minor fix	2022-03-23 17:18:24 +01:00
alejandro.campos@artica.es	5757d4a933	implement csv export of events in meta and minor fixes	2022-03-23 14:24:39 +01:00
Daniel Barbero Martin	76d8918a4e	fixed CV in console mobile metaconsole #8676	2022-03-21 10:04:11 +01:00
alejandro.campos@artica.es	e1ec4ce40e	change storage format of custom data field in DB	2022-03-18 11:23:29 +01:00
Daniel Rodriguez	59b51ea606	Merge branch 'ent-8624-command-snapshow-view-debe-mostrar-fuentes-monoespacio' into 'develop' ... Command snapshot monospaced font See merge request artica/pandorafms!4762	2022-03-17 08:55:29 +00:00
Daniel Rodriguez	b582fff47e	Merge branch 'ent-8679-Vulnerabilidad-File-Manager' into 'develop' ... Fix upload of not wanted files in File Manager See merge request artica/pandorafms!4754	2022-03-15 10:08:48 +00:00
Daniel Rodriguez	d7598cefa5	Merge branch 'ent-8662-modulos-modulo-padre-no-se-ven-en-tree-view' into 'develop' ... Clean filtered references for parent modules See merge request artica/pandorafms!4744	2022-03-15 10:06:18 +00:00
Calvo	6067f356e9	Command snapshot monospaced font	2022-03-15 09:21:34 +01:00
Daniel Rodriguez	185be2ddb8	Merge branch 'ent-8374-12855-giss-agentes-deshabilitados-en-meta' into 'develop' ... Addedd metaconsole tree view filter for disabled agents See merge request artica/pandorafms!4725	2022-03-11 11:38:05 +00:00
Daniel Rodriguez	a67b6647f7	Merge branch 'ent-2152-Operaciones-masivas-de-grupos-secundarios' into 'develop' ... bulk operation edit agents add secundary groups pandora_enterprise#2152 See merge request artica/pandorafms!4677	2022-03-11 08:51:33 +00:00
José González	73838ef843	Fix upload of not wanted files in File Manager	2022-03-09 17:27:08 +01:00
Daniel Barbero Martin	0d6570ea24	fixed error massive operation agents #2152	2022-03-09 15:12:26 +01:00
Daniel Rodriguez	c1dd265085	Merge branch 'ent-8381-Bug-interfaces-view' into 'develop' ... Fixed issues with interfaces view and limited to show only agents with ifaces See merge request artica/pandorafms!4712	2022-03-09 12:54:04 +00:00
Daniel Maya	04f6cfc94f	added heatmap	2022-03-07 12:50:36 +01:00
José González	89d5b490bf	Clean filtered references for parent modules	2022-03-07 10:45:11 +01:00
Daniel Maya	f34e8fead7	Merge branch 'develop' into ent-8458-heatmap-view	2022-03-07 10:35:26 +01:00
Calvo	05c283642f	Addedd metaconsole tree view filter for disabled agents	2022-02-25 15:37:08 +01:00
Daniel Maya	74996e3cc0	WIP heatmap 2	2022-02-25 09:41:32 +01:00
fbsanchez	deb46436d3	Merge remote-tracking branch 'origin/develop' into ent-6375-proyectos-auto-aplicacion-de-politicas ... Conflicts: pandora_console/extras/mr/52.sql	2022-02-23 12:11:44 +01:00
José González	604633dd35	Fixed issues with interfaces view and limited to show only agents with ifaces	2022-02-22 12:37:01 +01:00
Daniel Maya	d73fd0450d	Merge branch 'develop' into ent-8458-heatmap-view	2022-02-21 10:18:15 +01:00
Daniel Rodriguez	45b97be611	Merge branch 'ent-7049-permitir-seleccionar-a-nivel-de-usuario-si-autenticara-local-o-remotamente-ldap-ad' into 'develop' ... Added token local user to allow enabling local auth at user level See merge request artica/pandorafms!4668	2022-02-18 11:04:06 +00:00
Calvo	5ba7b47b85	Merge remote-tracking branch 'origin/develop' into ent-7049-permitir-seleccionar-a-nivel-de-usuario-si-autenticara-local-o-remotamente-ldap-ad	2022-02-18 09:26:55 +01:00
Daniel Maya	3c50164270	WIP heatmap	2022-02-11 14:50:57 +01:00
fbsanchez	4d912fbd34	Merge remote-tracking branch 'origin/develop' into ent-6802-super-8	2022-02-11 09:55:34 +01:00
José González	fc4b702db0	Merge branch 'develop' into 'ent-8422-Revision-completa-audit-logs' ... # Conflicts: # pandora_console/godmode/alerts/configure_alert_template.php	2022-02-08 11:35:01 +00:00
fbsanchez	331f8e8906	php8 incompatibility fixes	2022-02-07 13:48:25 +01:00
fbsanchez	ef01e19de9	php8 incompatibility fixes	2022-02-07 13:40:42 +01:00
fbsanchez	8b09c49871	minor errata fix	2022-02-07 11:56:00 +01:00
Daniel Barbero Martin	dca70fa8ec	Merge remote-tracking branch 'origin/develop' into ent-3943-Plantillas-de-alerta-con-varios-horarios	2022-02-07 08:04:36 +01:00
fbsanchez	48ca83aa76	errata fix	2022-02-04 13:33:46 +01:00
fbsanchez	e1776d7994	removed collation from filtering	2022-02-04 13:26:03 +01:00
fbsanchez	a298b25a38	Merge remote-tracking branch 'origin/develop' into ent-6802-super-8	2022-02-03 17:55:34 +01:00
Daniel Rodriguez	867dbc7d5c	Merge branch 'ent-8518-Bug-en-link-a-graficas-en-Monitor-Detail' into 'develop' ... fix link pandora_enterprise#8518 See merge request artica/pandorafms!4674	2022-02-03 10:21:15 +00:00
Daniel Rodriguez	9240533de5	Merge branch 'ent-7430-Fallos-visuales-en-Mapas-GIS' into 'develop' ... Ent 7430 fallos visuales en mapas gis See merge request artica/pandorafms!4657	2022-02-02 14:05:11 +00:00
Daniel Barbero Martin	f342a218ba	fix link pandora_enterprise#8518	2022-02-02 13:51:04 +01:00
fbsanchez	17be6f3ca5	Merge remote-tracking branch 'origin/develop' into ent-6802-super-8	2022-02-02 11:36:14 +01:00
Daniel Rodriguez	110052a21f	Merge branch 'ent-8428-12919-visualizacion-agentes-en-operaciones-masivas-de-modulos' into 'develop' ... Ent 8428 12919 visualizacion agentes en operaciones masivas de modulos See merge request artica/pandorafms!4666	2022-02-02 09:37:15 +00:00
fbsanchez	5b06942caf	DANGER COMMIT, uses schema collation instead forced one	2022-02-01 15:18:45 +01:00
fbsanchez	592df1c3a7	Merge remote-tracking branch 'origin/develop' into ent-6802-super-8 ... Conflicts: pandora_console/pandoradb.sql	2022-02-01 15:16:21 +01:00
José González	36bef528ab	Merge branch 'develop' into 'ent-8422-Revision-completa-audit-logs' ... # Conflicts: # pandora_console/godmode/massive/massive_delete_agents.php	2022-02-01 12:45:17 +00:00
Jose Gonzalez	40efaa157d	Merge remote-tracking branch 'origin' into ent-8422-Revision-completa-audit-logs	2022-02-01 13:42:30 +01:00
Jose Gonzalez	d81e6571ec	New audit logs	2022-02-01 13:39:18 +01:00
Daniel Barbero Martin	0a4d6cfd31	Merge remote-tracking branch 'origin/develop' into ent-3943-Plantillas-de-alerta-con-varios-horarios ... Conflicts: pandora_console/include/styles/pandora.css	2022-02-01 11:36:33 +01:00
Daniel Rodriguez	d21d65a7ac	Merge branch 'ent-8206-busqueda-de-modulos-en-graficas-personalizadas' into 'develop' ... Added select filtered modulo to custom graphs conf menu See merge request artica/pandorafms!4647	2022-02-01 09:38:12 +00:00
Daniel Rodriguez	8c01afafdb	Merge branch 'ent-8170-busqueda-de-tree-view-metaconsola-se-descuadra-con-baja-resolucion' into 'develop' ... Fix tree view filter view on meta See merge request artica/pandorafms!4649	2022-02-01 09:36:20 +00:00
alejandro.campos@artica.es	2b6a9f0277	show agent and module name tip	2022-01-31 15:43:56 +01:00