tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
36,826 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

36826 Commits

Author SHA1 Message Date
Daniel Cebrian c22525febc #12569 fixed actions credential boxes 2023-12-04 16:54:14 +01:00
Daniel Cebrian 24c8e606f4 #12569 fixed button credential boxes 2023-11-30 16:29:18 +01:00
Rafael Ameijeiras b0b05a833d Merge branch 'ent-12495-volver-al-comportamiento-anterior-en-temas-de-permisos-politicas-10894' into 'develop' 
Ent 12495 volver al comportamiento anterior en temas de permisos politicas 10894

See merge request artica/pandorafms!6700
 2023-11-30 15:11:38 +00:00
Diego Muñoz-Reja 6cde922505 Merge branch 'ent-11681-15856-duplicidad-de-informacion-en-db-con-elementos-de-servicio-con-un-mismo-padre' into 'develop' 
change service modules async to generic pandora_enterprise#11681

See merge request artica/pandorafms!6654
 2023-11-30 14:03:07 +00:00
Matias Didier 874e60bf55 Merge branch 'ent-12248-mover-token-de-configuracion-s-flow-a-la-seccion-de-netflow' into 'develop' 
Ent 12248 mover token de configuracion s flow a la seccion de netflow

See merge request artica/pandorafms!6621
 2023-11-30 13:05:46 +00:00
Diego Muñoz-Reja c4e5a3bebd Merge branch 'ent-12088-colocar-enlace-de-la-consola-web-en-mensaje-del-correo-electronico-cuando-no-se-tenga-acceso' into 'develop' 
Ent 12088 colocar enlace de la consola web en mensaje del correo electronico cuando no se tenga acceso

See merge request artica/pandorafms!6501
 2023-11-30 12:48:00 +00: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
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
daniel 75606f679e Merge remote-tracking branch 'origin/develop' into ent-11681-15856-duplicidad-de-informacion-en-db-con-elementos-de-servicio-con-un-mismo-padre 
Conflicts:
	pandora_console/extras/mr/67.sql
 2023-11-30 11:27:20 +01:00
Rafael Ameijeiras 6a998c79ae Merge branch 'ent-12095-correlacion-de-alertas-con-field-event-user-comment-no-funciona-adecuadamente' into 'develop' 
Ent 12095 correlacion de alertas con field event user comment no funciona adecuadamente

See merge request artica/pandorafms!6639
 2023-11-30 09:24:33 +00:00
Rafael Ameijeiras 57a9e6b3bf Merge branch 'ent-12188-script-mode-de-plugins-de-inventario-no-esta-funcionando' into 'develop' 
add code lost inventory server pandora_enterprise#12188

See merge request artica/pandorafms!6667
 2023-11-30 09:23:33 +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
Rafael Ameijeiras 0957a87dcb Merge branch 'ent-11705-15916-campo-editable-en-vista-de-eventos' into 'develop' 
Ent 11705 15916 campo editable en vista de eventos

See merge request artica/pandorafms!6486
 2023-11-30 09:18:28 +00:00
Rafael Ameijeiras 98d414f262 Merge branch 'ent-10983-selector-de-rango-de-fechas-para-multiples-elementos-a-la-vez-en-dashboards' into 'develop' 
Ent 10983 Selector de rango de fechas para múltiples elementos a la vez en dashboards

See merge request artica/pandorafms!6413
 2023-11-30 08:58:15 +00:00
Jonathan 75d57337af #11705 Fix merge conflict 2023-11-30 08:10:32 +01:00
artica 9d1e4b47ab Auto-updated build strings. 2023-11-30 01:00:25 +01:00
Daniel Rodriguez 7f4a928f35 Merge branch 'ent-12243-no-funciona-integracion-pandora-pitsm-a-nivel-usuario' into 'develop' 
Hide test button and setup in ITSM pandora_enterprise#12243

See merge request artica/pandorafms!6629
 2023-11-29 17:52:26 +00:00
