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

37792 Commits

Author SHA1 Message Date
Rafael Ameijeiras ccaa25da23 Merge branch 'ent-12657-mostrar-show-entries-de-eventos-de-menor-a-mayor' into 'develop' 
Ent 12657 mostrar show entries de eventos de menor a mayor

See merge request artica/pandorafms!6785
 2024-01-29 09:30:55 +00:00
Rafael Ameijeiras c5c0b838e0 Merge branch 'ent-12807-error-sql-vista-de-alertas-en-develop' into 'develop' 
Ent 12807 error sql vista de alertas en develop

See merge request artica/pandorafms!6888
 2024-01-29 09:30:14 +00:00
Rafael Ameijeiras e39a87ebd7 Merge branch 'ent-12802-insert-data-no-recoge-bien-la-fecha' into 'develop' 
Ent 12802 insert data no recoge bien la fecha

See merge request artica/pandorafms!6886
 2024-01-29 09:16:00 +00:00
Daniel Cebrian b8973ecab4 #12681 fixed decimals in module freepercent 2024-01-29 09:04:03 +01:00
Daniel Cebrian 1b9cd2d36c #12681 fixed double parse 2024-01-26 15:26:29 +01:00
Daniel Cebrian babb7bce38 #12681 fixed double number parse 2024-01-26 15:06:09 +01:00
Alejandro Campos 618f677906 Merge branch 'develop' into 'ent-12629-Eventos-se-quedan-tostados-cuando-el-filtro-no-encuentra-nada' 
# Conflicts:
#   pandora_console/include/functions_events.php
#   pandora_console/operation/events/events.php
 2024-01-26 13:42:59 +00:00
Daniel Cebrian 139b924410 #12681 added decimals in module windows 2024-01-26 14:01:32 +01:00
Diego Muñoz-Reja 04126c2407 Merge branch 'ent-12352-integrar-tablas-de-merge-en-el-pandoradb-sql' into 'develop' 
add tables merge process pandora_enterprise#12352

See merge request artica/pandorafms!6722
 2024-01-26 12:27:59 +00:00
Matias Didier ca3a9b3c56 Merge branch 'ent-12399-bugs-visuales-en-update-manager-offline' into 'develop' 
fix visual error um-offline pandora_enterprise#12399

See merge request artica/pandorafms!6830
 2024-01-26 12:27:17 +00:00
daniel bba32495a4 fix visual errors in msg umc offline pandora_enterprise#12399 2024-01-26 10:15:01 +01:00
Matias Didier 5b9bf180d8 Merge branch 'ent-11799-15999-eliminacion-de-intervalo-en-agentes-broker' into 'develop' 
Ent 11799 15999 eliminacion de intervalo en agentes broker

See merge request artica/pandorafms!6885
 2024-01-26 08:34:36 +00:00
daniel 51524f4263 Merge remote-tracking branch 'origin/develop' into ent-12399-bugs-visuales-en-update-manager-offline 2024-01-26 09:27:06 +01:00
daniel 65385f36c1 fix visual errors in widgets dashboard pandora_enterprise#12267 2024-01-26 09:18:47 +01:00
Jonathan c07ecff571 #12807 check id_agent for alert view 2024-01-26 08:13:10 +01:00
daniel b84d2aeec9 Merge remote-tracking branch 'origin/develop' into ent-12267-dashboard-mejora-del-widget-de-module-status 
Conflicts:
	pandora_console/include/lib/Dashboard/Widgets/ModulesByStatus.php
 2024-01-26 08:10:07 +01:00
artica c5cefb3c13 Auto-updated build strings. 2024-01-26 01:00:30 +01:00
felix.suarez 823e2b93ae Add Powershell module 2024-01-25 14:10:59 -06:00
alejandro.campos@artica.es 31312eaa53 visual fix 2024-01-25 17:19:05 +01:00
Jonathan 1c094cd219 #12802 fix date error 2024-01-25 16:58:21 +01:00
Daniel Cebrian cf500b6843 #12681 added decimals in module module_freepercentdisk 2024-01-25 16:41:58 +01:00
alejandro.campos@artica.es 18cb14bec6 minor fixes 2024-01-25 16:03:48 +01:00
daniel 00f9098f56 Merge remote-tracking branch 'origin/develop' into ent-12352-integrar-tablas-de-merge-en-el-pandoradb-sql 
Conflicts:
	pandora_console/extras/mr/68.sql
	pandora_console/pandoradb.sql
 2024-01-25 15:57:20 +01:00
Jonathan cdd9af5108 #11799 hide interval for broker agents 2024-01-25 15:25:08 +01:00
Matias Didier 0b9aaa6b04 Merge branch 'ent-12719-se-crean-agentes-por-duplicado-en-tagente-cuando-vienen-xmls-a-un-pandora-con-licencia-de' into 'develop' 
#12719. Fix creating duplicated agents on tagente

See merge request artica/pandorafms!6881
 2024-01-25 14:24:55 +00:00
Jonathan 874bd04aa8 #11799 hide interval for broker agents 2024-01-25 15:23:48 +01:00
Rafael Ameijeiras e19f520eb0 Merge branch 'ent-12522-mejoras-en-audit-log' into 'develop' 
Ent 12522 Mejoras en audit log

See merge request artica/pandorafms!6816
 2024-01-25 14:00:56 +00:00
