5471 Commits

Author	SHA1	Message	Date
miguel angel rasteu	4911d84c76	#11993 Fix configration users notification	2023-09-05 11:52:16 +02:00
Rafael Ameijeiras	f2b99cf38e	Merge branch 'ent-10639-unificacion-de-controles-de-fecha' into 'develop' ... Ent 10639 unificacion de controles de fecha See merge request artica/pandorafms!6212	2023-09-05 07:50:45 +00:00
daniel	a059f18b4b	ITSM pandora_enterprise#11471	2023-09-04 16:36:58 +02:00
miguel angel rasteu	4d69b10a8f	#11988 Fix get_parameter	2023-09-04 13:01:34 +02:00
Jorge Rincon	ba1a3da03a	#10065 fixed checkbox switch style	2023-09-04 10:03:53 +02:00
Rafael Ameijeiras	6e60eeb09b	Merge branch 'ent-11490-nuevo-widget-group-status-map' into 'develop' ... Ent 11490 Nuevo widget: group status map See merge request artica/pandorafms!6252	2023-09-04 07:05:49 +00:00
daniel	1a1087e311	Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria ... Conflicts: pandora_console/extras/mr/66.sql	2023-09-04 08:16:48 +02:00
Gorka Sanchez	7dcb38f382	Merge branch 'ent-11821-error-sql-en-vista-de-eventos-al-agregar-columna-de-comentarios' into 'develop' ... Ent 11821 error sql en vista de eventos al agregar columna de comentarios See merge request artica/pandorafms!6359	2023-09-01 09:24:10 +00:00
Pablo Aragon	4d3b558e97	11801-Monitors detail/view Start disabled (enable on filter)	2023-09-01 09:37:16 +02:00
Pablo Aragon	9010d079d3	11801-Datatables add parameter Start disabled (enable on filter)	2023-08-31 14:58:47 +02:00
Jonathan	67963100b0	#11973 reload vsconsole on copy elements	2023-08-31 14:57:46 +02:00
Jonathan	89a1dd1e9f	#11973 reload vsconsole on copy elements	2023-08-31 14:39:20 +02:00
Jonathan	1e22d473e6	#9814 projection graphs - module view & dashboard	2023-08-31 13:42:52 +02:00
miguel angel rasteu	c2e6dd378d	#11206 Fix buttons	2023-08-31 13:36:26 +02:00
miguel angel rasteu	2c62de02f7	Fix conflict	2023-08-31 12:49:48 +02:00
Gorka Sanchez	6102cb5015	Merge branch 'ent-11423-nueva-herramienta-graph-analytics' into 'develop' ... Ent 11423 nueva herramienta graph analytics See merge request artica/pandorafms!6327	2023-08-31 10:30:27 +00:00
Gorka Sanchez	66eaf39645	Merge branch 'ent-10637-mejora-informe-grupo' into 'develop' ... Ent 10637 mejora informe grupo See merge request artica/pandorafms!6206	2023-08-31 06:47:57 +00:00
Gorka Sanchez	d2b768c8cf	Merge branch 'ent-9160-selector-de-elementos-multiple-en-consola-visual' into 'develop' ... Ent 9160 selector de elementos multiple en consola visual See merge request artica/pandorafms!6367	2023-08-31 06:46:16 +00:00
Gorka Sanchez	5cc63390e0	Merge branch 'ent-11817-autorefresco-en-vista-de-mapas-de-red' into 'develop' ... Ent 11817 autorefresco en vista de mapas de red See merge request artica/pandorafms!6368	2023-08-31 06:35:11 +00:00
Matias Didier	a3c8657853	Merge branch 'ent-11958-16155-icono-de-recuperacion-de-alerta-en-ultimos-eventos-de-la-vista-tactica-gigante' into 'develop' ... Ent 11958 16155 icono de recuperacion de alerta en ultimos eventos de la vista tactica gigante See merge request artica/pandorafms!6371	2023-08-29 13:12:24 +00:00
Daniel Cebrian	1fa0bc0ab1	#11965 new section security in menu	2023-08-29 15:09:41 +02:00
Pablo Aragon	a27f5e129a	11958-Fix Recover alert icon size	2023-08-29 12:35:06 +02:00
Pablo Aragon	c967211830	11958-Fix Recover alert icon size	2023-08-29 12:33:35 +02:00
Jonathan	84bb4780ca	#10639 new datepicker style and save filter	2023-08-29 12:17:41 +02:00
Daniel Cebrian	dee5667783	Merge branch 'develop' into ent-11490-nuevo-widget-group-status-map	2023-08-29 10:57:43 +02:00
Daniel Maya	287848b71c	#9160 Added multi selector	2023-08-29 08:58:19 +02:00
Pablo Aragon	ba964dfb16	11817-Remove Network maps from autorefresh user list	2023-08-29 08:52:50 +02:00
Jorge Rincon	797b24af86	#10065 Added switch to filter create/edit modal.	2023-08-28 13:54:35 +02:00
Pablo Aragon	cd430f9f3f	11952-Fix filters in List of latest events	2023-08-28 12:27:45 +02:00
daniel	ecfa71b43c	ITSM pandora_enterprise#11471	2023-08-25 14:15:32 +02:00
Pablo Aragon	d866848481	11423-Graph analytics. Remove Filter None from export and share	2023-08-25 12:38:58 +02:00
miguel angel rasteu	f5d20dc8eb	#11206 Fix custom field view	2023-08-25 12:20:07 +02:00
Pablo Aragon	28316e25c3	11423-Graph analytics. Remove Group None from export filter	2023-08-25 10:33:32 +02:00
miguel angel rasteu	1afed9f262	Merge branch 'develop' into ent-11206-anadir-la-custom-field-view-de-la-meta-a-los-nodos	2023-08-25 10:13:43 +02:00
Pablo Aragon	9271dc33f1	11821-Events not sort by comments	2023-08-24 14:43:05 +02:00
miguel angel rasteu	bb3a45050f	Merge branch 'develop' into ent-10637-mejora-informe-grupo	2023-08-24 12:38:23 +02:00
Pablo Aragon	670cf7d9a7	11423-Graph analytics. Remove graphs & several changes	2023-08-24 12:27:06 +02:00
Jonathan	d9e897568a	Merge branch 'develop' into ent-10639-unificacion-de-controles-de-fecha	2023-08-24 10:06:19 +02:00
Jonathan	ab50a519ea	#10639 version 2 datepicker	2023-08-24 09:36:15 +02:00
daniel	dca15b5637	Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria	2023-08-23 18:54:01 +02:00
Pablo Aragon	6757e69a75	11423-Graph analytics. Resolve Confict	2023-08-23 11:55:41 +02:00
Pablo Aragon	c0933e8b15	11423-Graph analytics	2023-08-23 11:51:29 +02:00
Rafael Ameijeiras	1fa70b3afc	Merge branch 'ent-11852-advertencia-al-usar-intervalos-largos' into 'develop' ... Ent 11852 advertencia al usar intervalos largos See merge request artica/pandorafms!6346	2023-08-23 05:56:19 +00:00
Pablo Aragon	bfa09367d4	11423-Graph analytics. Share function	2023-08-22 15:28:05 +02:00
miguel angel rasteu	330f36a3cf	Fix group view	2023-08-22 13:23:17 +02:00
miguel angel rasteu	feac240905	#10637 Resolve conflicts	2023-08-22 11:49:23 +02:00
miguel angel rasteu	0194fbaa59	#11206 Fix custom field view	2023-08-22 11:16:17 +02:00
alejandro.campos@artica.es	5624b8256c	several changes	2023-08-22 10:29:58 +02:00
Pablo Aragon	ce1c8cdbb7	11423-Graph analytics. Before Share & Export	2023-08-22 10:04:33 +02:00
daniel	5a61f074d7	Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria	2023-08-22 09:22:11 +02:00
miguel angel rasteu	817c3223be	#11206 Fix custom field view	2023-08-21 15:11:13 +02:00
Rafael Ameijeiras	4b10cd4216	Merge branch 'ent-10946-enlaces-filtrando-por-estado-en-widget-general-group-status' into 'develop' ... Ent 10946 enlaces filtrando por estado en widget general group status See merge request artica/pandorafms!6225	2023-08-21 11:18:14 +00:00
Rafael Ameijeiras	82389ddf2d	Merge branch 'ent-10870-15385-limpiar-eventos-desde-la-vista-detallada-de-evento' into 'develop' ... Ent 10870 [#15385] Limpiar eventos desde la vista detallada de evento See merge request artica/pandorafms!6174	2023-08-21 11:10:35 +00:00
Jonathan	563323d0be	#11852 warning time lapse more than 30 days	2023-08-21 13:05:39 +02:00
miguel angel rasteu	e96cb41992	#11206 Fix css conflict	2023-08-21 09:10:51 +02:00
miguel angel rasteu	a251046452	#11206 Fix conflict	2023-08-21 08:36:42 +02:00
daniel	a63824d802	Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria ... Conflicts: pandora_console/extras/mr/66.sql pandora_console/godmode/users/user_management.php	2023-08-21 08:08:34 +02:00
Rafael Ameijeiras	dbd90d79a7	Merge branch 'ent-10344-conexion-con-el-servidor-se-ha-perdido' into 'develop' ... Ent 10344 Conexion con el servidor se ha perdido See merge request artica/pandorafms!6228	2023-08-21 05:58:32 +00:00
Daniel Cebrian	dd5a4887a2	#10870 fixed change status from event	2023-08-18 14:14:51 +02:00
Jorge Rincon	3e4178c490	Merge branch develop into ent-10065-post-filtros-de-eventos-privados	2023-08-18 09:19:57 +02:00
Rafael Ameijeiras	52d37be6c9	Merge branch 'ent-10850-meter-la-vista-actual-de-la-vista-detalle-de-agentes-en-el-sistema-de-favoritos' into 'develop' ... Ent 10850 meter la vista actual de la vista detalle de agentes en el sistema de favoritos See merge request artica/pandorafms!6196	2023-08-18 06:52:31 +00:00
Rafael Ameijeiras	be7489ee93	Merge branch 'ent-9601-14239-Exportar-eventos-en-CSV-no-usa-la-TZ-del-usuario' into 'develop' ... use user configured timezone for event export See merge request artica/pandorafms!6307	2023-08-18 06:45:22 +00:00
Daniel Cebrian	5ee4dbee87	#11490 added new widget group status map	2023-08-16 16:11:35 +02:00
Pablo Aragon	63d3745794	11423-Graph analytics. Get filter data (WIP)	2023-08-16 15:12:31 +02:00
Pablo Aragon	a10b526938	11423-Graph analytics. Get filter data (WIP)	2023-08-14 15:36:19 +02:00
daniel	133eef456a	Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria	2023-08-14 08:14:34 +02:00
Pablo Aragon	5ed9206f36	11423-Graph analytics. Drag&Drop (WIP)	2023-08-11 13:50:32 +02:00
Pablo Aragon	28b8eeca61	11423-Graph analytics (WIP)	2023-08-10 09:13:48 +02:00
Daniel Cebrian	06eae47560	Merge branch 'develop' into ent-11326-security-hardening-console	2023-08-09 13:27:21 +02:00
daniel	7f82273dc4	Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria ... Conflicts: pandora_console/extras/mr/65.sql	2023-08-09 08:59:01 +02:00
Jorge Rincon	3429e0d190	#10065 Added the option to create-edit a private event filter.	2023-08-07 14:43:50 +02:00
Rafael Ameijeiras	3cfa60b38a	Merge branch 'ent-11219-fallo-en-traducciones' into 'develop' ... Ent 11219 fallo en traducciones See merge request artica/pandorafms!6305	2023-08-04 09:38:01 +00:00
Rafael Ameijeiras	354276fb9e	Merge branch 'ent-11822-acoustic-console-no-funciona' into 'develop' ... Ent 11822 acoustic console no funciona See merge request artica/pandorafms!6309	2023-08-04 06:42:34 +00:00
Rafael Ameijeiras	0b680568b5	Merge branch 'ent-11739-compatibilidad-php-8-2-second' into 'develop' ... Ent 11739 compatibilidad php 8 2 second See merge request artica/pandorafms!6300	2023-08-04 06:32:37 +00:00
Jonathan	a48c496e14	#11822 fix sound events window	2023-08-03 12:22:35 +02:00
alejandro.campos@artica.es	1fde2ed9b1	use user configured timezone for event export	2023-08-03 11:03:56 +02:00
Rafael Ameijeiras	fec85ce8e7	Merge branch 'ent-11749-15964-conteo-de-agentes-no-aparece-en-v772' into 'develop' ... Ent 11749 15964 conteo de agentes no aparece en v772 See merge request artica/pandorafms!6266	2023-08-03 07:04:11 +00:00
miguel angel rasteu	fddc709aee	#11219 Fix transaltes	2023-08-02 14:48:02 +02:00
Daniel Maya	aef7f0edd0	#11739 Fixed deprecated functions 4	2023-08-01 14:51:31 +02:00
alejandro.campos@artica.es	8fdc841254	Merge remote-tracking branch 'origin/develop' into ent-10602-Inventory-Widget	2023-08-01 09:58:37 +02:00
alejandro.campos@artica.es	78e76e1ad3	implemented inventory widget	2023-08-01 09:57:49 +02:00
Jonathan	f2328407b1	Merge branch 'develop' into ent-10639-unificacion-de-controles-de-fecha	2023-08-01 09:39:56 +02:00
Daniel Maya	ad24712eed	resolved conflict 2	2023-07-31 09:48:42 +02:00
Daniel Maya	8bbaa11ce3	resolved conflict	2023-07-31 09:44:46 +02:00
Daniel Maya	858a6230b3	resolved conflict	2023-07-31 09:02:58 +02:00
Rafael Ameijeiras	6db5b41633	Merge branch 'ent-10875-15383-limitar-ancho-y-o-largo-de-la-linea-de-los-eventos' into 'develop' ... Ent 10875 15383 limitar ancho y o largo de la linea de los eventos See merge request artica/pandorafms!6034	2023-07-31 06:40:38 +00:00
Daniel Cebrian	21435b32c3	Merge branch 'develop' into ent-11326-security-hardening-console	2023-07-28 13:39:22 +02:00
miguel angel rasteu	539dd0ddee	#10875 Fix title dialog event	2023-07-28 13:07:04 +02:00
miguel angel rasteu	b4ae714af3	#10875 Truncate long string	2023-07-28 10:39:46 +02:00
alejandro.campos@artica.es	6114787764	Merge remote-tracking branch 'origin/develop' into ent-11387-post-mantener-conteo-y-comentarios-de-in-process-extra-id	2023-07-27 13:32:26 +02:00
Pablo Aragon	0eb60cf5c8	11174-Timezone iana graph firefox	2023-07-27 11:24:52 +02:00
miguel angel rasteu	2b20b7f8ee	#11386 Fix modal	2023-07-27 10:47:51 +02:00
Daniel Rodriguez	c2d7c10442	Merge branch 'ent-11606-Quitar-consolas-visuales-legacy' into 'develop' ... remove legacy visual console See merge request artica/pandorafms!6140	2023-07-26 11:09:44 +00:00
Daniel Cebrian	001ffc1799	Merge branch 'develop' into ent-11326-security-hardening-console	2023-07-26 10:55:49 +02:00
Rafael Ameijeiras	0e6531b983	Merge branch 'ent-11335-se-pueden-crear-mapas-de-red-con-el-mismo-nombre-y-grupo' into 'develop' ... Ent 11335 Se pueden crear mapas de red con el mismo nombre y grupo See merge request artica/pandorafms!6143	2023-07-25 07:53:15 +00:00
Rafael Ameijeiras	25e2183d23	Merge branch 'ent-11726-15939-no-hay-columna-nombre-del-agente' into 'develop' ... Ent 11726 15939 no hay columna nombre del agente See merge request artica/pandorafms!6240	2023-07-25 07:51:24 +00:00
Daniel Cebrian	62a70dee2c	#11326 added new section and validated if exist plugin	2023-07-24 18:42:27 +02:00
miguel angel rasteu	a1965de2ea	#11386 Fix sound alert modal	2023-07-24 12:25:06 +02:00
Pablo Aragon	ccf124103d	11135-Move js code from ui_print_datatable. Resolve conflict	2023-07-24 10:46:19 +02:00
daniel	1bf7f1e36e	ITSM pandora_enterprise#11471	2023-07-21 14:23:42 +02:00
miguel angel rasteu	5084c0490b	#11386 Fix changes in soun event dialog	2023-07-21 13:32:12 +02:00
Daniel Cebrian	2d0fe4b149	#11326 added design	2023-07-20 15:13:58 +02:00
miguel angel rasteu	80b60eb86f	#11749 Fix agent count	2023-07-20 08:43:51 +02:00
daniel	3e2c2990df	Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria	2023-07-20 08:28:36 +02:00
daniel	c520375c61	ack utimestamp pandora_enterprise#11387	2023-07-19 13:28:53 +02:00
daniel	1f1b85561c	Merge remote-tracking branch 'origin/develop' into ent-11387-post-mantener-conteo-y-comentarios-de-in-process-extra-id	2023-07-19 11:39:06 +02:00
daniel	9a72d0740c	ITSM fixed pandora_enterprise#11471	2023-07-18 15:13:08 +02:00
Daniel Maya	5806da78dd	#11487 Fixed subgroups	2023-07-18 10:18:30 +02:00
Diego Muñoz-Reja	92623a5837	Merge branch 'ent-11573-mejora-de-los-informes-en-vivo-de-netflow-2' into 'develop' ... Ent 11573 mejora de los informes en vivo de netflow 2 See merge request artica/pandorafms!6142	2023-07-18 07:30:00 +00:00
daniel	a29497f659	Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria	2023-07-17 10:52:15 +02:00
Miguel Angel Rasteu	c428a7d69c	Merge branch 'develop' into 'ent-10875-15383-limitar-ancho-y-o-largo-de-la-linea-de-los-eventos' ... # Conflicts: # pandora_console/operation/events/events.php	2023-07-17 08:45:28 +00:00
Rafael Ameijeiras	de84f5fae9	Merge branch 'ent-11418-cambiar-vista-de-graficas-del-detalle-de-un-agente' into 'develop' ... Ent 11418 cambiar vista de graficas del detalle de un agente See merge request artica/pandorafms!6014	2023-07-17 07:53:10 +00:00
daniel	a3eefacc80	Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria	2023-07-12 16:35:24 +02:00
Daniel Cebrian	0e2d1ee47f	#11326 security hardening	2023-07-12 15:54:04 +02:00
miguel angel rasteu	2af618b765	#11726 Fix alert status column name agent	2023-07-12 14:11:00 +02:00
Diego Muñoz-Reja	a7c0866be0	Merge branch 'ent-11293-lista-de-reportes-en-metaconsola' into 'develop' ... Ent 11293 lista de reportes en metaconsola See merge request artica/pandorafms!5952	2023-07-12 07:16:35 +00:00
Rafael Ameijeiras	a8d8676422	Merge branch 'ent-10976-busqueda-rapida-agentes-pasar-a-datatables' into 'develop' ... Ent 10976 busqueda rapida agentes pasar a datatables See merge request artica/pandorafms!5834	2023-07-12 06:04:56 +00:00
miguel angel rasteu	e3496a44b6	#11206 Add custom field view in nodes	2023-07-11 16:52:39 +02:00
Daniel Cebrian	0a34d06603	#10344 changed message in popup conexion check	2023-07-11 11:35:57 +02:00
Jonathan	183e11a640	#10976 & correction on search agents	2023-07-11 10:24:50 +02:00
miguel angel rasteu	8bcd7cae26	#10946 redirect to tree view in metaconsole	2023-07-11 09:56:46 +02:00
daniel	524bb7fdbb	Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria	2023-07-11 08:26:20 +02:00
daniel	d3412a7ad1	add filter events comments pandora_enterprise#11387	2023-07-10 16:26:33 +02:00
Gorka Sanchez	374cad5d8d	Merge branch 'ent-11312-15642-problemas-url-publica-de-visual-consoles' into 'develop' ... Ent 11312 15642 problemas url publica de visual consoles See merge request artica/pandorafms!5963	2023-07-10 14:12:53 +00:00
Jonathan	27222a1731	#10976 fix minor error	2023-07-10 13:59:33 +02:00
Jonathan	fd9a30d0a3	#10639 datetime range reporting	2023-07-10 11:33:10 +02:00
Jonathan	111ae5c0ba	#10639 datetime range reporting	2023-07-10 09:20:15 +02:00
miguel angel rasteu	14819e045e	#11649 Fix event widget	2023-07-10 09:04:07 +02:00
daniel	200750f90b	change events user_comment new table tevent_comment pandora_enterprise#11387	2023-07-07 12:53:14 +02:00
Gorka Sanchez	cd668590bd	Merge branch 'ent-11567-ventana-about' into 'develop' ... Ent 11567 ventana about See merge request artica/pandorafms!6138	2023-07-07 07:24:44 +00:00
Jonathan	178f04945f	#10976 fix bug search agents global search	2023-07-07 09:21:52 +02:00
miguel angel rasteu	444dbb4599	#11386 Fix modal event sound	2023-07-06 13:15:45 +02:00
Jonathan	82cac02da9	Merge branch 'develop' into ent-11573-mejora-de-los-informes-en-vivo-de-netflow-2	2023-07-06 12:37:16 +02:00
Gorka Sanchez	8fd3ed6650	Merge branch 'ent-9478-creacion-y-edicion-directa-de-alertas-desde-metaconsola' into 'develop' ... Ent 9478 creacion y edicion directa de alertas desde metaconsola See merge request artica/pandorafms!5806	2023-07-06 09:44:33 +00:00
Daniel Cebrian	d993674c12	Merge branch 'develop' into ent-11567-ventana-about	2023-07-06 11:30:45 +02:00
Daniel Cebrian	951a468282	#11418 fixed id modules order in view graphs	2023-07-06 11:26:29 +02:00
Jonathan	d6df9ed38e	#10639 new datepicker style and filters	2023-07-05 14:38:59 +02:00
Matias Didier	3ad880cdec	Merge branch 'ent-10627-no-se-pueden-crear-mensajes-para-un-grupo' into 'develop' ... Ent 10627 no se pueden crear mensajes para un grupo See merge request artica/pandorafms!5874	2023-07-05 12:36:06 +00:00
Gorka Sanchez	7dea46c634	Merge branch 'ent-11093-reticula-en-consola-visual' into 'develop' ... Ent 11093 reticula en consola visual See merge request artica/pandorafms!6056	2023-07-05 09:54:35 +00:00
Matias Didier	5dee7f6d28	Merge branch 'ent-11625-los-iconos-del-tipo-de-evento-son-todo-cubos-de-colores' into 'develop' ... Ent 11625 los iconos del tipo de evento son todo cubos de colores See merge request artica/pandorafms!6150	2023-07-05 07:25:55 +00:00
Matias Didier	af2def1a62	Merge branch 'ent-11205-vista-de-incidencias-con-estilo-no-homogeneo' into 'develop' ... Ent 11205 vista de incidencias con estilo no homogeneo See merge request artica/pandorafms!5908	2023-07-04 14:02:13 +00:00
Jonathan	e9064dfd2f	Merge branch 'develop' into ent-11093-reticula-en-consola-visual	2023-07-04 14:09:15 +02:00
Jonathan	a385ff93a3	#9478 creation alerts to nodes on metaconsole	2023-07-04 12:47:04 +02:00
miguel angel rasteu	138fa636ad	#10637 Change group view	2023-07-04 11:06:49 +02:00
Gorka Sanchez	9427ba68e0	Merge branch 'ent-11314-vista-detalle-de-agente-cajas-colapsadas-por-defecto-si-no-hay-informacion' into 'develop' ... Ent 11314 vista detalle de agente cajas colapsadas por defecto si no hay informacion See merge request artica/pandorafms!5969	2023-07-04 08:53:12 +00:00
Jonathan	11bc45ff02	#11625 fix style event type icon	2023-07-03 12:13:27 +02:00
Jonathan	1c69208a6a	Merge branch 'develop' into ent-9478-creacion-y-edicion-directa-de-alertas-desde-metaconsola	2023-07-03 10:21:55 +02:00
Jonathan	d7a682d48c	Merge branch 'develop' into ent-11093-reticula-en-consola-visual	2023-07-03 09:50:59 +02:00
Gorka Sanchez	d7a871ff76	Merge branch 'ent-10563-mejoras-personalizacion-interfaz' into 'develop' ... Ent 10563 mejoras personalizacion interfaz See merge request artica/pandorafms!6200	2023-07-03 07:49:25 +00:00
Miguel Angel Rasteu	82f6c6c0da	Merge branch 'develop' into 'ent-10563-mejoras-personalizacion-interfaz' ... # Conflicts: # pandora_console/godmode/agentes/module_manager.php	2023-07-03 07:45:32 +00:00