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

31619 Commits

Author SHA1 Message Date
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
edu.corral 4ed96e4a6e ent 7914 warning scaling 2022-10-21 13:53:25 +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
edu.corral 0f6f7b6563 ent 7914 status scaling based on time 2022-10-21 13:22:14 +02:00
edu.corral 0fd29caffe ent 7914 status scaling based on time 2022-10-21 13:10:12 +02: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 Barbero 688597a006 multiple external alert policies pandora_enterprise#8733 2022-10-20 16:42:26 +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
Ramon Novoa 9f12b09fbf Move .exe files to Fit LFS. 2022-10-20 12:16:26 +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
Ramon Novoa 478fcddd32 Fix the Omnishell timeout implementation. 2022-10-19 19:09:49 +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
alejandro.campos@artica.es 9520ce02e9 Merge branch 'ent-9592-Problema-de-seguridad-con-la-gestion-de-sesiones-Limited-Authentication-bypass-in-ajax-php' of brutus.artica.es:artica/pandorafms into ent-9592-Problema-de-seguridad-con-la-gestion-de-sesiones-Limited-Authentication-bypass-in-ajax-php 2022-10-19 16:46:31 +02:00
alejandro.campos@artica.es d707c29110 minor fix 2022-10-19 16:46:07 +02:00
Daniel Barbero 6ef3505eab event multiple operations pandora_enterprise#9671 2022-10-19 16:20:49 +02:00
Daniel Maya bfc1289ba6 #9105 Added collections satellite 2022-10-19 13:59:16 +02:00
Diego Muñoz-Reja c8e8ea61f3 Merge branch 'ent-2133-14061-recursividad-en-la-vista-de-eventos-accelya' into 'develop' 
filter recursive groups in events pandora_enterprise#2133

See merge request artica/pandorafms!5155
 2022-10-19 11:46:38 +00:00
Jimmy Olano aaedb39849 Merge branch 'ent-9392-no-funciona-insertar-agentes-en-paradas-planificadas' into 'develop' 
Fix planned downtime issues

Ref: pandora_enterprise#9392

See merge request artica/pandorafms!5166
 2022-10-19 11:00:04 +00:00
artica 95c485db38 Auto-updated build strings. 2022-10-19 01:00:22 +02:00
Calvo 11df57cd14 Fix planned downtime agent recursion bugs 2022-10-18 19:55:45 +02:00
Diego Muñoz-Reja 524b1f5314 Merge branch 'ent-9667-500-en-develop-con-php-7-2' into 'develop' 
minor fix 500 pandora_enterprise#9667

See merge request artica/pandorafms!5201
 2022-10-18 15:02:32 +00:00
Daniel Barbero f219a9678f minor fix 500 pandora_enterprise#9667 2022-10-18 16:55:05 +02:00
Daniel Barbero 82a3fc1063 Merge remote-tracking branch 'origin/develop' into ent-9500-cli-en-la-metaconsola-no-se-sicnroniza-con-los-nodos 
Conflicts:
	pandora_server/util/pandora_manage.pl
 2022-10-18 16:22:53 +02:00
Daniel Barbero e79394c235 synch cli with nodes pandora_enterprise#9500 2022-10-18 16:14:35 +02:00
Jimmy Olano 9d912c2a6d Merge branch 'ent-8956-derivado-del-trabajo-q-a-762-lts-cli-perl-al-crear-usuario-inserta-entidades-html-en' into 'develop' 
Ent 8956 derivado del trabajo q a 762 lts cli perl al crear usuario inserta entidades html en

#8956

https://brutus.artica.es:8081/artica/pandora_enterprise/-/issues/8956

See merge request artica/pandorafms!5163
 2022-10-18 13:35:09 +00:00
Diego Muñoz-Reja d86fd78b98 Merge branch 'ent-8620-copiando-a-grafana-3-grouped-meter-graphs-como-widget-en-dashboard' into 'develop' 
new widget grouped meter graphs pandora_enterprise#8620

See merge request artica/pandorafms!5179
 2022-10-18 13:10:26 +00:00
Daniel Barbero 4b3376057c Merge remote-tracking branch 'origin/develop' into ent-9500-cli-en-la-metaconsola-no-se-sicnroniza-con-los-nodos 2022-10-18 13:41:25 +02:00
Daniel Barbero 1acb67ecad fixed multi selector pandora_enterprise#8620 2022-10-18 13:40:09 +02:00