Rafael Ameijeiras b271cff73e Merge branch 'ent-12754-widget-modules-by-status-bug-al-filtrar-por-estados' into 'develop' 
Ent 12754 widget modules by status bug al filtrar por estados

See merge request artica/pandorafms!6858
 2024-01-25 13:58:02 +00:00
Rafael Ameijeiras 574db2befe Merge branch 'ent-12128-en-alert-details-no-se-muestra-el-nombre-de-la-accion-correspondiente-a-la-alerta-al-usar' into 'develop' 
Ent 12128 en alert details no se muestra el nombre de la accion correspondiente a la alerta al usar

See merge request artica/pandorafms!6802
 2024-01-25 13:57:05 +00:00
Daniel Rodriguez ba82572d00 Merge branch 'ent-12222-parametro-timezone_offset-dentro-de-conf-de-agente-no-afecta-timestamp-de-modulo' into 'develop' 
#12222 Fix timezone offset when modules has timezone data

See merge request artica/pandorafms!6854
 2024-01-25 10:00:45 +00:00
Daniel Cebrian 7b98866468 #12681 fixed decimals in df_percent_used 2024-01-25 10:38:24 +01:00
artica 8bbfa2803f Auto-updated build strings. 2024-01-25 01:00:29 +01:00
Rafael Ameijeiras 8eadf06ed8 Merge branch 'ent-12574-vista-de-insert-data-a-veces-muestra-el-aviso-muy-abajo-en-la-pantalla' into 'develop' 
Ent 12574 vista de insert data a veces muestra el aviso muy abajo en la pantalla

See merge request artica/pandorafms!6880
 2024-01-24 15:25:24 +00:00
Daniel Rodriguez 3300ab0870 Merge branch 'ent-12063-16194-compilador-perl-packer-tiene-mal-encoding-en-japones' into 'develop' 
Ent-12063-16194-compilador-perl-packer-tiene-mal-encoding-en-japones

Closes pandora_enterprise#12063

See merge request artica/pandorafms!6844
 2024-01-24 15:20:50 +00:00
Diego Muñoz-Reja 077252d9cb Merge branch 'ent-11605-item-weekly-sla-mete-salto-de-pagina-si-el-siguiente-elemento-es-del-mismo-tipo-aunque-haya' into 'develop' 
quit pagebreak pandora_enterprise#11605

See merge request artica/pandorafms!6737
 2024-01-24 13:41:00 +00:00
Matias Didier e0c4f8ed53 Merge branch 'ent-11803-duosis-15670-revisar-plugin-wizard_wmi_module' into 'develop' 
Ent 11803 duosis 15670 revisar plugin wizard wmi module

See merge request artica/pandorafms!6337
 2024-01-24 12:50:57 +00:00
Daniel Cebrian fd8d233cf8 #12460 fixed deprecated 2024-01-24 13:28:43 +01:00
Daniel Cebrian fbb5d349a2 Merge branch 'develop' into ent-12460-cientos-de-errores-en-el-log-de-apache 2024-01-24 11:58:00 +01:00
Calvo bfb34d1c75 #12719. Fix creating duplicated agents on tagente 2024-01-24 11:56:58 +01:00
Diego Muñoz-Reja 481e5bb670 Merge branch 'ent-12124-modo-autodisabled-de-los-agentes-no-se-comporta-como-se-espera' into 'develop' 
Ent 12124 modo autodisabled de los agentes no se comporta como se espera

Closes pandora_enterprise#12124

See merge request artica/pandorafms!6782
 2024-01-24 10:51:54 +00:00
Jonathan 4e523e94cc #12574 fix datepicker and give style 2024-01-24 09:51:35 +01:00
Rafael Ameijeiras 5dc0e35be8 Merge branch 'ent-12753-os-command-injection' into 'develop' 
Ent 12753 OS Command Injection

See merge request artica/pandorafms!6868
 2024-01-24 08:15:58 +00:00
Daniel Cebrian 4fc3013cc3 #12522 fixed multiple audit when update setup 2024-01-24 09:15:32 +01:00
Rafael Ameijeiras f3152eca09 Merge branch 'ent-12786-edicion-creacion-de-tarea-discovery-aplicacion-o-cloud-muestra-wizard-de-inicio' into 'develop' 
Ent 12786 edicion creacion de tarea discovery aplicacion o cloud muestra wizard de inicio

See merge request artica/pandorafms!6878
 2024-01-24 08:15:23 +00:00
artica dd252daaf2 Auto-updated build strings. 2024-01-24 01:00:32 +01:00
Calvo 1bc9bc6095 Fix MR 2024-01-23 17:52:06 +01:00
Daniel Cebrian 7f604f0c8d #12460 fixed deprecated 2024-01-23 17:47:26 +01:00
Daniel Cebrian 538177c3e5 #12753 fixed vul command in ajax 2024-01-23 17:08:06 +01:00
Rafael Ameijeiras e1478f61e5 Merge branch 'ent-12364-vista-de-logs-filtro-para-agentes-y-sources' into 'develop' 
Ent 12364 vista de logs filtro para agentes y sources

See merge request artica/pandorafms!6855
 2024-01-23 15:46:03 +00:00
Rafael Ameijeiras d2bdbc9e42 Merge branch 'ent-12767-passwords-de-ldap-no-se-pueden-visualizar' into 'develop' 
Ent 12767 passwords de ldap no se pueden visualizar

See merge request artica/pandorafms!6856
 2024-01-23 15:45:23 +00:00