2114 Commits

Author	SHA1	Message	Date
Rafael Ameijeiras	03700d2653	Merge branch 'ent-12032-refactoring-visual-de-la-vista-de-clusters' into 'develop' ... refactor cluster view pandora_enterprise#12032 See merge request artica/pandorafms!6476	2023-09-26 15:15:27 +00: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
Jonathan	e5c5f91576	#11705 change name event_custom_id	2023-09-25 10:32:23 +02:00
Rafael Ameijeiras	b1c3eb7f3c	Merge branch 'ent-12100-graph-analysis-no-puedo-exportar-a-grafica-combinada' into 'develop' ... Ent 12100 graph analysis no puedo exportar a grafica combinada See merge request artica/pandorafms!6483	2023-09-25 07:11:48 +00:00
daniel	c6a04d5d8f	fix show comment events ticket pandora_enterprise#12066	2023-09-22 12:56:01 +02:00
Jonathan	79fe89c3c5	#11705 new custom_field tevento	2023-09-22 12:24:15 +02:00
miguel angel rasteu	e637866f72	#12100 Fix custom graph	2023-09-21 16:11:58 +02:00
miguel angel rasteu	80b0522c7c	#12097 Fix view discovery	2023-09-21 14:21:54 +02:00
miguel angel rasteu	7d5f4f17c6	#12097 Fix view summary in discovery task	2023-09-21 13:06:39 +02:00
daniel	f46626e120	refactor cluster view pandora_enterprise#12032	2023-09-21 10:21:45 +02:00
miguel angel rasteu	2c98ee5628	#12036 Fix duplicate widget	2023-09-18 09:09:52 +02:00
miguel angel rasteu	55edc30564	#12065 fix icons	2023-09-14 17:11:00 +02:00
Calvo	a2baea5710	Migration legacy apps to discovery 2.0	2023-09-14 12:24:12 +02:00
Daniel Maya	a0dcdb88b0	#11391 Fixed ace editor and log viewer	2023-09-13 15:19:42 +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	5093d54137	ITSM pandora_enterprise#11471	2023-09-11 18:14:32 +02: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	0afac84b34	Merge remote-tracking branch 'origin/develop' into ent-11607-migracion-de-discovery-bajo-demanda	2023-09-08 11:14:11 +02:00
Pablo Aragon	87c02fd0a7	11801-Resolve conflict	2023-09-07 11:08:31 +02:00
miguel angel rasteu	3327d79ed6	#11442 Change Welcome tips arrows and buttons	2023-09-06 09:35:12 +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
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
Calvo	9a42e5e333	Discovery migration. Console visual cahnges	2023-09-04 16:27:43 +02: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
Daniel Rodriguez	aac8aa43fd	Merge branch 'ent-11216-clonar-widget' into 'develop' ... Ent 11216 clonar widget See merge request artica/pandorafms!6222	2023-09-01 07:05:11 +00:00
Pablo Aragon	9010d079d3	11801-Datatables add parameter Start disabled (enable on filter)	2023-08-31 14:58:47 +02:00
Jonathan	1e22d473e6	#9814 projection graphs - module view & dashboard	2023-08-31 13:42:52 +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
Jonathan	4ca9b6d8d2	Merge branch 'develop' into ent-10639-unificacion-de-controles-de-fecha	2023-08-29 12:29:41 +02:00
Pablo Aragon	28316e25c3	11423-Graph analytics. Remove Group None from export filter	2023-08-25 10:33:32 +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
Pablo Aragon	208304ed80	11943-Dashboards script tag as string	2023-08-24 08:42:20 +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
daniel	5a61f074d7	Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria	2023-08-22 09:22:11 +02: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	6cbb332a8a	#10701 Fix css conflict	2023-08-21 09:16:22 +02:00
Rafael Ameijeiras	a6e1e1cf61	Merge branch 'ent-11794-stored-cross-site-scripting-via-dashboard-panel' into 'develop' ... Ent 11794 stored cross site scripting via dashboard panel See merge request artica/pandorafms!6296	2023-08-21 06:23:49 +00: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	fa04db27a7	Merge branch 'develop' into ent-10870-15385-limpiar-eventos-desde-la-vista-detallada-de-evento	2023-08-18 10:40:29 +02:00
daniel	dbf98689c2	ITSM pandora_enterprise#11471	2023-08-11 14:30:18 +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
miguel angel rasteu	1009404bfd	Merge branch 'develop' into ent-11668-noticias-en-consola-tienen-fondo-blanco-en-tema-oscuro	2023-08-03 13:42:49 +02:00
miguel angel rasteu	1dc24cdfb4	#11668 Fix black theme	2023-08-03 12:22:20 +02:00
miguel angel rasteu	0a799c51e6	#10701 D3 Tree implementation, links and colors	2023-08-02 12:29:20 +02:00
miguel angel rasteu	ca42714fca	#10701 include d3 v7	2023-08-01 14:56:44 +02:00
Jonathan	f2328407b1	Merge branch 'develop' into ent-10639-unificacion-de-controles-de-fecha	2023-08-01 09:39:56 +02:00
miguel angel rasteu	f09ab409cc	#11794 Fix entitites in dashboard	2023-07-31 11:24:44 +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	f7df38a0c4	Merge branch 'ent-11174-graficas-descolocadas-en-diagnostic-info' into 'develop' ... Ent 11174 graficas descolocadas en diagnostic info See merge request artica/pandorafms!6147	2023-07-28 05:14:18 +00: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
miguel angel rasteu	2b20b7f8ee	#11386 Fix modal	2023-07-27 10:47:51 +02:00
Pablo Aragon	5dbf61b424	11174-Timezone iana graph firefox	2023-07-27 09:46:29 +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
miguel angel rasteu	7c9d441648	#11386 Fix modal error	2023-07-25 11:12:05 +02:00
alejandro.campos@artica.es	f027173862	fixed error with new implementation of datatables	2023-07-25 09:26:58 +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
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	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
Daniel Cebrian	c2e0a02f9d	#10344 changed translate in popup conexion check in js	2023-07-11 12:21:03 +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
Matias Didier	13fb1a707b	Merge branch 'ent-11611-Error-al-abrir-Supernet-Treeview-en-IPAM' into 'develop' ... fixed error See merge request artica/pandorafms!6134	2023-07-10 13:56:20 +00:00
Gorka Sanchez	504fb8ccd2	Merge branch 'ent-10625-problemas-en-graficas-de-informes-con-las-timezones' into 'develop' ... Ent 10625 problemas en graficas de informes con las timezones See merge request artica/pandorafms!5816	2023-07-10 07:20:10 +00:00
miguel angel rasteu	6d848b9fd3	#11216 Duplicate widget	2023-07-07 12:25:49 +02:00
miguel angel rasteu	444dbb4599	#11386 Fix modal event sound	2023-07-06 13:15:45 +02:00
Daniel Cebrian	d993674c12	Merge branch 'develop' into ent-11567-ventana-about	2023-07-06 11:30:45 +02:00
Matias Didier	add65eca5d	Merge branch 'ent-9162-10821-modificar-columnas-widget-eventos' into 'develop' ... Ent 9162 10821 modificar columnas widget eventos See merge request artica/pandorafms!5843	2023-07-06 08:35:35 +00:00
Jonathan	d6df9ed38e	#10639 new datepicker style and filters	2023-07-05 14:38:59 +02:00
Jonathan	e9064dfd2f	Merge branch 'develop' into ent-11093-reticula-en-consola-visual	2023-07-04 14:09:15 +02:00
Matias Didier	203446af70	Merge branch 'ent-11475-cambiar-copyrights-backend-agentes' into 'develop' ... Ent 11475 cambiar copyrights backend agentes See merge request artica/pandorafms!6172	2023-07-04 08:49:14 +00:00
Félix Suárez	c926349c67	Update copyright years	2023-07-03 09:20:25 -06:00
Jonathan	d7a682d48c	Merge branch 'develop' into ent-11093-reticula-en-consola-visual	2023-07-03 09:50:59 +02:00
Gorka Sanchez	b84525f74f	Merge branch 'ent-11267-15611-intervalo-inverso-no-funciona-en-la-creacion-de-modulos-a-traves-de-componentes-de-red' into 'develop' ... Ent 11267 15611 intervalo inverso no funciona en la creacion de modulos a traves de componentes de red See merge request artica/pandorafms!5961	2023-07-03 07:40:10 +00:00
Gorka Sanchez	aa7186512c	Merge branch 'ent-9610-filtrar-por-os-en-bulk-operations' into 'develop' ... Ent 9610 filtrar por os en bulk operations See merge request artica/pandorafms!5863	2023-06-30 11:43:50 +00:00
daniel	564f714112	Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria	2023-06-29 09:46:08 +02:00
daniel	64c8086854	wip integration integriaIMS pandora_enterprise#11471	2023-06-29 09:45:44 +02:00
Daniel Cebrian	eac3cf409b	#9771 new input for select mode of interval and changes in database	2023-06-27 17:37:41 +02:00
Rafael Ameijeiras	d0f33605e0	Merge branch 'ent-10815-operaciones-masivas-permiten-cambiar-parametros-que-deberian-estar-bloqueados-de-modulos-de' into 'develop' ... Ent 10815 operaciones masivas permiten cambiar parametros que deberian estar bloqueados de modulos de See merge request artica/pandorafms!5823	2023-06-27 12:07:15 +00:00
daniel	6e3eddff08	Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria	2023-06-27 08:23:46 +02:00
Daniel Cebrian	adb7c33863	#10870 changed status from view details views when is agruped by extraid	2023-06-26 17:05:46 +02:00
Daniel Cebrian	d2413ed461	Merge branch 'develop' into ent-9771-discovery-2-0-sistema-de-extensiones-disco-para-el-discovery	2023-06-26 13:15:09 +02:00
Rafael Ameijeiras	b53da06c14	Merge branch 'ent-11452-problemas-con-zoom-en-widget-de-service-map' into 'develop' ... Ent 11452 Problemas con zoom en widget de Service map See merge request artica/pandorafms!6102	2023-06-26 07:42:19 +00:00
Rafael Ameijeiras	a3ef14c50b	Merge branch 'ent-11347-15666-mensaje-del-visor-de-tokens-de-api-tiene-mojibake' into 'develop' ... Ent 11347 15666 mensaje del visor de tokens de api tiene mojibake See merge request artica/pandorafms!6084	2023-06-26 07:36:22 +00:00
Félix Suárez	ce11a6521c	Replace "Artica ST"	2023-06-23 15:37:27 -06:00
Félix Suárez	cfc34033b6	Replace "Artica Soluciones Tecnol[o,ó]gicas"	2023-06-23 15:14:57 -06:00
Pablo Aragon	404e2ca484	10953-New styles local component	2023-06-21 13:41:11 +02:00
daniel	d84299d3ab	wip api integration pandora #1355	2023-06-20 08:43:10 +02:00
Daniel Cebrian	01d48c7ba4	#11567 new about window in operation	2023-06-19 15:09:30 +02:00
alejandro.campos@artica.es	94b223a4b4	fixed error	2023-06-19 12:12:50 +02:00
Daniel Maya	18c4f7295b	#11562 Fixed snmp walk	2023-06-15 15:49:06 +02:00
Daniel Cebrian	372f2810d9	#11452 fixed conflicts d3	2023-06-14 16:47:18 +02:00
Daniel Maya	0d950566f7	#11563 Fixed ping	2023-06-14 14:28:21 +02:00
Daniel Cebrian	2aee0304bf	#11452 fixed bug in networkmap widget	2023-06-14 13:59:13 +02:00
Daniel Cebrian	363f29d333	Merge branch 'develop' into ent-9771-discovery-2-0-sistema-de-extensiones-disco-para-el-discovery	2023-06-14 11:23:32 +02:00
Daniel Cebrian	308879fe05	#9771 moved discovery to open	2023-06-14 11:09:08 +02:00
miguel angel rasteu	2b2f9b983e	#11347 Fix decode base 64 for japanese characters	2023-06-12 16:18:28 +02:00
Jonathan	0463d3bea3	#11093 grid position recolocation after drag	2023-06-08 13:54:05 +02:00
Matias Didier	29fdf98e13	Merge branch 'ent-11354-tips-al-entrar-a-about-sin-cerrarlos-se-rompen' into 'develop' ... Ent 11354 tips al entrar a about sin cerrarlos se rompen See merge request artica/pandorafms!5993	2023-06-07 11:34:07 +00:00
Pablo Aragon	2e424cef62	10953-New styles network components	2023-06-07 11:01:37 +02:00
Rafael Ameijeiras	e3e28aebc1	Merge branch 'ent-11201-guardia-15571-tamano-de-nombre-de-modulo-da-problemas-en-el-grpah-builder' into 'develop' ... Ent 11201 guardia 15571 tamano de nombre de modulo da problemas en el grpah builder See merge request artica/pandorafms!5894	2023-05-31 11:37:55 +00:00
Jorge Rincon	3ff8b115f7	#11354 The tips modal is hidden when the about modal is opened.	2023-05-30 13:46:43 +02:00
Matias Didier	4bccb5355e	Merge branch 'ent-11345-15660-macros-no-funcionan-bien-en-componentes-locales' into 'develop' ... Ent 11345 15660 macros no funcionan bien en componentes locales See merge request artica/pandorafms!5962	2023-05-29 06:57:43 +00:00
Daniel Cebrian	562aebfb85	#11312 fixed url public in visual console	2023-05-25 14:01:43 +02:00
Daniel Maya	0e28ed2cb5	#11345 removed console.log	2023-05-25 12:40:32 +02:00
Jonathan	ec334f252e	#11267 fix inverse critical switch template load	2023-05-25 11:38:01 +02:00
Alejandro Campos	988db793da	Merge branch 'develop' into 'ent-10865-15337-15360-Macros-Custom-Fields-no-funcionan-en-modulos-SNMP' ... # Conflicts: # pandora_console/extras/mr/64.sql	2023-05-24 09:20:14 +00:00
Daniel Maya	51b4b99e37	#11245 Added required functions	2023-05-18 10:32:52 +02:00
Rafael Ameijeiras	0bb69dda4d	Merge branch 'ent-10328-14815-campos-ocultos-no-se-ocultan-en-comandos-segun-el-navegador' into 'develop' ... Ent 10328 14815 campos ocultos no se ocultan en comandos segun el navegador See merge request artica/pandorafms!5783	2023-05-17 14:47:08 +00:00
Rafael Ameijeiras	1bf3b94100	Merge branch 'ent-11098-snmp-walk-desde-editor-de-modulos-no-te-permite-seleccionar-oid-para-crear-modulo' into 'develop' ... Ent 11098 snmp walk desde editor de modulos no te permite seleccionar oid para crear modulo See merge request artica/pandorafms!5835	2023-05-17 14:45:41 +00:00
miguel angel rasteu	cb63ee92f7	#10328 Fix JS code	2023-05-17 10:54:43 +02:00
Rafael Ameijeiras	d57e9c4f16	Merge branch 'ent-11094-modulo-tipo-plugin-usando-snmp_remote-no-muestra-opciones-de-configuracion-al-actualizar' into 'develop' ... Ent 11094 modulo tipo plugin usando snmp remote no muestra opciones de configuracion al actualizar See merge request artica/pandorafms!5827	2023-05-17 08:05:09 +00:00
Alejandro Campos	097dc8ef12	Merge branch 'develop' into 'ent-10865-15337-15360-Macros-Custom-Fields-no-funcionan-en-modulos-SNMP' ... # Conflicts: # pandora_console/extras/mr/64.sql	2023-05-17 07:41:02 +00:00
Pablo Aragon	f4cf8e769a	11094-Fix plugin data recovery	2023-05-16 16:00:17 +02:00
Daniel Rodriguez	60c6d806e3	Merge branch 'ent-11082-fallos-con-creacion-de-servicios-usando-el-wizard' into 'develop' ... Ent 11082 fallos con creacion de servicios usando el wizard See merge request artica/pandorafms!5837	2023-05-16 09:51:24 +00:00
Daniel Rodriguez	a7b5015281	Merge branch 'ent-10972-error-de-visualizacion-en-creacion-de-alerta-correlada-condiciones-en-vista-simple-y-detallada' into 'develop' ... Ent 10972 error de visualizacion en creacion de alerta correlada condiciones en vista simple y detallada See merge request artica/pandorafms!5761	2023-05-16 08:40:15 +00:00
Daniel Maya	3b3a36a946	#11201 Fix select	2023-05-12 12:52:51 +02:00
Daniel Rodriguez	fe9194eccf	Merge branch 'ent-11085-15095-anadir-de-nuevo-la-opcion-insert-edit-link-en-label-settings-de-la-consola-visual-mas' into 'develop' ... Ent 11085 15095 anadir de nuevo la opcion insert edit link en label settings de la consola visual mas See merge request artica/pandorafms!5813	2023-05-12 08:44:48 +00:00
miguel angel rasteu	f8f53a0b62	#9610 Add OS filter and OS version filter in bulk operation	2023-05-09 13:01:42 +02:00
Matias Didier	ec2195f32f	Merge branch 'ent-11047-15490-no-se-pueden-agregar-mas-campos-a-los-plugins' into 'develop' ... Ent 11047 15490 no se pueden agregar mas campos a los plugins See merge request artica/pandorafms!5780	2023-05-09 08:18:40 +00:00
Pablo Aragon	886bde919b	11135-Move js code from ui_print_datatable	2023-05-08 14:25:57 +02:00
Daniel Cebrian	042591c57b	#9162 added new select for order columns in widgets	2023-05-08 10:35:59 +02:00
Jorge Rincon	82db353dd1	#11098 The operation of the create module button from the SNPM Walk modal is adjusted	2023-05-05 14:10:41 +02:00
miguel angel rasteu	b107069bf5	#11082 Fix JS code to show de name of the service	2023-05-05 10:09:14 +02:00
Jorge Rincon	9ab9087377	#11098 The Create agent module button is enabled	2023-05-04 16:48:20 +02:00
Pablo Aragon	4f9e09b84a	10815-Bulk operations do not edit modules created with policies	2023-05-03 17:01:21 +02:00
Pablo Aragon	134fa5b581	10625-Change timezone graphs	2023-05-03 11:01:28 +02:00
Jonathan	9da4f3d656	#11085 tinymce add plugins imagen link	2023-05-03 08:04:54 +02:00
Alejandro Campos	539ff07aec	Merge branch 'develop' into 'ent-10179-wizard-deploy-agentes' ... # Conflicts: # pandora_console/include/styles/pandora.css	2023-04-28 08:07:10 +00:00
Daniel Rodriguez	06b58d3dfc	Merge branch 'ent-10191-nuevas-alertas-sonoras-son-poco-usables' into 'develop' ... Ent 10191 nuevas alertas sonoras son poco usables See merge request artica/pandorafms!5689	2023-04-28 06:04:18 +00:00
alejandro.campos@artica.es	9f9aed4d77	add target ip field to remote components	2023-04-27 09:40:32 +02:00
Jonathan	d1361e38cb	#11047 fix macro in plugin section node+meta	2023-04-25 14:20:44 +02:00
Matias Didier	d7ee0ca2da	Merge branch 'ent-10910-a-veces-se-ven-las-bolas-de-los-mapas-de-red-con-fondo-negro' into 'develop' ... Ent 10910 a veces se ven las bolas de los mapas de red con fondo negro See merge request artica/pandorafms!5736	2023-04-24 10:44:21 +00:00
Jonathan	55485c43b2	#10972 remove console.log fullcalendar.js	2023-04-24 07:51:00 +02:00
Jonathan	ec1eb38336	#10972 fix null calendar alerts correlation	2023-04-21 13:27:18 +02:00
Jonathan	a28aef4050	#10191 fix url sound event on metaconsole	2023-04-21 08:48:19 +02:00
Daniel Rodriguez	f5a7dd40e9	Merge branch 'ent-10490-theme-base-de-tinymce' into 'develop' ... Ent 10490 theme base de tinymce See merge request artica/pandorafms!5649	2023-04-20 11:51:13 +00:00