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

26101 Commits

Author SHA1 Message Date
Daniel Rodriguez 0b661add35 Merge branch 'ent-6158-mejoras-a-servicios-dinamicos-expresiones-regulares-y-varios-custom-field' into 'develop' 
Definition matching Entity

See merge request artica/pandorafms!3648
 2021-01-27 14:40:40 +01:00
fbsanchez d24bcd700d Merge remote-tracking branch 'origin/develop' into ent-6158-mejoras-a-servicios-dinamicos-expresiones-regulares-y-varios-custom-field 2021-01-27 14:08:41 +01:00
Daniel Rodriguez ccc10abc16 Merge branch 'ent-6643-show-summary-vmware' into 'develop' 
Ent 6643 show summary vmware

Closes pandora_enterprise#6643

See merge request artica/pandorafms!3611
 2021-01-27 11:20:36 +01:00
artica 096bcd1ed3 Auto-updated build strings. 2021-01-27 01:00:19 +01:00
Jose Gonzalez d5b99f255a Solved issue 2021-01-26 13:46:12 +01:00
Daniel Rodriguez 0dcfa08725 Merge branch 'ent-6403-usuarios-se-ven-entre-si-workcpace-connected-users' into 'develop' 
Fixed connected users seeing all users

See merge request artica/pandorafms!3590
 2021-01-26 13:35:46 +01:00
Luis 29913883ae Fixed connected users seeing all users 2021-01-26 13:35:46 +01:00
artica 7d69ad114d Auto-updated build strings. 2021-01-26 01:00:11 +01:00
Jose Gonzalez bc250f0789 Merge branch 'ent-6643-show-summary-vmware' of brutus.artica.es:artica/pandorafms into ent-6643-show-summary-vmware 2021-01-25 13:37:44 +01:00
Jose Gonzalez 38ea74ed11 Updated merge 2021-01-25 13:36:12 +01:00
Daniel Rodriguez 6063c4f50b Merge branch 'ent-6091-Suprimir-corregir-logs' into 'develop' 
Solved issue

Closes pandora_enterprise#6091

See merge request artica/pandorafms!3786
 2021-01-25 12:15:16 +01:00
artica 831d22bac1 Updated version and build strings. 2021-01-25 11:52:43 +01:00
Daniel Rodriguez 485220a527 Merge branch 'ent-2948-Formulario-para-configuracion-remota-de-server-y-satellite-Proyectos' into 'develop' 
implemented new server file editor

See merge request artica/pandorafms!3495
 2021-01-25 10:17:35 +01:00
Daniel Rodriguez 9b92c5ff34 Merge branch 'ent-6932-Tags-no-entran-en-base-de-datos' into 'develop' 
Ent 6932 tags no entran en base de datos

See merge request artica/pandorafms!3776
 2021-01-25 10:15:29 +01:00
Daniel Rodriguez 4358d2a99c Merge branch 'ent-6862-add-enterprise-dependencies-docker' into 'develop' 
add dependencies in base docker image

See merge request artica/pandorafms!3727
 2021-01-25 10:13:26 +01:00
Daniel Rodriguez 77dfba453a Merge branch 'ent-6505-FENIX-Conteo-vista-tactica-modulos-Performance-vs-Total' into 'develop' 
fixed count in tactical view

See merge request artica/pandorafms!3671
 2021-01-25 10:12:43 +01:00
Daniel Rodriguez f92ba2ce3d Merge branch 'ent-6503-vista-tactica-numero-alertas' into 'develop' 
Modified query for show only available alerts

Closes pandora_enterprise#6503

See merge request artica/pandorafms!3672
 2021-01-25 10:11:25 +01:00
Daniel Rodriguez e88ca95a8d Merge branch 'ent-6631-Bug-en-dashboard-de-usuario-sin-permiso' into 'develop' 
Ent 6631 bug en dashboard de usuario sin permiso

See merge request artica/pandorafms!3781
 2021-01-25 10:07:53 +01:00
Daniel Rodriguez 7a614fcf48 Merge branch 'ent-6354-Bug-de-creacion-de-dashboard-con-permisos-no-ALL' into 'develop' 
Ent 6354 bug de creacion de dashboard con permisos no all

See merge request artica/pandorafms!3780
 2021-01-25 10:02:41 +01:00
Daniel Rodriguez 4d81396956 Merge branch 'ent-6930-No-funciona-Min-number-of-alerts-Alerts-templates' into 'develop' 
Ent 6930 no funciona min number of alerts alerts templates

See merge request artica/pandorafms!3785
 2021-01-25 09:55:28 +01:00
Daniel Rodriguez 5d137594a4 Merge branch 'ent-6920-no-se-visualiza-dato-de-modulo-tipo-string-en-consola-movil-con-command-line-snapshot-activado' into 'develop' 
Ent 6920 no se visualiza dato de modulo tipo string en consola movil con command line snapshot activado

