1509 Commits

Author	SHA1	Message	Date
Jonathan	c593161525	#12398 change urls wiki	2023-12-12 12:22:51 +01:00
Daniel Cebrian	276cf73e49	#12575 fixed order columns in dashboard	2023-12-12 10:23:47 +01:00
miguel angel rasteu	fec7bf8b90	Merge branch 'develop' into ent-11495-nuevo-tipo-de-informe-service-level-detailed	2023-12-12 09:45:36 +01:00
Enrique Martin	9f98710248	Set default agents to create	2023-12-11 12:15:53 +01:00
Enrique Martin	93293f41ef	Removed debug default agents to create value	2023-12-11 12:14:19 +01:00
Enrique Martin	00a0fa8eae	Fixed reports generation	2023-12-11 11:53:46 +01:00
Enrique Martin	5a5674f3b4	Set default agents to create to 30	2023-12-11 10:33:03 +01:00
miguel angel rasteu	d034116dd3	#11495 Fix report	2023-12-11 09:26:57 +01:00
Alejandro Campos	0bdc6978e6	Merge branch 'develop' into 'ent-10906-Carga-de-datos-de-demo' ... # Conflicts: # pandora_console/extras/mr/67.sql # pandora_console/pandoradb.sql	2023-12-05 15:30:06 +00:00
alejandro.campos@artica.es	cfc1992d26	Merge branch 'ent-10906-Carga-de-datos-de-demo' of brutus.artica.es:artica/pandorafms into ent-10906-Carga-de-datos-de-demo	2023-12-05 12:20:58 +01:00
alejandro.campos@artica.es	9622b61557	Merge branch 'ent-10906-Carga-de-datos-de-demo' of brutus.artica.es:artica/pandorafms into ent-10906-Carga-de-datos-de-demo	2023-12-05 12:20:40 +01:00
Enrique Martin	2d1b2bf6d2	Added new dashboard widgets	2023-12-05 12:11:25 +01:00
alejandro.campos@artica.es	e7f18709b7	optimization	2023-12-05 12:07:23 +01:00
daniel	34784752b7	fix error js load modal filter sound events pandora_enterprise#12607	2023-12-05 11:47:37 +01:00
daniel	1d36d8a436	fix error 500 and warnings pandora_enterprise#12605	2023-12-05 09:14:02 +01:00
alejandro.campos@artica.es	c9c3426b16	minor change	2023-12-05 08:30:00 +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
Enrique Martin	e833499dc3	Improvements, fixes and new demo elements	2023-12-04 16:58:08 +01:00
daniel	8a92b39eee	add new filters widget modules status pandora_enterprise#12267	2023-12-04 11:59:31 +01:00
alejandro.campos@artica.es	4a64f023fe	Merge branch 'ent-10906-Carga-de-datos-de-demo' of brutus.artica.es:artica/pandorafms into ent-10906-Carga-de-datos-de-demo	2023-12-04 11:37:41 +01:00
alejandro.campos@artica.es	75ddb3b934	minor changes in demo data functionality	2023-12-04 11:37:12 +01:00
Enrique Martin	55aee67df3	Added GIS maps creation	2023-12-03 23:23:57 +01:00
Enrique Martin	b14c77862e	Added new items to visual consoles	2023-12-03 21:43:00 +01:00
Enrique Martin	14fc8ef2b1	Added new items to visual consoles and fixed unknown modules on creation	2023-12-03 21:30:17 +01:00
miguel angel rasteu	5ee6eb7306	#12052 Resolve conflicts	2023-12-01 10:19:39 +01:00
alejandro.campos@artica.es	cb60581bcf	Merge branch 'ent-10906-Carga-de-datos-de-demo' of brutus.artica.es:artica/pandorafms into ent-10906-Carga-de-datos-de-demo	2023-12-01 09:49:37 +01:00
alejandro.campos@artica.es	d6e107ea95	performance improvement	2023-12-01 09:48:45 +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
Enrique Martin	3807baa8ef	Added GIS random data to agents	2023-11-30 17:41:01 +01:00
Matias Didier	8cfb0353dd	Merge branch 'ent-12378-alertas-sonoras-en-vista-de-eventos' into 'develop' ... fix sound alerts severity filter pandora_enterprise#12378 See merge request artica/pandorafms!6663	2023-11-30 11:41:30 +00:00
Rafael Ameijeiras	c60c75475b	Merge branch 'ent-10316-hover-para-mostrar-ip-no-funciona-si-se-utiliza-una-macro' into 'develop' ... Ent 10316 hover para mostrar ip no funciona si se utiliza una macro See merge request artica/pandorafms!6523	2023-11-30 09:23:16 +00:00
Enrique Martin	76327c6d73	Fixed demo graphs generation	2023-11-30 08:54:21 +01:00
alejandro.campos@artica.es	dc2ac2a1b3	implement load demo data	2023-11-29 18:13:56 +01:00
alejandro.campos@artica.es	ca17eef68a	implement load demo data	2023-11-29 18:09:32 +01:00
alejandro.campos@artica.es	a290203847	implement demo data load	2023-11-29 16:57:38 +01:00
alejandro.campos@artica.es	6f96087d90	implement demo data load	2023-11-29 11:30:48 +01:00
Jonathan	f86a3e60e8	#11763 save filter regex on bbdd	2023-11-29 11:14:40 +01:00
alejandro.campos@artica.es	7240bbf934	implement demo data load	2023-11-29 09:00:45 +01:00
daniel	730cfb30ff	Merge remote-tracking branch 'origin/develop' into ent-12378-alertas-sonoras-en-vista-de-eventos ... Conflicts: pandora_console/include/styles/pandora.css	2023-11-28 08:40:07 +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
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
Matias Didier	d544ef4ac5	Merge branch 'ent-8686-13248-anadir-buscador-de-grupos-en-agent-management-tree-group-de-metaconsola' into 'develop' ... Ent 8686 13248 anadir buscador de grupos en agent management tree group de metaconsola See merge request artica/pandorafms!6539	2023-11-27 12:24:22 +00:00
Rafael Ameijeiras	d6e613ca8b	Merge branch 'ent-11791-any-user-can-change-any-other-user-s-notification-settings' into 'develop' ... Ent 11791 any user can change any other user s notification settings See merge request artica/pandorafms!6400	2023-11-27 11:19:14 +00:00
Diego Muñoz-Reja	a0db8f5755	Merge branch 'ent-12204-visualizar-icono-de-los-modulso-pendientes-de-ejecucion-porque-se-han-forzado' into 'develop' ... Ent 12204 visualizar icono de los modulso pendientes de ejecucion porque se han forzado See merge request artica/pandorafms!6550	2023-11-27 10:34:56 +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
alejandro.campos@artica.es	a1916dc4b9	implement demo data load	2023-11-24 12:56:21 +01:00
alejandro.campos@artica.es	c7770ec4f1	implement demo data load	2023-11-23 17:59:22 +01:00
Jonathan	fafe4bc9b4	#10316 new function return_agent_macros	2023-11-23 17:21:37 +01:00
daniel	305f8c7658	Merge remote-tracking branch 'origin/develop' into ent-12378-alertas-sonoras-en-vista-de-eventos	2023-11-23 14:18:44 +01:00
Jonathan	4f707a5a1b	Merge branch 'develop' into ent-11705-15916-campo-editable-en-vista-de-eventos	2023-11-23 09:27:46 +01:00
Jorge Rincon	b6582b7f7e	#12202 added Asteroids game	2023-11-22 13:30:44 +01:00
Daniel Maya	300e01c186	#12502 Fixed filter	2023-11-22 10:10:35 +01:00
alejandro.campos@artica.es	0868c0c995	implement demo data load	2023-11-21 14:26:33 +01:00
alejandro.campos@artica.es	31e4e872c1	implement demo data load	2023-11-21 08:29:33 +01:00
alejandro.campos@artica.es	d6bffbade1	implement demo data load	2023-11-20 16:52:49 +01:00
Gorka Sanchez	7748b59694	Merge branch 'ent-9946-meter-busqueda-en-listado-de-dashboard' into 'develop' ... Ent 9946 meter busqueda en listado de dashboard See merge request artica/pandorafms!6398	2023-11-20 15:20:46 +00:00
daniel	0aece464f8	fix sound alerts severity filter pandora_enterprise#12378	2023-11-14 13:38:09 +01:00
alejandro.campos@artica.es	1fcc263046	implemented demo data load	2023-11-10 11:24:34 +01:00
miguel angel rasteu	748238a7ea	#11791 Prevent any user from changing another user's notification settings in AJAX	2023-11-10 10:03:13 +01:00
miguel angel rasteu	c2b3eb14bf	Merge branch 'develop' into ent-11679-15855-nombres-de-modulos-no-tienen-link-a-su-edicion	2023-11-03 09:43:04 +01:00
Daniel Maya	287b983ce9	#12371 Fixed events	2023-11-02 15:39:55 +01:00
alejandro.campos@artica.es	1fd45fb95f	implement demo data feature	2023-10-26 19:05:07 +02:00
Calvo	715f6abc69	Merge remote-tracking branch 'origin/develop' into ent-11931-made-selector-de-modulo-donde-se-activa-made-monitoring-anomaly-detection-engine	2023-10-24 14:02:36 +02:00
daniel	d8dfaf0fe3	Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo	2023-10-23 17:02:51 +02:00
daniel	ef70444d71	add sliced mode simple graph widget pandora_enterprise#9640	2023-10-23 17:02:08 +02:00
Diego Muñoz-Reja	48c314669a	Merge branch 'ent-10194-nueva-pantalla-tactica-relacionado-con-mejoras-en-la-automonitorizacion' into 'develop' ... Ent 10194 Nueva pantalla táctica (relacionado con mejoras en la automonitorización) See merge request artica/pandorafms!6485	2023-10-23 07:24:20 +00:00
Calvo	1ef42182a7	Merge remote-tracking branch 'origin/develop' into ent-11931-made-selector-de-modulo-donde-se-activa-made-monitoring-anomaly-detection-engine	2023-10-20 10:46:34 +02:00
daniel	6ad9b27df8	Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo	2023-10-20 10:08:20 +02:00
Matias Didier	dcd891eedb	Merge branch 'ent-12286-16465-acceso-a-pandora-a-traves-de-public-link-url-de-consolas-visuales-con-usuario-de-public-2' into 'develop' ... Ent 12286 16465 acceso a pandora a traves de public link url de consolas visuales con usuario de public 2 See merge request artica/pandorafms!6578	2023-10-20 05:51:32 +00:00
Jonathan	98388bb7d2	#12286 fix dashboard vulnerability login admin	2023-10-19 17:06:01 +02:00
daniel	eb5e56cc78	Merge remote-tracking branch 'origin/develop' into ent-12196-problemas-con-la-vista-mobile	2023-10-19 08:16:33 +02:00
daniel	4fb7e1719b	add periodicity graph pandora_enterprise#9640	2023-10-18 12:49:47 +02:00
Daniel Cebrian	9237e4038a	Merge branch 'develop' into ent-10194-nueva-pantalla-tactica-relacionado-con-mejoras-en-la-automonitorizacion	2023-10-16 17:10:33 +02:00
miguel angel rasteu	5060398661	#11206 Fix conflict	2023-10-13 09:00:03 +02:00
miguel angel rasteu	3a2b56cc4c	#12204 Fix force check icon	2023-10-10 16:50:42 +02:00
Daniel Cebrian	9b675868b9	Merge branch 'develop' into ent-10194-nueva-pantalla-tactica-relacionado-con-mejoras-en-la-automonitorizacion	2023-10-09 16:43:25 +02:00
miguel angel rasteu	049e25f866	#8686 Add filter in managemnet tree group	2023-10-06 13:51:18 +02:00
daniel	588f19fa18	fix cv in mobile pandora_enterprise#12196	2023-10-06 12:59:33 +02:00
miguel angel rasteu	09cae778c5	#12153 Create event list graph	2023-10-04 16:28:40 +02:00
miguel angel rasteu	874cb9c52a	#12153 Create button and ajax request	2023-10-04 12:41:23 +02:00
Alejandro Campos	0f381b0db7	Merge branch 'develop' into 'ent-11114-Gestion-de-versiones-Obsolescencia-planeada' ... # Conflicts: # pandora_console/extras/mr/66.sql	2023-10-03 13:11:09 +00:00
Daniel Cebrian	438cb11f95	#10194 added automonitoritation modules and interval refresh async	2023-10-02 16:44:53 +02:00
Rafael Ameijeiras	439d5b54aa	Merge branch 'ent-11961-16159-activar-show-all-events-24h-por-defecto-en-vista-de-ultimos-eventos-de-agente' into 'develop' ... Agents show events 24h switch checked default See merge request artica/pandorafms!6405	2023-10-02 07:08:52 +00:00
Daniel Cebrian	b8df74dace	Merge branch 'develop' into ent-10194-nueva-pantalla-tactica-relacionado-con-mejoras-en-la-automonitorizacion	2023-09-28 16:22:58 +02:00
Jonathan	6db13cc55a	merge conflict solution	2023-09-28 13:14:49 +02:00
Daniel Rodriguez	05cd8142bf	Merge branch 'ent-11471-integracion-pandora-integria' into 'develop' ... wip integration integriaIMS pandora_enterprise#11471 Closes pandora_enterprise#11471 See merge request artica/pandorafms!6131	2023-09-28 10:05:15 +00:00
Daniel Cebrian	62d501e6d5	#10194 sections Alerts and Events	2023-09-27 13:30:56 +02:00
Calvo	0b4ee35780	Fix query agent events	2023-09-27 11:01:21 +02:00
daniel	91393c9e39	Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria ... Conflicts: pandora_console/include/styles/pandora.css	2023-09-25 17:06:08 +02:00
Luis	086835765d	Merge branch 'develop' into 'ent-11931-made-selector-de-modulo-donde-se-activa-made-monitoring-anomaly-detection-engine' ... # Conflicts: # pandora_console/extras/mr/66.sql	2023-09-25 14:08:43 +00:00
Jonathan	e5c5f91576	#11705 change name event_custom_id	2023-09-25 10:32:23 +02:00
Jonathan	79fe89c3c5	#11705 new custom_field tevento	2023-09-22 12:24:15 +02:00
daniel	f46626e120	refactor cluster view pandora_enterprise#12032	2023-09-21 10:21:45 +02:00
alejandro.campos@artica.es	ae74caf7b1	Merge remote-tracking branch 'origin/develop' into ent-11114-Gestion-de-versiones-Obsolescencia-planeada	2023-09-20 15:52:56 +02:00
alejandro.campos@artica.es	6f8212ed40	Merge remote-tracking branch 'origin/develop' into ent-11114-Gestion-de-versiones-Obsolescencia-planeada	2023-09-20 15:46:47 +02:00
Daniel Cebrian	73d179e52f	#12001 added autoselect module in inventory	2023-09-20 12:14:55 +02:00
miguel angel rasteu	d83c1a81d2	#12052 Fix filter alter detail view	2023-09-19 13:50:06 +02:00
Daniel Rodriguez	6ecd8ca899	Merge branch 'ent-10065-post-filtros-de-eventos-privados' into 'develop' ... Draft: Ent 10065 post filtros de eventos privados See merge request artica/pandorafms!6318	2023-09-18 07:55:18 +00:00
Rafael Ameijeiras	b568085841	Merge branch 'ent-12035-la-edicion-de-alertas-no-deberia-ser-posible-en-la-vista-de-agentes' into 'develop' ... not show edition buttons of alert detail pandora_enterprise#12035 See merge request artica/pandorafms!6444	2023-09-18 07:22:13 +00:00
daniel	af968b5e13	Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria	2023-09-14 08:08:05 +02:00
Jorge Rincon	35b5de57f1	The filter group is added in the Service View Widget settings.	2023-09-13 11:12:11 +02:00
daniel	802f0bf83b	Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria	2023-09-12 12:37:31 +02:00
daniel	16f1d80919	not show edition buttons of alert detail pandora_enterprise#12035	2023-09-12 12:30:52 +02:00
miguel angel rasteu	55fa824792	#12037 Fix size of agent text and event text	2023-09-11 11:41:30 +02:00
Jorge Rincon	764d5908bb	Merge branch 'develop' into ent-10065-post-filtros-de-eventos-privados	2023-09-11 10:58:37 +02:00
Rafael Ameijeiras	0c6aaa6723	Merge branch 'ent-11993-user-notifications-esta-roto' into 'develop' ... Ent 11993 user notifications esta roto See merge request artica/pandorafms!6412	2023-09-11 07:15:38 +00:00
daniel	ce0468b37e	Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria ... Conflicts: pandora_console/include/functions_menu.php	2023-09-08 13:11:52 +02:00
Calvo	c4271bf737	Merge remote-tracking branch 'origin/develop' into ent-11931-made-selector-de-modulo-donde-se-activa-made-monitoring-anomaly-detection-engine	2023-09-07 17:58:27 +02:00
alejandro.campos@artica.es	318fa38721	Merge remote-tracking branch 'origin/develop' into ent-11114-Gestion-de-versiones-Obsolescencia-planeada	2023-09-07 17:44:51 +02:00
miguel angel rasteu	f445066d13	#11679 Fix linked module name	2023-09-07 16:29:18 +02:00
alejandro.campos@artica.es	f8911bcf9c	implemented os version management	2023-09-06 17:00:16 +02:00
Matias Didier	96c722b816	Merge branch 'ent-9814-nuego-item-graficas-de-capacity-planning-en-dashboard' into 'develop' ... Ent 9814 nuego item graficas de capacity planning en dashboard See merge request artica/pandorafms!6382	2023-09-06 06:56:59 +00:00
daniel	fce86cb2ac	Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria	2023-09-06 07:50:27 +02:00
miguel angel rasteu	4911d84c76	#11993 Fix configration users notification	2023-09-05 11:52:16 +02:00
Calvo	a8a201cf19	Agents show events 24h switch checked default	2023-09-04 16:47:01 +02:00
miguel angel rasteu	dc520df039	#9946 Fix delete and copy	2023-09-04 11:09:58 +02:00
miguel angel rasteu	81610046e3	#9946 Fix url	2023-09-04 10:58:15 +02:00
miguel angel rasteu	5ca1c54792	#9946 Add search filter and change table to datatable	2023-09-04 10:49:29 +02:00
Calvo	2fc08b7246	Added enable MADE option to modules and bulk op	2023-08-31 18:07:26 +02:00
Jonathan	1e22d473e6	#9814 projection graphs - module view & dashboard	2023-08-31 13:42:52 +02:00
Jonathan	84bb4780ca	#10639 new datepicker style and save filter	2023-08-29 12:17:41 +02:00
Jorge Rincon	797b24af86	#10065 Added switch to filter create/edit modal.	2023-08-28 13:54:35 +02:00
miguel angel rasteu	0194fbaa59	#11206 Fix custom field view	2023-08-22 11:16:17 +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
miguel angel rasteu	a251046452	#11206 Fix conflict	2023-08-21 08:36:42 +02:00
Daniel Cebrian	fa04db27a7	Merge branch 'develop' into ent-10870-15385-limpiar-eventos-desde-la-vista-detallada-de-evento	2023-08-18 10:40:29 +02:00
Jorge Rincon	3e4178c490	Merge branch develop into ent-10065-post-filtros-de-eventos-privados	2023-08-18 09:19:57 +02:00
daniel	133eef456a	Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria	2023-08-14 08:14:34 +02:00
Jonathan	fb4ac30b57	#10598 show error on create web and check	2023-08-09 13:20:43 +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	75b311ad97	Merge branch 'ent-11768-texto-del-modal-de-save-filter-se-muestra-mal' into 'develop' ... Ent 11768 texto del modal de save filter se muestra mal See merge request artica/pandorafms!6287	2023-07-31 13:10:53 +00:00
Rafael Ameijeiras	68b2fbd616	Merge branch 'ent-11467-bug-en-vista-tree-view' into 'develop' ... Ent 11467 bug en vista tree view See merge request artica/pandorafms!6276	2023-07-31 10:12:33 +00:00
Daniel Maya	ad24712eed	resolved conflict 2	2023-07-31 09:48:42 +02:00
Daniel Maya	858a6230b3	resolved conflict	2023-07-31 09:02:58 +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
Jorge Rincon	03feeebbdf	#11768 Fixed the style of the checkbox in the modal save filter	2023-07-27 11:09:24 +02:00
miguel angel rasteu	2b20b7f8ee	#11386 Fix modal	2023-07-27 10:47:51 +02:00
Daniel Cebrian	2c9f7e026e	Merge branch 'develop' into ent-9771-discovery-2-0-sistema-de-extensiones-disco-para-el-discovery	2023-07-26 15:58:26 +02:00
Rafael Ameijeiras	1f52a2d466	Merge branch 'ent-11031-en-visor-de-auditoria-los-filtros-personalizados-tienen-tres-detalles-que-vale-la-pena' into 'develop' ... Ent 11031 en visor de auditoria los filtros personalizados tienen tres detalles que vale la pena See merge request artica/pandorafms!6235	2023-07-25 07:54:36 +00:00
Jorge Rincon	19c600fb9b	#11467 fixed error message and advanced info section from tree view	2023-07-24 14:54:38 +02:00
miguel angel rasteu	5084c0490b	#11386 Fix changes in soun event dialog	2023-07-21 13:32:12 +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	5707ec9e4b	Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria	2023-07-18 15:13:29 +02:00
daniel	9a72d0740c	ITSM fixed pandora_enterprise#11471	2023-07-18 15:13:08 +02:00
Daniel Cebrian	41a03a7a49	Merge branch 'develop' into ent-9771-discovery-2-0-sistema-de-extensiones-disco-para-el-discovery	2023-07-18 09:27:14 +02:00
Rafael Ameijeiras	a8597e1cb4	Merge branch 'ent-11735-listado-de-modulos-rotos-en-develop' into 'develop' ... Ent 11735 listado de modulos rotos en develop See merge request artica/pandorafms!6254	2023-07-17 12:09:09 +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