19345 Commits

Author	SHA1	Message	Date
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
artica	449d9fe3cb	Auto-updated build strings.	2023-08-09 01:00:45 +02:00
Matias Didier	16513cf52d	Merge branch 'ent-10071-14719-Comprobacion-estado-previo-del-agente-ante-paradas-planificadas' into 'develop' ... Ent 10071 14719 comprobacion estado previo del agente ante paradas planificadas See merge request artica/pandorafms!6319	2023-08-08 10:29:36 +00:00
artica	96710ed03f	Auto-updated build strings.	2023-08-08 01:00:43 +02:00
alejandro.campos@artica.es	a4e186ae84	preserve previous disabled or quiet condition when downtime is over	2023-08-07 17:04:48 +02:00
alejandro.campos@artica.es	68525f0a12	preserve previous disabled or quiet condition when downtime is over	2023-08-07 17:03:25 +02:00
Matias Didier	4e926e3076	Merge branch 'ent-10147-login-nodo-tarda' into 'develop' ... Ent 10147 login nodo tarda See merge request artica/pandorafms!6315	2023-08-07 08:49:43 +00:00
Rafael Ameijeiras	752878fdeb	Merge branch 'ent-9558-derivado-del-trabajo-q-a-765-error-en-metaconsola-parama-para-el-fichero-de-imagen' into 'develop' ... Ent 9558 derivado del trabajo q a 765 error en metaconsola parama para el fichero de imagen See merge request artica/pandorafms!6306	2023-08-07 07:27:50 +00:00
artica	5e588736ff	Auto-updated build strings.	2023-08-07 01:00:15 +02:00
artica	cb15459cb3	Auto-updated build strings.	2023-08-06 01:00:07 +02:00
artica	99317de9cf	Auto-updated build strings.	2023-08-05 01:00:37 +02:00
Daniel Maya	0534f59f92	#10147 optimize group search	2023-08-04 15:08:57 +02:00
Jonathan	774ab78a5b	#11836 fix style pandora.css fonts	2023-08-04 13:24:23 +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	246b4f9765	Merge branch 'ent-11694-15885-perdida-visibilidad-modulos-por-timeticks' into 'develop' ... Ent 11694 15885 perdida visibilidad modulos por timeticks See merge request artica/pandorafms!6214	2023-08-04 09:36:08 +00:00
Rafael Ameijeiras	019efcb124	Merge branch 'ent-11668-noticias-en-consola-tienen-fondo-blanco-en-tema-oscuro' into 'develop' ... Ent 11668 noticias en consola tienen fondo blanco en tema oscuro See merge request artica/pandorafms!6182	2023-08-04 06:45:42 +00:00
Rafael Ameijeiras	3698eac497	Merge branch 'ent-11772-corregir-color-del-icono-de-netflow-server-en-listado-de-servidores' into 'develop' ... Ent 11772 corregir color del icono de netflow server en listado de servidores See merge request artica/pandorafms!6295	2023-08-04 06:44:12 +00:00
Rafael Ameijeiras	298afeebe3	Merge branch 'ent-11709-funcionamiento-erroneo-de-los-botones-de-accion-de-la-tarea-backup-pandora-database-y-execute' into 'develop' ... Ent 11709 funcionamiento erroneo de los botones de accion de la tarea backup pandora database y execute See merge request artica/pandorafms!6232	2023-08-04 06:42:01 +00:00
Rafael Ameijeiras	b2821c0db3	Merge branch 'ent-11713-bugs-de-visualizacion-de-los-botones-de-accion-en-metaconsola-y-consola' into 'develop' ... Ent 11713 bugs de visualizacion de los botones de accion en metaconsola y consola See merge request artica/pandorafms!6249	2023-08-04 06:34:35 +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
artica	eb104dd2e4	Auto-updated build strings.	2023-08-04 01:00:26 +02:00
Jonathan	8040c6923e	#11709 add confirm on delete cron task	2023-08-03 14:15:08 +02:00
miguel angel rasteu	c2cdbcce1b	#11668 Fix black theme	2023-08-03 13:45:31 +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	135c6835bd	#11713 fix title buttons	2023-08-03 12:51:09 +02:00
miguel angel rasteu	1dc24cdfb4	#11668 Fix black theme	2023-08-03 12:22:20 +02:00
Daniel Maya	59ef20e214	#11739 Fixed date_format	2023-08-03 10:56:28 +02:00
miguel angel rasteu	2ced051f56	#11668 Fix modal	2023-08-03 09:43:06 +02:00
Rafael Ameijeiras	a653c0e2e7	Merge branch 'ent-9866-visualizacion-completa-de-notificaciones-en-metaconsola' into 'develop' ... Ent 9866 visualizacion completa de notificaciones en metaconsola See merge request artica/pandorafms!6170	2023-08-03 07:03:47 +00:00
Pablo Aragon	413528146b	9558-Fix background url html_print_autocomplete_modules()	2023-08-03 08:25:38 +02:00
artica	ab0fda5a5d	Auto-updated build strings.	2023-08-03 01:00:42 +02:00
miguel angel rasteu	fddc709aee	#11219 Fix transaltes	2023-08-02 14:48:02 +02:00
Rafael Ameijeiras	507c91ab1e	Merge branch 'ent-11683-faltan-opciones-en-las-listas-de-dias-especiales' into 'develop' ... Ent 11683 Faltan opciones en las listas de días especiales See merge request artica/pandorafms!6221	2023-08-02 12:01:07 +00:00
Rafael Ameijeiras	b23397ef82	Merge branch 'ent-11707-iconos-de-modulos-en-tree-view-estan-pegados-al-texto' into 'develop' ... Ent 11707 iconos de modulos en tree view estan pegados al texto See merge request artica/pandorafms!6229	2023-08-02 11:43:31 +00:00
Rafael Ameijeiras	e6eee88a63	Merge branch 'ent-11377-users-bulk-operations-usuarios-con-perfil-x-anadido-no-aparecen-al-intentar-borrar-perfil' into 'develop' ... Ent 11377 users bulk operations usuarios con perfil x anadido no aparecen al intentar borrar perfil See merge request artica/pandorafms!6010	2023-08-02 10:42:36 +00:00
Rafael Ameijeiras	d96977b883	Merge branch 'ent-10562-Nueva-vista-de-detalle-de-alertas-encoladas' into 'develop' ... Ent 10562 nueva vista de detalle de alertas encoladas See merge request artica/pandorafms!6273	2023-08-02 08:26:50 +00:00
Rafael Ameijeiras	25b2532c7a	Merge branch 'ent-11777-API-add-event-comment-se-ha-roto-cambios-tevent-comment' into 'develop' ... fixed api call See merge request artica/pandorafms!6288	2023-08-02 08:26:10 +00:00
Daniel Maya	ae22b99835	Merge branch 'develop' into ent-11739-compatibilidad-php-8-2-second	2023-08-02 09:10:04 +02:00
artica	d3fdb28d05	Auto-updated build strings.	2023-08-02 01:00:29 +02:00
Daniel Maya	aef7f0edd0	#11739 Fixed deprecated functions 4	2023-08-01 14:51:31 +02:00
alejandro.campos@artica.es	700bb53df4	implemented pending alerts list for event server	2023-08-01 14:37:16 +02:00
Rafael Ameijeiras	b052711c92	Merge branch 'ent-11697-arreglar-menu-sin-click-to-display' into 'develop' ... Draft: Ent 11697 arreglar menu sin click to display See merge request artica/pandorafms!6230	2023-08-01 12:32:37 +00:00
Jonathan	3b38824ca7	#11697 arrow left menu collapse	2023-08-01 13:06:43 +02:00
Daniel Maya	0d321f5311	#11739 Fixed deprecated functions 3	2023-08-01 11:19:04 +02:00
artica	dcb9f89b5d	Auto-updated build strings.	2023-08-01 01:00:44 +02:00
Rafael Ameijeiras	f65a4ddca9	Merge branch 'ent-11755-netflow-live-view-tipo-summary-no-muestra-grafica-al-usar-aggregated-by-ports' into 'develop' ... Ent 11755 netflow live view tipo summary no muestra grafica al usar aggregated by ports See merge request artica/pandorafms!6279	2023-07-31 13:11:34 +00: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	02bf721e39	Merge branch 'ent-11751-15966-metaconsola-no-se-exportan-los-eventos-a-csv' into 'develop' ... Ent 11751 15966 metaconsola no se exportan los eventos a csv See merge request artica/pandorafms!6269	2023-07-31 13:04:24 +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
miguel angel rasteu	ded7bb1017	#11751 Fix reset	2023-07-31 11:49:29 +02:00