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

30093 Commits

Author SHA1 Message Date
Calvo 78ab628c8b Fix tactical view user count when user is in group 2022-03-10 08:22:45 +01:00
Calvo 565cb588ac Merge remote-tracking branch 'origin/develop' into ent-8447-conteo-erroneo-de-usuarios-en-index 2022-03-10 08:07:51 +01:00
Calvo aaf01c6a01 User list php format 2022-03-10 08:03:47 +01:00
Calvo ec9936bd59 Fix users vulnerabilities and bugs 2022-03-10 07:57:34 +01:00
artica 047f40a3f0 Auto-updated build strings. 2022-03-10 01:00:17 +01:00
Daniel Rodriguez 99ba42a2c1 Merge branch 'ent-7653-Nuevo-informe-de-estados-de-modulos-de-agentes' into 'develop' 
new item report agent/modules status pandora_enterprise#7653

See merge request artica/pandorafms!4691
 2022-03-09 17:23:04 +00:00
José González 73838ef843 Fix upload of not wanted files in File Manager 2022-03-09 17:27:08 +01:00
Luis 81da96ac33 Merge branch 'develop' into 'ent-8611-vulnerabilidad-en-bulk-operations' 
# Conflicts:
#   pandora_console/include/functions_groups.php
 2022-03-09 16:24:06 +00:00
Calvo f06c90e692 Fix console setup visual issues 2022-03-09 17:20:24 +01:00
Daniel Barbero Martin 2d2d10c489 fixed server name selector agent in metaconsole #7653 2022-03-09 17:05:03 +01:00
Daniel Barbero Martin 28047f2348 Merge remote-tracking branch 'origin/develop' into ent-7653-Nuevo-informe-de-estados-de-modulos-de-agentes 2022-03-09 16:49:02 +01:00
Daniel Rodriguez 1c347fa3ca Merge branch 'ent-8594-permisos-errorlog-file' into 'develop' 
Set min permissions to errorlog_file

See merge request artica/pandorafms!4705
 2022-03-09 15:06:10 +00:00
Daniel Barbero Martin 0d6570ea24 fixed error massive operation agents #2152 2022-03-09 15:12:26 +01:00
Daniel Rodriguez e637c74dbf Merge branch 'ent-8692-Faltan-iconos-de-configuración-del-agente-en-760' into 'develop' 
Ent 8692 faltan iconos de configuración del agente en 760

See merge request artica/pandorafms!4752
 2022-03-09 13:20:12 +00:00
Daniel Rodriguez ebdc7e4fce Merge branch 'ent-8689-Error-500-en-wizard-de-agente' into 'develop' 
Ent 8689 error 500 en wizard de agente

See merge request artica/pandorafms!4751
 2022-03-09 12:57:20 +00:00
Daniel Maya 29906b3c53 #8692 Fixed remote config 2 2022-03-09 13:55:49 +01:00
Daniel Rodriguez 9f7dd951e5 Merge branch 'ent-8386-usuario-sin-acceso-a-servidores-ve-icono-con-info-de-servidores' into 'develop' 
Do not show servers header icon if user has no permission node

See merge request artica/pandorafms!4723
 2022-03-09 12:55:31 +00:00
Daniel Rodriguez 671dc5e923 Merge branch 'ent-8610-vulnerabilidad-en-gestion-de-usuarios-perfiles' into 'develop' 
Fix credential store ACL, only accces to PM or UM

See merge request artica/pandorafms!4719
 2022-03-09 12:54:41 +00:00
Daniel Rodriguez c1dd265085 Merge branch 'ent-8381-Bug-interfaces-view' into 'develop' 
Fixed issues with interfaces view and limited to show only agents with ifaces

See merge request artica/pandorafms!4712
 2022-03-09 12:54:04 +00:00
Daniel Rodriguez d73bd92157 Merge branch 'ent-8112-icono-collapse-recortado' into 'develop' 
Fix issue with collapse icon

Closes pandora_enterprise#8112

See merge request artica/pandorafms!4689
 2022-03-09 12:50:17 +00:00
Daniel Rodriguez 09ba16c593 Merge branch 'ent-5886-Vista-para-mostrar-modulos-agentes-en-paradas-planificadas' into 'develop' 
clean file planned_downtime pandora_enterprise#5886

See merge request artica/pandorafms!4688
 2022-03-09 12:48:47 +00:00
