tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-08-17 15:58:51 +02:00
Code Issues Packages Projects Releases Wiki Activity
32,402 Commits 34 Branches 30 Tags
Commit Graph

17573 Commits

Author SHA1 Message Date
artica
0ce954af56 Auto-updated build strings. 2022-09-24 01:00:20 +02:00
Daniel Rodriguez
30edbc81ad Merge branch 'ent-8934-Macros-para-fechas-en-custom-SQL' into 'develop' 
Added new macros

See merge request artica/pandorafms!5103
 2022-09-23 13:03:48 +00:00
Daniel Barbero
225646cd9d fixed response events pandora_enterprise#9423 2022-09-23 13:55:01 +02:00
Daniel Maya
795308367f #9254 load password with ajax 2022-09-23 13:24:46 +02:00
edu.corral
6a93b4d554 ent 9303 audit log extended info 2022-09-23 11:35:17 +02:00
Daniel Maya
96f81475f7 resolved conflict 2022-09-23 09:20:59 +02:00
Alejandro Campos
9301b46f41 Merge branch 'develop' into 'ent-8217-Comando-Accion-de-alerta-para-enviar-informes' 
# Conflicts:
#   pandora_console/extras/mr/57.sql
 2022-09-23 06:41:57 +00:00
artica
d14bcfe616 Auto-updated build strings. 2022-09-23 01:00:20 +02:00
Diego Muñoz-Reja
0488eec00d Merge branch 'ent-8775-separar-el-paso-a-historico-de-datos-y-string' into 'develop' 
Historic string data separated from normal data

See merge request artica/pandorafms!5093
 2022-09-22 14:47:23 +00:00
Calvo
9499da3176 API and LDAP remote user fix with login error fix 2022-09-22 12:34:40 +02:00
Daniel Rodriguez
c34328583f Merge branch 'ent-8978-derivado-del-trabajo-q-a-762-lts-servidores-pfms-sin-dig-ni-y-o-whois-instalado' into 'develop' 
Ent 8978 derivado del trabajo q a 762 lts servidores pfms sin dig ni y o whois instalado

See merge request artica/pandorafms!5082
 2022-09-22 08:21:41 +00:00
Calvo
8a1740ddfb Added ldap timeout 2022-09-22 09:27:08 +02:00
Daniel Barbero
3a43ee73bc fixed widget groups status pandora_enterprise#9229 2022-09-22 08:39:12 +02:00
artica
b7bef2dd58 Auto-updated build strings. 2022-09-22 01:00:20 +02:00
Daniel Barbero
f688f73c46 fixed historical database pandora_enterprise#8791 2022-09-21 16:35:36 +02:00
Daniel Barbero
2343456113 Merge remote-tracking branch 'origin/develop' into ent-8791-base-de-datos-historica-para-metaconsola 2022-09-21 15:20:30 +02:00
Daniel Barbero
72040df7bb fixed wizard meta delete agent pandora_enterprise#9324 2022-09-21 13:37:51 +02:00
alejandro.campos@artica.es
debf2e7a40 fixed limitation of group_concat 2022-09-21 13:32:36 +02:00
Daniel Maya
199d16f561 #9431 Fixed webserver module 2022-09-21 13:21:59 +02:00
Daniel Rodriguez
d83ada6164 Merge branch 'ent-9262-13905-time-in-warning-status-informacion-incorrecta-en-informe' into 'develop' 
fixed error massive services operations pandora_enterprise#9262

See merge request artica/pandorafms!5099
 2022-09-21 08:08:39 +00:00
