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

20560 Commits

Author SHA1 Message Date
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 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 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
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
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
artica 5a837c9aaa Auto-updated build strings. 2021-01-15 01:00:17 +01:00
Jose Gonzalez 579b8d4965 Solve issue and added correct headers 2021-01-14 19:08:01 +01:00
Daniel Rodriguez 1a99dfa517 Merge branch 'ent-6666-error-extensino-mainframe' into 'develop' 
fixed sql error with secundary groups ZOS

See merge request artica/pandorafms!3607
 2021-01-14 14:49:26 +01:00
Daniel Rodriguez 8cd742c90c Merge branch 'ent-6901-Bug-en-custom-graph-de-consolas-visuales' into 'develop' 
Ent 6901 bug en custom graph de consolas visuales

See merge request artica/pandorafms!3750
 2021-01-14 14:48:57 +01:00
Daniel Rodriguez fc9eb947c8 Merge branch 'ent-6355-Cambio-de-mensaje-de-Widget-dashboard-sin-permisos' into 'develop' 
fix remove acl widget agent/module

See merge request artica/pandorafms!3637
 2021-01-14 14:46:52 +01:00
Daniel Rodriguez 18cba9ad84 Merge branch 'ent-5489-Filtrar-desde-SEARCH-GENERAL-grupos-secundarios' into 'develop' 
Ent 5489 filtrar desde search general grupos secundarios

See merge request artica/pandorafms!3614
 2021-01-14 14:46:03 +01:00
Daniel Rodriguez 24b71e477b Merge branch 'ent-6405-Borrado-conf-md5-data_in-borrar-agente' into 'develop' 
Adding delete_agent control for meta

Closes pandora_enterprise#6405

See merge request artica/pandorafms!3583
 2021-01-14 14:45:10 +01:00
Daniel Rodriguez c546e532a3 Merge branch 'ent-6351-Informes-de-logs-en-meta' into 'develop' 
Ent 6351 informes de logs en meta

See merge request artica/pandorafms!3681
 2021-01-14 14:44:22 +01:00
Daniel Rodriguez ea86889673 Merge branch 'ent-6645-bug-acl-discovery-tasks' into 'develop' 
Fixed acl on discovery tasklist

See merge request artica/pandorafms!3618
 2021-01-14 14:43:42 +01:00
Daniel Rodriguez 7e0a3baa1e Merge branch 'ent-6893-event-filters-without-name' into 'develop' 
Fixed event filter creation with empty name

See merge request artica/pandorafms!3742
 2021-01-14 14:43:01 +01:00
daniel a470658543 remove IPAM to extension 2021-01-14 14:42:18 +01:00
Daniel Maya dfeb42983f Ent 6605 buscador general no encuentra mapas 2021-01-14 14:36:47 +01:00
Jose Gonzalez 0ec39bd135 Merge remote-tracking branch 'origin' into ent-6503-vista-tactica-numero-alertas 2021-01-14 13:39:45 +01:00
Jose Gonzalez 7de277f458 Added some changes 2021-01-14 12:40:57 +01:00
alejandro-campos 366d02f203 Merge remote-tracking branch 'origin/ent-6354-Bug-de-creacion-de-dashboard-con-permisos-no-ALL-2' into ent-6354-Bug-de-creacion-de-dashboard-con-permisos-no-ALL-3 2021-01-14 09:22:06 +01:00