Daniel Rodriguez b6ffab0f43 Merge branch 'ent-7933-filtro-de-busqueda-de-modulo-en-alertas-externas' into 'develop' 
external alerts new filters pandora_enterprise#7933

See merge request artica/pandorafms!4687
 2022-03-09 12:48:04 +00:00
fbsanchez c0ff8b8294 Ensure there are no duplicates in pandora_ha execution 2022-03-09 13:46:40 +01:00
Daniel Maya 0a7238fe33 #8692 Fixed remote config 2022-03-09 12:06:21 +01:00
Daniel Barbero Martin 640d93045f Merge remote-tracking branch 'origin/develop' into ent-2152-Operaciones-masivas-de-grupos-secundarios 
Conflicts:
	pandora_console/godmode/massive/massive_edit_agents.php
 2022-03-09 09:28:08 +01:00
artica 18e6bd1c22 Auto-updated build strings. 2022-03-09 01:00:14 +01:00
Daniel Maya 0e70bc9f67 #8689 Fixed wizard 2022-03-08 18:00:09 +01:00
Daniel Barbero Martin 5b1353e493 fixed CV in console mobile #8676 2022-03-08 17:18:44 +01:00
Daniel Maya 860400fa9c #8339 added macros _customdata_json_ and _customdata_text_ 2022-03-08 16:42:19 +01:00
Daniel Rodriguez 6e98545bda Merge branch 'ent-8415-lista-templates-descuadrada-usuario-sin-RM' into 'develop' 
Fix reports view

Closes pandora_enterprise#8415

See merge request artica/pandorafms!4703
 2022-03-08 15:36:37 +00:00
Daniel Rodriguez 24da0283ee Merge branch 'ent-8524-se-pueden-crear-respuestas-de-eventos-sin-nombre' into 'develop' 
Event response creation name required

See merge request artica/pandorafms!4685
 2022-03-08 15:33:57 +00:00
Daniel Barbero Martin dee5f092c9 Merge remote-tracking branch 'origin/develop' into ent-7933-filtro-de-busqueda-de-modulo-en-alertas-externas 2022-03-08 15:47:33 +01:00
Daniel Barbero Martin b0d73fa3ff API CV #8677 2022-03-08 14:56:33 +01:00
Daniel Barbero Martin 4f67ec2f22 API CV #8677 2022-03-08 14:50:59 +01:00
Ramon Novoa 9f03db37c1 Fix module precedence for pandora_ha. 2022-03-08 12:10:39 +01:00
Daniel Maya 7e29cd5a60 #8547 added macros _current_username_ and _owner_username_ 2022-03-08 10:44:24 +01:00
José González d511d75b8d Merge branch 'develop' into 'ent-8112-icono-collapse-recortado' 
# Conflicts:
#   pandora_console/general/main_menu.php
 2022-03-08 08:53:00 +00:00
artica 223475d546 Auto-updated build strings. 2022-03-08 01:00:06 +01:00
Daniel Maya 02fe08903c #8696 Fixed warning status 2022-03-07 15:07:06 +01:00
Daniel Maya 270bb433da added heatmap ajax and class 2022-03-07 13:11:54 +01:00
Daniel Maya 04f6cfc94f added heatmap 2022-03-07 12:50:36 +01:00
artica 3a5d412588 Updated version and build strings. 2022-03-07 12:21:14 +01:00
Daniel Maya d4439dcf51 heatmap css 2022-03-07 10:47:20 +01:00
José González 89d5b490bf Clean filtered references for parent modules 2022-03-07 10:45:11 +01:00
Daniel Maya f34e8fead7 Merge branch 'develop' into ent-8458-heatmap-view 2022-03-07 10:35:26 +01:00
artica d9f7ea4038 Auto-updated build strings. 2022-03-07 01:00:15 +01:00
artica 5f08afca26 Auto-updated build strings. 2022-03-06 01:00:16 +01:00
artica 69be7b1b55 Auto-updated build strings. 2022-03-05 01:00:19 +01:00
Calvo a34ba86129 Fix missing include 2022-03-04 15:26:47 +01:00
Daniel Rodriguez c130bc8a35 Merge branch 'ent-fix-docker-timeouts' into 'develop' 
adjusted sleep before try to use mysql socket, due slow runners

See merge request artica/pandorafms!4739
 2022-03-04 13:26:54 +00:00