edu.corral
a13c2a24a9 ent 9485 metaconsole alert filter 2022-09-21 09:46:31 +02:00
artica
4c8b907590 Auto-updated build strings. 2022-09-21 01:00:21 +02:00
alejandro.campos@artica.es
927658448e change permissions 2022-09-20 18:03:29 +02:00
Daniel Maya
d46174adb8 #9527 Fixed new user 2022-09-20 17:40:20 +02:00
alejandro.campos@artica.es
9343796ae1 traps history 2022-09-20 17:26:29 +02:00
Daniel Maya
9b79ea7912 #9506 Fixed um 2022-09-20 16:05:27 +02:00
José González
5a237971f8 Fix style issue 2022-09-20 13:02:32 +02:00
José González
a72900e57c Fix interval definition 2022-09-20 12:14:44 +02:00
Daniel Barbero
e3579f2b13 fixed api function add comment for metaconsole pandora_enterprise#9522 2022-09-20 11:53:56 +02:00
Daniel Maya
737f27f782 #9143 Added license_encryption_key 2022-09-20 11:37:07 +02:00
José González
2a63f19d38 Fix 2022-09-20 11:13:02 +02:00
Daniel Barbero
b16c07fdb5 Merge remote-tracking branch 'origin/develop' into ent-9229-revisar-comportamiento-de-widgets-con-elementos-eliminados 
Conflicts:
	pandora_console/include/lib/Dashboard/Widgets/system_group_status.php
 2022-09-20 09:10:25 +02:00
Daniel Barbero
9ac30676b6 fixed widget alert pandora_enterprise#9229 2022-09-20 09:05:13 +02:00
artica
9ae4c7ca67 Auto-updated build strings. 2022-09-20 01:00:21 +02:00
Daniel Rodriguez
fcca522b0c Merge branch 'ent-9384-14062-Problema-con-onclick-en-la-lista-de-eventos' into 'develop' 
fixed 500

See merge request artica/pandorafms!5109
 2022-09-19 14:47:44 +00:00
alejandro.campos@artica.es
2852311cf7 fix 2022-09-19 15:42:43 +02:00
Daniel Barbero
229436b972 fixed agent/module widget pandora_enterprise#9519 2022-09-19 14:40:31 +02:00
Diego Muñoz-Reja
0e06996336 Merge branch 'ent-9342-modo-slide-no-amplia-los-dashboard-en-caso-de-consolas-visuales' into 'develop' 
fixed visual errors slides dashboards#9342

See merge request artica/pandorafms!5097
 2022-09-19 12:32:11 +00:00
Calvo
522607ec40 Fix meta alert datatable order 2022-09-19 14:14:33 +02:00
Calvo
bc5f1d0dce Fix meta alert datatable order 2022-09-19 14:02:50 +02:00
Daniel Rodriguez
2657faab02 Merge branch 'ent-9381-13999-problema-tactical-view-causada-por-grupos-secundarios' into 'develop' 
Fix tactical view counting duplicated modules when agents have secodary groups

See merge request artica/pandorafms!5100
 2022-09-19 11:10:16 +00:00
Diego Muñoz-Reja
c9712a81db Merge branch 'ent-8281-anadir-recursion-de-grupos-a-los-widgets-de-dashboards-groups-status-y-general-group-status' into 'develop' 
Added recursion to widgets Group status and General group status

See merge request artica/pandorafms!5094
 2022-09-19 10:47:26 +00:00
Daniel Maya
cd199e233d #9334 Added improve in satellite hosts 2022-09-19 12:17:24 +02:00
Diego Muñoz-Reja
ffc51471d0 Merge branch 'ent-9444-no-existe-la-consola-sonora-en-acl-enterprise' into 'develop' 
Ent 9444 no existe la consola sonora en acl enterprise

See merge request artica/pandorafms!5086
 2022-09-19 10:07:44 +00:00
alejandro.campos@artica.es
91194155b0 implemented trap history 2022-09-19 11:15:22 +02:00
alejandro.campos@artica.es
181a480b9d fixed api methods for creating and deleting scheduled downtimes agents 2022-09-19 10:44:25 +02:00
artica
4a7b11395a Auto-updated build strings. 2022-09-19 01:00:16 +02:00
artica
30395efe83 Auto-updated build strings. 2022-09-18 01:00:16 +02:00
artica
185498ac5b Auto-updated build strings. 2022-09-17 01:00:19 +02:00
Calvo
c177ee2e2e Fix meta alert datatable order 2022-09-16 15:01:52 +02:00