Daniel Rodriguez
|
41946bfda7
|
Merge branch 'ent-4822-estado-de-consola-visual-mantenimiento' into 'develop'
add mode maintenance VC pandora_enterprise#4822
See merge request artica/pandorafms!5191
|
2022-10-31 10:02:44 +00:00 |
|
Rafael Ameijeiras
|
aae620c407
|
Merge branch 'ent-9728-definit-php-8-por-defecto-en-las-instalaciones-online' into 'develop'
9728 set php8 by default
See merge request artica/pandorafms!5232
|
2022-10-31 08:28:14 +00:00 |
|
artica
|
1288a3c00b
|
Auto-updated build strings.
|
2022-10-31 01:00:17 +01:00 |
|
artica
|
c1290bd7d0
|
Auto-updated build strings.
|
2022-10-30 01:00:19 +02:00 |
|
rafael
|
8af1d6dd98
|
9728 set php8 by default
|
2022-10-29 07:07:34 +02:00 |
|
artica
|
0eb3c12cd9
|
Auto-updated build strings.
|
2022-10-29 01:00:22 +02:00 |
|
Jimmy Olano
|
15955d2329
|
Merge branch 'ent-5584-9778-nuevo-editor-masivo-de-usuarios-meta-y-nodo-post' into 'develop'
Ent 5584 9778 nuevo editor masivo de usuarios meta y nodo post
https://brutus.artica.es:8081/artica/pandora_enterprise/-/issues/5584
See merge request artica/pandorafms!5153
|
2022-10-28 15:18:15 +00:00 |
|
Jimmy Olano
|
af73da2291
|
Merge branch 'ent-4043-proyectos-banco-de-credenciales-contrasenas-para-modulos' into 'develop'
Ent 4043 proyectos banco de credenciales contrasenas para modulos
https://brutus.artica.es:8081/artica/pandora_enterprise/-/issues/4043
See merge request artica/pandorafms!5172
|
2022-10-28 14:00:46 +00:00 |
|
Jimmy Olano
|
4594fb17e2
|
Merge branch 'ent-9500-cli-en-la-metaconsola-no-se-sicnroniza-con-los-nodos' into 'develop'
synch cli with nodes pandora_enterprise#9500
pandora_enterprise#9500
See merge request artica/pandorafms!5198
|
2022-10-28 01:30:22 +00:00 |
|
artica
|
0da1247d68
|
Auto-updated build strings.
|
2022-10-28 01:00:26 +02:00 |
|
Daniel Rodriguez
|
0f82209d7e
|
Merge branch 'ent-9430-2FA-Authentication-sigue-saltando-tras-deshabilitar-en-consola' into 'develop'
fixes in double auth
See merge request artica/pandorafms!5133
|
2022-10-27 12:06:23 +00:00 |
|
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 |
|
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 |
|