Daniel Cebrian c0218ad75c Merge branch 'develop' into ent-10983-selector-de-rango-de-fechas-para-multiples-elementos-a-la-vez-en-dashboards 2023-11-29 15:45:07 +01:00
Daniel Maya 544997d30c Merge branch 'develop' into ent-12095-correlacion-de-alertas-con-field-event-user-comment-no-funciona-adecuadamente 2023-11-29 15:44:04 +01:00
Diego Muñoz-Reja eebab43e36 Merge branch 'ent-11907-incluir-distro-y-version-en-about-y-diagnostic-info' into 'develop' 
Ent 11907 incluir distro y version en about y diagnostic info

See merge request artica/pandorafms!6420
 2023-11-29 14:34:05 +00:00
Rafael Ameijeiras e46fc163a9 Merge branch 'ent-12451-nuevas-alertas-por-defecto-de-Telegram-y-Vonage-con-mensaje-erroneo' into 'develop' 
Ent 12451 nuevas alertas por defecto de telegram y vonage con mensaje erroneo

See merge request artica/pandorafms!6664
 2023-11-29 14:27:28 +00: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
Rafael Ameijeiras 0ca92d7080 Merge branch 'ent-12250-informe-detallado-de-seguridad' into 'develop' 
Ent 12250 Informe detallado de seguridad

See merge request artica/pandorafms!6660
 2023-11-29 14:25:00 +00:00
Rafael Ameijeiras 33ca5ab4ab Merge branch 'ent-12424-aviso-en-thresholds-de-tipo-percentage-que-no-deberia-aparecer' into 'develop' 
Ent 12424 aviso en thresholds de tipo percentage que no deberia aparecer

See merge request artica/pandorafms!6651
 2023-11-29 14:23:32 +00:00
Rafael Ameijeiras 2e0d732eb9 Merge branch 'ent-12498-widget-top-n-of-agent-modules-no-muestra-resultados-de-todos-los-agentes' into 'develop' 
Ent 12498 Widget TOP N of Agent Modules no muestra resultados de TODOS los agentes

See merge request artica/pandorafms!6695
 2023-11-29 14:22:48 +00:00
daniel d2b6b098a3 fix inventory pandora_enterprise#12188 2023-11-29 11:38:19 +01:00
Matias Didier e7ad23c477 Merge branch 'ent-11127-poner-el-aviso-de-cantidad-de-modulos-en-cola-dinamico' into 'develop' 
Ent 11127 poner el aviso de cantidad de modulos en cola dinamico

See merge request artica/pandorafms!6489
 2023-11-29 09:30:08 +00:00
Matias Didier 9511d82692 Merge branch 'ent-11714-15928-pantalla-personalizada-del-usuario-error-al-establecer-link-externo-como-homescreen' into 'develop' 
Ent 11714 15928 pantalla personalizada del usuario error al establecer link externo como homescreen

See merge request artica/pandorafms!6250
 2023-11-29 09:29:43 +00:00
Matias Didier 22969eff6e Merge branch 'ent-11074-para-el-listado-de-plugin-registrados-falta-enlace-web-desde-nodo-registrado-hacia-metaconsola' into 'develop' 
Ent 11074 para el listado de plugin registrados falta enlace web desde nodo registrado hacia metaconsola

See merge request artica/pandorafms!6482
 2023-11-29 08:09:54 +00:00
artica 8378d7ef91 Auto-updated build strings. 2023-11-29 01:00:30 +01:00
Matias Didier 447e788ab3 Merge branch 'ent-12260-cuando-haces-el-cambio-de-grupo-en-un-agente-el-icono-se-queda-petado' into 'develop' 
Ent 12260 cuando haces el cambio de grupo en un agente el icono se queda petado

See merge request artica/pandorafms!6587
 2023-11-28 14:14:26 +00:00
Jorge Rincon faffada931 Merge branch 'develop' into ent-12451-nuevas-alertas-por-defecto-de-Telegram-y-Vonage-con-mensaje-erroneo 2023-11-28 15:10:02 +01:00
Rafael Ameijeiras 8b6a4733cf Merge branch 'ent-12253-informe-de-vulnerabilidades' into 'develop' 
Ent 12253 Informe de vulnerabilidades

