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

31380 Commits

Author SHA1 Message Date
Alejandro Campos a58bc3bf08 Merge branch 'develop' into 'ent-9430-2FA-Authentication-sigue-saltando-tras-deshabilitar-en-consola' 
# Conflicts:
#   pandora_console/general/register.php
 2022-10-27 09:47:49 +00:00
Daniel Maya 382e74ae36 resolved conflict 2022-10-27 09:42:40 +02:00
artica bf6f5479e8 Auto-updated build strings. 2022-10-27 01:00:24 +02:00
Daniel Rodriguez c98c58c157 Merge branch 'ent-9377-14016-inestabilidad-y-borrado-incorrecto-netflow' into 'develop' 
Fix pandoradb deleting old netflow data

See merge request artica/pandorafms!5055
 2022-10-26 12:39:50 +00:00
Jimmy Olano d9c5b59eff Merge branch 'ent-9630-Bug-en-codigo-de-functions-api-php' into 'develop' 
fix typo in code

Ref pandora_enterprise#9630

See merge request artica/pandorafms!5189
 2022-10-26 11:02:42 +00:00
Daniel Barbero 17889c51c1 new image pandora_enterprise#4822 2022-10-26 09:54:55 +02:00
Diego Muñoz-Reja 00a1e74473 Merge branch 'ent-9332-13917-fallos-al-autenticarse-con-ldap-cuando-tenemos-la-contrasena-encriptada' into 'develop' 
Fix entities ldap admin pass

See merge request artica/pandorafms!5217
 2022-10-26 07:53:31 +00:00
Daniel Barbero 3273fc23ed Merge remote-tracking branch 'origin/develop' into ent-4822-estado-de-consola-visual-mantenimiento 
Conflicts:
	pandora_console/extras/mr/58.sql
 2022-10-26 09:42:02 +02:00
artica b1c35e7385 Auto-updated build strings. 2022-10-26 01:00:24 +02:00
Calvo 36f58579be Fix entities ldap admin pass 2022-10-25 18:46:49 +02:00
Diego Muñoz-Reja ae5d558dba Merge branch 'ent-9332-13917-fallos-al-autenticarse-con-ldap-cuando-tenemos-la-contrasena-encriptada' into 'develop' 
Ent 9332 13917 fallos al autenticarse con ldap cuando tenemos la contrasena encriptada

See merge request artica/pandorafms!5216
 2022-10-25 16:20:36 +00:00
Calvo 406dac28c4 Merge remote-tracking branch 'origin/develop' into ent-9332-13917-fallos-al-autenticarse-con-ldap-cuando-tenemos-la-contrasena-encriptada 2022-10-25 17:38:31 +02:00
Calvo c2c62bae06 Fix missing parameter meta on event comments ajax 2022-10-25 17:37:56 +02:00
Daniel Rodriguez b4bf85064c Merge branch 'ent-9687-14398-ejecucion-de-codigo-en-barra-de-busqueda-de-modulos' into 'develop' 
Fix vulnerabilies

See merge request artica/pandorafms!5209
 2022-10-25 15:20:20 +00:00
Ramon Novoa d493eaea12 Query performance improvements in pandora_db. 2022-10-25 12:35:22 +02:00
Diego Muñoz-Reja a8902fed18 Merge branch 'ent-9316-bug-relacionado-con-los-permisos-en-ruta-de-log-tentacle' into 'develop' 
Update copies of the Tentacle Server. Small fixes.

See merge request artica/pandorafms!5187
 2022-10-25 09:26:47 +00:00
Daniel Rodriguez 8aa6ea8bc8 Merge branch 'ent-8725-lista-exclusion-passwords' into 'develop' 
Added exclude words for passwords control

See merge request artica/pandorafms!5174
 2022-10-25 09:07:08 +00:00
Daniel Rodriguez b6a38e1b7a Merge branch 'ent-9671-faltan-opciones-masivas-en-operaciones-con-eventos' into 'develop' 
event multiple operations pandora_enterprise#9671

See merge request artica/pandorafms!5203
 2022-10-25 09:05:43 +00:00
jose.gonzalez@pandorafms.com 6b1906d178 Added control for user creation 2022-10-25 09:37:49 +02:00
artica ce4fc25209 Auto-updated build strings. 2022-10-25 01:00:22 +02:00
Diego Muñoz-Reja aff8fdb005 Merge branch 'ent-9425-agrupar-eventos-por-id_extra' into 'develop' 
new group by events for extraid pandora_enterprise#9425

See merge request artica/pandorafms!5147
 2022-10-24 15:19:21 +00:00
Calvo 183d1ae120 Fix vulnerabilies 2022-10-24 16:44:10 +02:00
Daniel Maya 06967ad5d9 #5584 added in metaconsole 2022-10-24 12:03:18 +02:00
Diego Muñoz-Reja e3ed91604b Merge branch 'ent-9695-error-php7-en-dashboards' into 'develop' 
fix error types php7.2 pandora_enterprise#9695

See merge request artica/pandorafms!5207
 2022-10-24 07:48:41 +00:00
Daniel Barbero 821bdf16da fix error types php7.2 pandora_enterprise#9695 2022-10-24 09:26:22 +02:00
artica 204d711b30 Auto-updated build strings. 2022-10-24 01:00:19 +02:00
artica bd0f136dc0 Auto-updated build strings. 2022-10-23 01:00:17 +02:00
artica 4118f7656b Auto-updated build strings. 2022-10-22 01:00:24 +02:00
Jimmy Olano d6ae6d5dbb Merge branch 'ent-9468-bug-vista-de-omnishell-boton-refresh-y-estilos' into 'develop' 
Fix style issue

