5848 Commits

Author	SHA1	Message	Date
Rafael Ameijeiras	94211ac75d	Merge branch 'ent-11107-permitir-solamente-extension-mib-en-el-mib-uploader' into 'develop' ... Fix upload file function filter by extension. Fix mib uploader only upload .mib file See merge request artica/pandorafms!6601	2023-12-11 14:29:57 +00:00
Rafael Ameijeiras	d072187a2c	Merge branch 'ent-12605-vista-de-agentes-error-500-en-develop' into 'develop' ... fix error 500 and warnings pandora_enterprise#12605 See merge request artica/pandorafms!6738	2023-12-11 14:27:39 +00:00
daniel	a418673489	Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo	2023-12-11 11:09:54 +01:00
Jonathan	49fd9435dd	Merge branch 'develop' into ent-8365-ncm-fase-3	2023-12-11 10:13:46 +01:00
Rafael Ameijeiras	1e2f573a3b	Merge branch 'ent-12385-filtro-de-grupo-al-anadir-nodos-a-un-mapa-de-red-vacio-no-funciona' into 'develop' ... Ent 12385 filtro de grupo al anadir nodos a un mapa de red vacio no funciona See merge request artica/pandorafms!6673	2023-12-11 08:28:56 +00:00
Daniel Cebrian	7f4dc4fbe4	#12460 fixed log deprecated	2023-12-11 09:18:40 +01:00
Matias Didier	385989f185	Merge branch 'ent-12329-16465-problema-public-link-consolas-visuales-metaconsola' into 'develop' ... VC Public links pandora_enterprise#12329 See merge request artica/pandorafms!6633	2023-12-07 15:27:57 +00:00
Jonathan	78bb8e0bae	#8365 ix merge conflict	2023-12-07 10:58:45 +01:00
daniel	5c6f11511c	fix error events sound modal pandora_enterprise#12607	2023-12-05 16:48:12 +01:00
daniel	1d36d8a436	fix error 500 and warnings pandora_enterprise#12605	2023-12-05 09:14:02 +01:00
daniel	77cf0ce6ca	Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo ... Conflicts: pandora_console/include/styles/pandora.css	2023-12-05 08:02:55 +01:00
Daniel Cebrian	ea474ecd89	#12566 changes in events table	2023-12-04 15:05:01 +01:00
Jorge Rincon	cc1c138552	#12518 Fixed up custom field type link	2023-12-04 11:23:43 +01:00
Rafael Ameijeiras	e91230b165	Merge branch 'ent-12440-16596-agregar-acl-operation-events-events-no-hace-nada' into 'develop' ... Ent 12440 16596 agregar acl operation events events no hace nada See merge request artica/pandorafms!6713	2023-12-04 08:12:48 +00:00
Jonathan	1fb98d34ae	#12296 fix conflict merge develop	2023-12-01 11:59:03 +01:00
Rafael Ameijeiras	aa9aa40ebd	Merge branch 'ent-12213-cambiar-update-manager-por-warp-update' into 'develop' ... Ent 12213 cambiar update manager por warp update See merge request artica/pandorafms!6546	2023-12-01 10:07:07 +00:00
miguel angel rasteu	b89f182e19	#12213 Resolve conflicts	2023-12-01 10:31:50 +01:00
miguel angel rasteu	5ee6eb7306	#12052 Resolve conflicts	2023-12-01 10:19:39 +01:00
Daniel Rodriguez	39c6420d2c	Merge branch 'ent-11763-15982-regex-en-busqueda-de-eventos' into 'develop' ... Ent 11763 15982 regex en busqueda de eventos See merge request artica/pandorafms!6512	2023-12-01 08:44:46 +00:00
Jonathan	c41b360a6e	#8365 merge conflict	2023-11-30 12:04:28 +01:00
Jorge Rincon	03fea82124	#12524 fixed opening items in new tabs Monitoring and Alerts view	2023-11-30 08:45:34 +01:00
Jonathan	b99c9240de	#8365 NCM Merge conflict	2023-11-30 08:32:15 +01:00
Jonathan	75d57337af	#11705 Fix merge conflict	2023-11-30 08:10:32 +01:00
Jonathan	e8272c0006	#11763 Fix merge conflict	2023-11-30 07:57:25 +01:00
Daniel Cebrian	f1a8c4b31d	#12541 change message export graph	2023-11-29 16:12:12 +01:00
Daniel Cebrian	b6722214de	#12541 changes in graph analytics	2023-11-29 15:43:38 +01:00
Rafael Ameijeiras	60d9fffe22	Merge branch 'ent-12137-propuesta-de-refactoring-visual-de-vista-ppal-de-agente' into 'develop' ... Ent 12137 propuesta de refactoring visual de vista ppal de agente See merge request artica/pandorafms!6520	2023-11-29 14:26:53 +00:00
Jonathan	4c25e4cab1	#12440 add operation/events/events check readonly	2023-11-29 11:55:59 +01:00
Jonathan	f86a3e60e8	#11763 save filter regex on bbdd	2023-11-29 11:14:40 +01:00
Daniel Maya	892048554e	#12468 Fixed instructions	2023-11-29 10:27:55 +01:00
daniel	5bd689500c	move extension translate_string and file_repo pandora_enterprise#12333	2023-11-28 11:06:39 +01:00
Jonathan	49a81b34c4	Merge branch 'develop' into ent-11763-15982-regex-en-busqueda-de-eventos	2023-11-28 09:50:48 +01:00
Jonathan	9819c3a5ff	Merge branch 'develop' into ent-11705-15916-campo-editable-en-vista-de-eventos	2023-11-28 08:30:23 +01:00
daniel	f6f0f15731	Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo ... Conflicts: pandora_console/godmode/reporting/reporting_builder.item_editor.php pandora_console/include/graphs/fgraph.php pandora_console/include/lib/Dashboard/Widgets/single_graph.php pandora_console/include/styles/pandora.css	2023-11-28 08:29:10 +01:00
daniel	3f3e8e42bc	move extension translate_string and file_repo pandora_enterprise#12333	2023-11-28 08:13:00 +01:00
Jonathan	def169abb8	Merge branch 'develop' into ent-8365-ncm-fase-3	2023-11-28 07:58:50 +01:00
Rafael Ameijeiras	215c665a9c	Merge branch 'ent-12173-nombres-de-modulos-en-vista-de-eventos-se-muestran-de-manera-incorrecta' into 'develop' ... Ent 12173 nombres de modulos en vista de eventos se muestran de manera incorrecta See merge request artica/pandorafms!6565	2023-11-27 14:51:48 +00:00
Rafael Ameijeiras	4ac9316391	Merge branch 'ent-12079-no-se-aplican-los-filtros-por-defecto-al-hacer-clic-en-el-numero-de-alertas' into 'develop' ... Ent 12079 no se aplican los filtros por defecto al hacer clic en el numero de alertas See merge request artica/pandorafms!6475	2023-11-27 14:51:02 +00:00
Rafael Ameijeiras	8e68198ab5	Merge branch 'ent-11679-15855-nombres-de-modulos-no-tienen-link-a-su-edicion' into 'develop' ... Ent 11679 15855 nombres de modulos no tienen link a su edicion See merge request artica/pandorafms!6422	2023-11-27 14:39:14 +00:00
Rafael Ameijeiras	707f85ed7f	Merge branch 'ent-11511-cambiar-el-apartado-de-tools-a-seccion-management' into 'develop' ... Ent 11511 cambiar el apartado de tools a seccion management See merge request artica/pandorafms!6403	2023-11-27 14:36:38 +00:00
miguel angel rasteu	e967b5820a	Merge branch 'develop' into ent-12137-propuesta-de-refactoring-visual-de-vista-ppal-de-agente	2023-11-27 13:06:51 +01:00
miguel angel rasteu	cac31cc482	#12137 Resolve conflicts	2023-11-27 13:05:43 +01:00
Rafael Ameijeiras	074ea7a9c9	Merge branch 'ent-12159-16357-cuadro-de-busqueda-no-muestra-agentes-cuando-se-busca-con-un-guion-bajo' into 'develop' ... Ent 12159 16357 cuadro de busqueda no muestra agentes cuando se busca con un guion bajo See merge request artica/pandorafms!6519	2023-11-27 11:58:59 +00:00
Matias Didier	c7d28b9a77	Merge branch 'ent-12356-botones-de-paginacion-de-la-vista-de-interfaces-duplicados' into 'develop' ... Fix pagination interfaces pandora_enterprise#12356 See merge request artica/pandorafms!6626	2023-11-27 11:38:19 +00:00
Rafael Ameijeiras	63f5396d30	Merge branch 'ent-12043-cve-2023-41814-vulnerabilidad-xss-mensajes' into 'develop' ... Ent 12043 cve 2023 41814 vulnerabilidad xss mensajes See merge request artica/pandorafms!6492	2023-11-27 11:20:10 +00:00
miguel angel rasteu	b0125d943e	#12138 Resolve conflict	2023-11-27 11:51:00 +01:00
miguel angel rasteu	a4cd6d7fe1	#12138 Resolve conflict	2023-11-27 11:43:24 +01:00
Rafael Ameijeiras	5d94be5e7f	Merge branch 'ent-12134-contador-de-agentes-modulos-en-las-vistas' into 'develop' ... Ent 12134 contador de agentes modulos en las vistas See merge request artica/pandorafms!6566	2023-11-27 10:42:01 +00:00
Rafael Ameijeiras	e5c708298b	Merge branch 'ent-11760-15978-anadir-el-filtro-en-el-estado-de-eventos-not-acknowledged' into 'develop' ... add new type search status events not in process pandora_enterprise#11760 See merge request artica/pandorafms!6491	2023-11-27 10:41:28 +00:00
Diego Muñoz-Reja	59bed70175	Merge branch 'ent-12153-grafica-de-eventos-a-lo-largo-del-tiempo-en-vista-de-eventos' into 'develop' ... Ent 12153 grafica de eventos a lo largo del tiempo en vista de eventos See merge request artica/pandorafms!6532	2023-11-27 10:32:34 +00:00