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

13681 Commits

Author SHA1 Message Date
artica 466ebb8b6b Auto-updated build strings. 2021-02-01 01:00:15 +01:00
artica 705e1e4623 Auto-updated build strings. 2021-01-31 01:00:11 +01:00
artica 6871aaf358 Auto-updated build strings. 2021-01-30 01:00:19 +01:00
artica 750670ecf9 Auto-updated build strings. 2021-01-29 01:00:20 +01:00
Daniel Rodriguez 147bac8e55 Merge branch 'ent-6126-add-csv-json-save-to-disk-console-task' into 'develop' 
Added CSV an JSON formats in console task report save to disk

See merge request artica/pandorafms!3613
 2021-01-28 10:23:22 +01:00
artica ff80c974da Auto-updated build strings. 2021-01-28 01:00:18 +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
Luis Calvo f2addc837a Merge remote-tracking branch 'origin/develop' into ent-6126-add-csv-json-save-to-disk-console-task 2021-01-27 09:25:12 +01:00
artica 096bcd1ed3 Auto-updated build strings. 2021-01-27 01:00:19 +01:00
artica 7d69ad114d Auto-updated build strings. 2021-01-26 01:00:11 +01:00
Jose Gonzalez 38ea74ed11 Updated merge 2021-01-25 13:36:12 +01:00
artica 831d22bac1 Updated version and build strings. 2021-01-25 11:52:43 +01:00
Luis Calvo 84f3ead86a Added csv, json, xml formats to save report to disk task 2021-01-25 11:51:53 +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 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
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
Luis Calvo d98033ba92 Merge remote-tracking branch 'origin/develop' into ent-6126-add-csv-json-save-to-disk-console-task 2021-01-22 10:05:22 +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
artica 6dca4bb4ba Auto-updated build strings. 2021-01-20 01:00:17 +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
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 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 a470658543 remove IPAM to extension 2021-01-14 14:42:18 +01:00