pandora_enterprise#9468

See merge request artica/pandorafms!5123
 2022-10-21 11:48:11 +00:00
Diego Muñoz-Reja 3f37e2556c Merge branch 'ent-9457-14121-llamadas-api-no-funcionan-con-usuario-ldap-con-login-error' into 'develop' 
API and LDAP remote user fix with login error fix

See merge request artica/pandorafms!5135
 2022-10-21 11:24:31 +00:00
Daniel Rodriguez f57876b332 Merge branch 'ent-9591-mejoras-vista-administracion-agentes-satellite' into 'develop' 
Ent 9591 mejoras vista administracion agentes satellite

See merge request artica/pandorafms!5190
 2022-10-21 11:09:21 +00:00
Daniel Rodriguez a3dc8be0e5 Merge branch 'ent-9254-13891-encriptar-contrasenas-en-replicacion-de-bbdd' into 'develop' 
Ent 9254 13891 encriptar contrasenas en replicacion de bbdd

See merge request artica/pandorafms!5140
 2022-10-21 10:42:16 +00:00
Diego Muñoz-Reja 92c01531e7 Merge branch 'ent-9178-13815-alto-tiempo-de-espera-si-el-ldap-secundario-no-esta-disponible' into 'develop' 
Added ldap timeout

See merge request artica/pandorafms!5134
 2022-10-21 10:28:04 +00:00
Diego Muñoz-Reja 423d4b8763 Merge branch 'ent-9641-mejorar-heatmaps' into 'develop' 
Ent 9641 mejorar heatmaps

See merge request artica/pandorafms!5196
 2022-10-21 09:29:40 +00:00
Daniel Rodriguez be7a5add28 Merge branch 'ent-9460-14121-Reducir-permisos-necesarios-para-set-module-data' into 'develop' 
change permissions

See merge request artica/pandorafms!5127
 2022-10-21 09:27:47 +00:00
Daniel Rodriguez 77cb8be6cc Merge branch 'ent-2190-filtros-en-migracion-de-agentes-metaconsola' into 'develop' 
Added id to form on html print form grid

See merge request artica/pandorafms!5181
 2022-10-21 09:26:26 +00:00
José González 984fd10897 Merge branch 'develop' into 'ent-8725-lista-exclusion-passwords' 
# Conflicts:
#   pandora_console/include/auth/mysql.php
 2022-10-21 06:44:47 +00:00
artica e31699eed7 Auto-updated build strings. 2022-10-21 01:00:25 +02:00
Daniel Rodriguez ee0d9d92b6 Merge branch 'ent-9665-usuario-con-perfil-pandora-administrator-no-debe-poder-crear-comandos-de-alertas' into 'develop' 
Ent 9665 usuario con perfil pandora administrator no debe poder crear comandos de alertas

See merge request artica/pandorafms!5200
 2022-10-20 13:42:15 +00:00
Daniel Rodriguez 60a76530e0 Merge branch 'ent-9648-Notificaciones-por-defecto-en-creación-de-usuario' into 'develop' 
Added control for add the notifications by default to users

See merge request artica/pandorafms!5195
 2022-10-20 13:41:28 +00:00
Diego Muñoz-Reja 9bb8d4cc8b Merge branch 'ent-9166-13760-guardia-usuario-no-ve-vista-ncm' into 'develop' 
Fix ACL for ncm

See merge request artica/pandorafms!4966
 2022-10-20 13:02:54 +00:00
Jimmy Olano a276eb4dba Merge branch 'ent-9592-Problema-de-seguridad-con-la-gestion-de-sesiones-Limited-Authentication-bypass-in-ajax-php' into 'develop' 
fixed vulnerability

Ref pandora_enterprise#9592

See merge request artica/pandorafms!5176
 2022-10-20 12:10:59 +00:00
Calvo 2d71c75405 Added title to printFormAsGrid 2022-10-20 13:42:08 +02:00
Daniel Maya 89bd5ec22c #9665 Fixed button 2 2022-10-20 10:42:27 +02:00
Daniel Rodriguez 6657052308 Merge branch 'ent-9631-14357-No-se-guardan-los-cambios-en-Setup-Setup-Performance' into 'develop' 
fix several problems in history db settings

See merge request artica/pandorafms!5188
 2022-10-20 07:21:11 +00:00
Daniel Rodriguez 45722e9aa4 Merge branch 'ent-9612-PDF-informes-de-inventario-no-se-adapta-al-texto-y-es-ilegible' into 'develop' 
workaround to avoid visual issue in PDFs

See merge request artica/pandorafms!5183
 2022-10-20 07:19:26 +00:00
Daniel Rodriguez 35fcfa275f Merge branch 'ent-9117-diferencia-de-estilos-en-mouseovers-del-tree-view-de-servicios' into 'develop' 
Ent 9117 diferencia de estilos en mouseovers del tree view de servicios

See merge request artica/pandorafms!5185
 2022-10-20 07:13:39 +00:00
artica 61b3bc724a Auto-updated build strings. 2022-10-20 01:00:21 +02:00
alejandro.campos@artica.es 17a87392e3 minor fix 2022-10-19 18:38:27 +02:00
alejandro.campos@artica.es f87737a093 minor fix 2022-10-19 17:07:22 +02:00