2650 Commits

Author	SHA1	Message	Date
Rafael Ameijeiras	04478bbdfb	Merge branch 'ent-12503-cambio-visual-del-boton-unique-ip-de-la-config-de-agentes' into 'develop' ... Ent 12503 Cambio Visual del Botón Unique IP de la Config de Agentes See merge request artica/pandorafms!6820	2024-01-18 12:57:08 +00:00
Diego Muñoz-Reja	d1855569dc	Merge branch 'ent-12571-arreglar-interfaz-de-definicion-de-graficas-combinadas' into 'develop' ... Ent 12571 Arreglar interfaz de definicion de graficas combinadas See merge request artica/pandorafms!6767	2024-01-18 11:32:59 +00:00
Rafael Ameijeiras	8a41a04345	Merge branch 'ent-12143-arreglar-mejorar-visualizacion-de-calendarios-y-selectores-de-fecha' into 'develop' ... Ent 12143 arreglar mejorar visualizacion de calendarios y selectores de fecha See merge request artica/pandorafms!6765	2024-01-18 11:27:20 +00:00
Rafael Ameijeiras	1f64fb6115	Merge branch 'ent-12320-wizard-de-bienvenida-mas-molon-visualmente' into 'develop' ... Ent 12320 wizard de bienvenida mas molon visualmente See merge request artica/pandorafms!6842	2024-01-18 11:16:08 +00:00
Jonathan	4ce970eab1	#12539 fix dialog	2024-01-18 11:26:38 +01:00
Daniel Cebrian	7d1e06ce30	#12571 resolve conflics	2024-01-18 10:39:07 +01:00
Matias Didier	384fb677bd	Merge branch 'ent-12391-barra-de-desplazamiento-en-item-de-eventos' into 'develop' ... Ent 12391 barra de desplazamiento en item de eventos See merge request artica/pandorafms!6789	2024-01-18 08:41:26 +00:00
Jonathan	84b52ceb9c	Merge branch 'develop' into ent-11014-codigo-qr-en-user-detail-editor-mantiene-fija-su-posicion-mientras-se-redimensiona-ventana	2024-01-17 14:08:41 +01:00
Daniel Maya	0efe004122	#12767 Fixed password	2024-01-17 13:29:21 +01:00
Daniel Maya	6e820ab58c	#12364 Added filter css	2024-01-17 12:07:33 +01:00
Jonathan	49784cab5a	Merge branch 'develop' into ent-12202-eastern-egg-asteroids	2024-01-17 09:29:21 +01:00
Pablo Aragon	bd808d72f3	12320-Welcome wizard new styles. Fix all complete li	2024-01-11 12:52:23 +01:00
Pablo Aragon	12f6f2e02b	12320-Welcome wizard new styles	2024-01-11 09:33:51 +01:00
Jonathan	83b25fef31	Merge branch 'develop' into ent-12143-arreglar-mejorar-visualizacion-de-calendarios-y-selectores-de-fecha	2024-01-09 11:37:54 +01:00
alejandro.campos@artica.es	9a7ef16f9c	implement several changes in top-n connection report item	2024-01-08 17:31:52 +01:00
Daniel Maya	b80bfa2799	#12624 change of style in dialog 2	2024-01-04 15:39:27 +01:00
Daniel Cebrian	22baa45387	#12537 new icons for notifications	2024-01-03 11:39:15 +01:00
Daniel Maya	cb29cdb764	#12624 change of style in dialog	2024-01-03 11:32:41 +01:00
Daniel Cebrian	0627ea07cd	#12503 changed unique ip in agent	2023-12-29 13:43:28 +01:00
Daniel Cebrian	e29181c1d5	#12706 fixed line break	2023-12-26 12:10:55 +01:00
Jonathan	d16f8e6893	#12666 fix events severity color for firefox	2023-12-21 10:22:32 +01:00
Jonathan	a21b332b1d	#12391 sunburst widget fix style	2023-12-19 12:57:13 +01:00
daniel	855fc32a7d	Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo ... Conflicts: pandora_console/include/javascript/pandora.js pandora_console/include/styles/pandora.css	2023-12-19 09:39:24 +01:00
Rafael Ameijeiras	a4eed65758	Merge branch 'ent-12200-huevo-de-pascua-efecto-nieve' into 'develop' ... Ent 12200 huevo de pascua efecto nieve See merge request artica/pandorafms!6675	2023-12-19 07:56:55 +00:00
Rafael Ameijeiras	e86132a89d	Merge branch 'ent-12456-dashboard-widgert-colmena-de-agentes-agent-hive-se-ve-con-con-OS-description-largos' into 'develop' ... Ent 12456 dashboard widgert colmena de agentes agent hive se ve con con os description largos See merge request artica/pandorafms!6669	2023-12-18 14:52:02 +00:00
Daniel Maya	0ac20717f1	#12200 resolved conflict	2023-12-18 13:15:42 +01:00
daniel	8aeee6d876	Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo	2023-12-18 11:15:18 +01:00
Rafael Ameijeiras	3dd082c60f	Merge branch 'ent-12647-salto-de-linea-en-nombre-de-evento' into 'develop' ... Ent 12647 Salto de linea en nombre de evento See merge request artica/pandorafms!6777	2023-12-18 07:52:31 +00:00
Daniel Maya	e6981fb436	#12456 Fixed os text style	2023-12-15 12:59:56 +01:00
Daniel Cebrian	8df792f11b	#12571 custom graphs refactored	2023-12-15 10:41:21 +01:00
Daniel Rodriguez	3fe41179e0	Merge branch 'ent-12216-Entradas-fantasma-para-elementos-de-discovery-offline' into 'develop' ... Ent 12216 entradas fantasma para elementos de discovery offline See merge request artica/pandorafms!6740	2023-12-15 09:22:10 +00:00
Daniel Cebrian	67ffe8627b	#12647 fixed line break in event list	2023-12-14 19:08:34 +01:00
daniel	2890fd3dab	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-14 11:05:29 +01:00
Jonathan	065b096f14	#12366 user list 5 users bug styles	2023-12-14 10:03:58 +01:00
Rafael Ameijeiras	e71a104e74	Merge branch 'ent-12566-mejoras-en-visualizacion-de-eventos' into 'develop' ... Draft: Ent 12566 Mejoras en visualización de eventos See merge request artica/pandorafms!6735	2023-12-14 08:57:44 +00:00
Rafael Ameijeiras	d5b3bd1c02	Merge branch 'ent-12483-varios-bugs-en-la-vista-de-campos-personalizados' into 'develop' ... Ent 12483 varios bugs en la vista de campos personalizados See merge request artica/pandorafms!6689	2023-12-14 08:42:02 +00:00
Jonathan	53b56b31af	Merge branch 'develop' into ent-8365-ncm-fase-3	2023-12-14 08:38:52 +01:00
Daniel Cebrian	fed0d92805	#12566 fixed colums module_custom_id and event_custom_id length_	2023-12-13 19:53:14 +01:00
Rafael Ameijeiras	f4fdacb791	Merge branch 'ent-12381-bugs-visuales-al-editar-modulo-en-politicas' into 'develop' ... Ent 12381 bugs visuales al editar modulo en politicas See merge request artica/pandorafms!6637	2023-12-13 14:40:32 +00:00
Jonathan	a750e6010d	Merge branch 'develop' into ent-12381-bugs-visuales-al-editar-modulo-en-politicas	2023-12-13 14:46:36 +01:00
Matias Didier	5d9f50fb05	Merge branch 'ent-12270-paginacion-de-widgets-hace-que-me-quepan-en-pantalla' into 'develop' ... Ent 12270 paginacion de widgets hace que me quepan en pantalla See merge request artica/pandorafms!6586	2023-12-13 13:29:15 +00:00
alejandro.campos@artica.es	29260473fc	fix missing fields	2023-12-13 13:29:48 +01:00
Rafael Ameijeiras	a5c5e07565	Merge branch 'ent-12065-faltan-opciones-al-abrir-consola-visual-en-la-vista-de-eventos' into 'develop' ... Ent 12065 faltan opciones al abrir consola visual en la vista de eventos See merge request artica/pandorafms!6454	2023-12-13 12:19:25 +00:00
Jonathan	88784de3ef	#12143 fix datepicker dashboard widget hardening	2023-12-13 13:03:08 +01:00
Jonathan	5fa9cd5877	Merge branches 'develop' and 'ent-8365-ncm-fase-3' of brutus.artica.es:artica/pandorafms into ent-8365-ncm-fase-3	2023-12-13 11:19:32 +01:00
daniel	cc12c77008	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-13 10:39:48 +01:00
miguel angel rasteu	a3feac4f2e	#12065 Resolve conflicts	2023-12-13 08:32:12 +01:00
Jonathan	5279bb3e17	Merge branch 'develop' into ent-12296-mejorar-aspecto-filtros-de-busqueda-en-la-vista-principal-de-agentes	2023-12-13 08:24:43 +01:00
Daniel Cebrian	1a9bdf97d1	#12566 changes in view events	2023-12-11 17:01:40 +01:00
Jonathan	28dc5cada0	#12596 new dialog on baner open version	2023-12-11 12:21:33 +01: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
Jonathan	78bb8e0bae	#8365 ix merge conflict	2023-12-07 10:58:45 +01:00
Jorge Rincon	abfa08b6e0	#12577 fixed visual error of the dynamic threshold ff threshold and cron from module containers	2023-12-07 10:25:11 +01:00
alejandro.campos@artica.es	457f8e9448	some changes in discovery	2023-12-05 16:07:14 +01:00
alejandro.campos@artica.es	60137eb300	changes in discovery extensions	2023-12-05 11:32:19 +01:00
miguel angel rasteu	6455314f0c	Merge branch 'develop' into ent-11494-nuevo-widget-service-level-detail	2023-12-05 11:16:42 +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
Rafael Ameijeiras	38672764a3	Merge branch 'ent-12341-agent-basic-options' into 'develop' ... Ent 12341 agent basic options See merge request artica/pandorafms!6681	2023-12-04 08:12:23 +00:00
Rafael Ameijeiras	fdb58daf2d	Merge branch 'ent-12247-vistas-tacticas-de-seguridad-fase-2-vulnerabilidades-y-hardening' into 'develop' ... Ent 12247 Vistas tácticas de seguridad fase 2 (vulnerabilidades y hardening) See merge request artica/pandorafms!6707	2023-12-04 08:11:03 +00:00
Jonathan	1fb98d34ae	#12296 fix conflict merge develop	2023-12-01 11:59:03 +01:00
Jonathan	e2eaf6e01e	#12381 fix conflict merge develop	2023-12-01 11:22:15 +01:00
miguel angel rasteu	41b92cc55f	Merge branch 'develop' into ent-11494-nuevo-widget-service-level-detail	2023-12-01 10:34:43 +01:00
miguel angel rasteu	ec8d16e49b	#11652 Resolve conflicts	2023-12-01 10:07:41 +01:00
Daniel Maya	e4b369c769	Merge branch 'develop' into ent-12495-volver-al-comportamiento-anterior-en-temas-de-permisos-politicas-10894	2023-11-30 13:30:29 +01:00
Daniel Maya	6154ce725b	#12501 Fixed password field	2023-11-30 13:18:44 +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
Jonathan	1fc2c432e5	Merge branch 'develop' into ent-12341-agent-basic-options	2023-11-30 09:14:35 +01:00
Jonathan	b99c9240de	#8365 NCM Merge conflict	2023-11-30 08:32:15 +01:00
Daniel Maya	0d285802b1	#12520 Fixed form	2023-11-29 15:32:46 +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
miguel angel rasteu	d096f3f9ea	Merge branch 'develop' into ent-11494-nuevo-widget-service-level-detail	2023-11-29 08:44:08 +01:00
Daniel Cebrian	4d1df2dcc5	#12247 refactored vulnerabilities and hardening	2023-11-28 16:59:04 +01:00
Jonathan	837f1ff73c	Merge branch 'develop' into ent-8365-ncm-fase-3	2023-11-28 13:04:13 +01:00
Jonathan	30fd521cb7	Merge branch 'develop' into ent-12341-agent-basic-options	2023-11-28 09:32:59 +01:00
Matias Didier	44aff84d9e	Merge branch 'ent-11699-filtro-paradas-planificadas-con-fondo-blanco-en-black-theme-en-v772lts' into 'develop' ... Ent 11699 filtro paradas planificadas con fondo blanco en black theme en v772lts See merge request artica/pandorafms!6253	2023-11-28 08:22:29 +00: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
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
Jonathan	def169abb8	Merge branch 'develop' into ent-8365-ncm-fase-3	2023-11-28 07:58:50 +01:00
Rafael Ameijeiras	e3153166c1	Merge branch 'ent-11856-view-events-ubicacion-erronea-para-el-tip-del-token-search-in-secondary-groups' into 'develop' ... Ent 11856 view events ubicacion erronea para el tip del token search in secondary groups See merge request artica/pandorafms!6388	2023-11-27 14:48:24 +00:00
Rafael Ameijeiras	6e46875721	Merge branch 'ent-12208-desplegable-styles-de-widget-panel-with-a-message' into 'develop' ... Ent 12208 desplegable styles de widget panel with a message See merge request artica/pandorafms!6549	2023-11-27 14:39:38 +00:00
Matias Didier	9919de1d66	Merge branch 'ent-11026-si-el-token-automatically-check-for-updates-esta-desactivado-no-debe-mostrar-aviso-para' into 'develop' ... Ent 11026 si el token automatically check for updates esta desactivado no debe mostrar aviso para See merge request artica/pandorafms!6392	2023-11-27 12:24:45 +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
Rafael Ameijeiras	95cf2a2654	Merge branch 'ent-12268-dashboard-widget-de-eventos-no-se-puede-clickar' into 'develop' ... Ent 12268 dashboard widget de eventos no se puede clickar See merge request artica/pandorafms!6620	2023-11-27 12:05:52 +00:00
miguel angel rasteu	cac31cc482	#12137 Resolve conflicts	2023-11-27 13:05:43 +01:00
Rafael Ameijeiras	8865f0394e	Merge branch 'ent-12218-bug-del-boton-show-hide-password-de-usuarios' into 'develop' ... Ent 12218 bug del boton show hide password de usuarios See merge request artica/pandorafms!6553	2023-11-27 12:00:28 +00:00
Rafael Ameijeiras	c3af86414f	Merge branch 'ent-11650-aviso-emergente-no-acorde-con-la-nueva-interfaz' into 'develop' ... Ent 11650 aviso emergente no acorde con la nueva interfaz See merge request artica/pandorafms!6395	2023-11-27 11:56:57 +00:00
Rafael Ameijeiras	081e0c5482	Merge branch 'ent-12271-ventana-informativa-de-configuracion-de-widget-esta-pocha' into 'develop' ... Ent 12271 ventana informativa de configuracion de widget esta pocha See merge request artica/pandorafms!6583	2023-11-27 11:56:32 +00:00
Rafael Ameijeiras	47a0c8e956	Merge branch 'ent-11442-consejos-de-bienvenida-tienen-controles-confusos' into 'develop' ... Ent 11442 consejos de bienvenida tienen controles confusos See merge request artica/pandorafms!6414	2023-11-27 10:47:18 +00:00
Rafael Ameijeiras	ad8e3ac44f	Merge branch 'ent-11436-envio-de-correo-electronico-con-advertencia-a-pesar-de-ya-haber-cambiado-la-configuracion' into 'develop' ... Ent 11436 envio de correo electronico con advertencia a pesar de ya haber cambiado la configuracion See merge request artica/pandorafms!6464	2023-11-27 10:40:19 +00:00
Rafael Ameijeiras	368155fa99	Merge branch 'ent-11077-arreglar-espaciado-en-la-informacion-de-modulos-widget-tree-view' into 'develop' ... Ent 11077 arreglar espaciado en la informacion de modulos widget tree view See merge request artica/pandorafms!6390	2023-11-27 10:34:31 +00:00
Rafael Ameijeiras	48c459e768	Merge branch 'ent-12251-integracion-de-los-datos-de-seguridad-en-la-vista-ppal-de-agente' into 'develop' ... Ent 12251 Integracion de los datos de seguridad en la vista ppal de agente See merge request artica/pandorafms!6657	2023-11-27 10:30:43 +00:00
Matias Didier	174a22379e	Merge branch 'ent-11995-zoom-en-graficas-rompe-la-grafica' into 'develop' ... Ent 11995 zoom en graficas rompe la grafica See merge request artica/pandorafms!6423	2023-11-27 10:22:07 +00:00
Daniel Maya	6e67dc81ac	12495 Fixed buttons	2023-11-24 09:36:51 +01:00
daniel	b497e573fe	fix modal events sound bottom bar pandora_enterprise#12378	2023-11-23 14:18:29 +01:00
miguel angel rasteu	b8574cf689	#11494 Resolve conflicts	2023-11-23 08:24:15 +01:00
Jorge Rincon	b6582b7f7e	#12202 added Asteroids game	2023-11-22 13:30:44 +01:00
Daniel Maya	6fc6bead65	#12483 Fixed custom fields view	2023-11-21 16:17:41 +01:00
Jonathan	d1b2bf1ee2	Merge branch 'develop' into ent-11026-si-el-token-automatically-check-for-updates-esta-desactivado-no-debe-mostrar-aviso-para	2023-11-20 14:33:49 +01:00
miguel angel rasteu	89be9af98f	#11442 Fix conflicts	2023-11-17 12:33:33 +01:00