See merge request artica/pandorafms!3767
 2021-01-25 09:54:06 +01:00
Daniel Rodriguez 7a9d928a98 Merge branch 'ent-6634-Bug-borrado-net-scan-scripts' into 'develop' 
fixed wrong error message: recon task is not necessarily linked to script

See merge request artica/pandorafms!3601
 2021-01-25 09:52:47 +01:00
Daniel Rodriguez d4050ad0ce Merge branch 'ent-6855-Casca-netscan-custom-en-la-open' into 'develop' 
several fixes in netscan custom

See merge request artica/pandorafms!3736
 2021-01-25 09:50:27 +01:00
Daniel Rodriguez 619574269b Merge branch 'ent-6792-10869-10704-modulos-wmi-no-funcionan-ni-pandora-vamos-a-morir-de-covid-todos' into 'develop' 
Fix capitalization issues in wmi windows env

See merge request artica/pandorafms!3677
 2021-01-25 09:28:44 +01:00
Daniel Rodriguez 713abb63e6 Merge branch 'ent-6786-error-componentes-remotos-dynamic' into 'develop' 
Added control for avoid null values in dynamic components

Closes pandora_enterprise#6786

See merge request artica/pandorafms!3670
 2021-01-25 09:27:23 +01:00
Daniel Rodriguez 64ec705f2c Merge branch 'ent-6736-guardia-ticket-10925-omnishell-falla-con-certificados-autofirmados' into 'develop' 
allowing self signed certs for quickshell

See merge request artica/pandorafms!3625
 2021-01-25 09:26:04 +01:00
artica 82664be930 Auto-updated build strings. 2021-01-25 01:00:14 +01:00
artica 4be65955cb Auto-updated build strings. 2021-01-24 01:00:16 +01:00
artica e03f02a093 Auto-updated build strings. 2021-01-23 01:00:18 +01:00
artica a700318815 Auto-updated build strings. 2021-01-22 01:00:18 +01:00
alejandro-campos 983d58260d changes in dashboard permissions 2021-01-21 14:42:43 +01:00
artica 3992841ac5 Auto-updated build strings. 2021-01-21 01:00:18 +01:00
alejandro-campos 731d486455 changed behavior of All group and fixed acl vulnerability 2021-01-20 18:22:43 +01:00
artica 6dca4bb4ba Auto-updated build strings. 2021-01-20 01:00:17 +01:00
Jose Gonzalez c760a937ae Solved issue 2021-01-19 16:10:46 +01:00
Daniel Maya adf4c988ec Added warning 2021-01-19 16:03:34 +01:00
artica 548f960b83 Auto-updated build strings. 2021-01-19 01:00:18 +01:00
alejandro-campos d697ffb703 Merge remote-tracking branch 'origin/ent-6631-Bug-en-dashboard-de-usuario-sin-permiso-2' into ent-6631-Bug-en-dashboard-de-usuario-sin-permiso 2021-01-18 13:38:54 +01:00
alejandro-campos 535486a429 Merge branch 'develop' into ent-6354-Bug-de-creacion-de-dashboard-con-permisos-no-ALL-3 2021-01-18 11:48:51 +01:00
fbsanchez 6f228fa2dd Merge remote-tracking branch 'origin/develop' into ent-6792-10869-10704-modulos-wmi-no-funcionan-ni-pandora-vamos-a-morir-de-covid-todos 2021-01-18 10:52:06 +01:00
alejandro-campos 0549f2c604 added file to open folder 2021-01-18 10:31:53 +01:00
alejandro-campos 9c924db8dc Merge branch 'develop' into ent-6855-Casca-netscan-custom-en-la-open 2021-01-18 10:29:06 +01:00
artica f0ff1c72d4 Auto-updated build strings. 2021-01-18 01:00:15 +01:00
artica 0cde312850 Auto-updated build strings. 2021-01-17 01:00:14 +01:00
artica 6710cfd957 Auto-updated build strings. 2021-01-16 01:00:19 +01:00
Alejandro Campos 5b9d7bcb81 Merge branch 'develop' into 'ent-6631-Bug-en-dashboard-de-usuario-sin-permiso-2' 
# Conflicts:
#   pandora_console/include/lib/Dashboard/Widgets/agent_module.php
 2021-01-15 14:52:26 +01:00
alejandro-campos 05c39db0cc changes in dashboard permissions 2021-01-15 13:57:25 +01:00
alejandro-campos a0931d7ada changes in dashboard permissions 2021-01-15 13:52:31 +01:00
José González c2c29c0d4a Update functions_alerts.php with correction 2021-01-15 09:58:18 +01:00
Daniel Maya ca17e9cfcb change in column name of ttag 2021-01-15 09:50:40 +01:00