See merge request artica/pandorafms!6686
 2023-11-28 11:14:48 +00:00
Alejandro Sánchez 41e2b36b13 Merge branch 'ent-12374-16517-cambio-en-discovery-oracle-3' into 'develop' 
re merge mr changes

See merge request artica/pandorafms!6708
 2023-11-28 10:04:12 +00:00
Matias Didier c8daeda489 Merge branch 'ent-12372-error-visual-al-acceder-configuracion-avanzada-remota-del-servidor' into 'develop' 
Ent 12372 error visual al acceder configuracion avanzada remota del servidor

See merge request artica/pandorafms!6662
 2023-11-28 10:01:01 +00:00
alejandro bb7c618528 re merge mr changes 2023-11-28 10:59:04 +01:00
Rafael Ameijeiras e5237aafe1 Merge branch 'ent-12517-cambiar-nombre-al-token-allow-all-ips' into 'develop' 
Ent 12517 Cambiar nombre al token "Allow all IPs"

See merge request artica/pandorafms!6696
 2023-11-28 09:58:44 +00:00
Matias Didier 8425e70740 Merge branch 'ent-12387-bug-edicion-item-agent-module-view' into 'develop' 
Ent 12387 bug edicion item agent module view

See merge request artica/pandorafms!6622
 2023-11-28 09:29:14 +00:00
Matias Didier c532bfc4c7 Merge branch 'ent-11832-Cambiar-artica.es-por-pandorafms.com-en-fichero-pandoradb_data.sql' into 'develop' 
Ent 11832 cambiar artica.es por pandorafms.com en fichero pandoradb data.sql

See merge request artica/pandorafms!6433
 2023-11-28 08:23:46 +00:00
Matias Didier bda55cc3a5 Merge branch 'ent-11894-editor-de-links-no-actualiza-la-pagina-al-crear-o-borrar-enlaces' into 'develop' 
Ent 11894 editor de links no actualiza la pagina al crear o borrar enlaces

See merge request artica/pandorafms!6373
 2023-11-28 08:22:37 +00: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
Jonathan 6e71cb8b7a Merge branch 'develop' into ent-12387-bug-edicion-item-agent-module-view 2023-11-28 09:03:49 +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
Jonathan 2dec31485a Merge branch 'develop' into ent-12424-aviso-en-thresholds-de-tipo-percentage-que-no-deberia-aparecer 2023-11-28 08:19:53 +01:00
Matias Didier 4dc84d58e3 Merge branch 'ent-12023-en-create-custom-report-al-seleccionar-write-access-no-aparece-lista-de-grupo' into 'develop' 
Ent 12023 en create custom report al seleccionar write access no aparece lista de grupo

See merge request artica/pandorafms!6460
 2023-11-28 07:12:51 +00:00
Matias Didier 3b2c5237d1 Merge branch 'ent-12036-error-en-el-nombre-de-la-copia-de-un-dashboard-cualquiera' into 'develop' 
Ent 12036 error en el nombre de la copia de un dashboard cualquiera

See merge request artica/pandorafms!6457
 2023-11-28 07:09:11 +00:00
Matias Didier b47b076cf1 Merge branch 'ent-1205-projection-graph-se-inventa-la-grafica-a-veces' into 'develop' 
Ent 1205 projection graph se inventa la grafica a veces

See merge request artica/pandorafms!6435
 2023-11-28 07:08:36 +00:00
Matias Didier 746eb298ea Merge branch 'ent-11831-literales-de-opciones-de-menu-no-coinciden' into 'develop' 
Ent 11831 literales de opciones de menu no coinciden

See merge request artica/pandorafms!6437
 2023-11-28 07:07:58 +00:00
Matias Didier 64cb2ad912 Merge branch 'ent-11911-welcome-dialog-no-detecta-bien-el-correo-configurado' into 'develop' 
Ent 11911 welcome dialog no detecta bien el correo configurado

See merge request artica/pandorafms!6440
 2023-11-28 07:07:26 +00:00