Commit Graph

20606 Commits

Author SHA1 Message Date
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
artica 884a7cabf7 Auto-updated build strings. 2021-01-14 01:00:19 +01:00
Jose Gonzalez c7b66e07e8 Merge remote-tracking branch 'origin' into ent-6405-Borrado-conf-md5-data_in-borrar-agente 2021-01-13 11:43:29 +01:00
artica 53957348be Auto-updated build strings. 2021-01-13 01:00:18 +01:00
Jose Gonzalez e2dec1b0fa Merge remote-tracking branch 'origin' into ent-6405-Borrado-conf-md5-data_in-borrar-agente 2021-01-12 16:58:15 +01:00
Jose Gonzalez 5d94369b5a Attach documentation 2021-01-12 16:10:01 +01:00
Jose Gonzalez 7129c105f9 Updated password generation for better results 2021-01-12 16:07:12 +01:00
fbsanchez efcd123a65 Missed snapshot icon in module data list mobile 2021-01-12 12:45:38 +01:00
artica a56a0e7023 Auto-updated build strings. 2021-01-12 01:00:17 +01:00
Daniel Rodriguez 56d8f87e42 Merge branch 'ent-6886-item-permissions-report-aparece-en-templates' into 'develop'
Removed item permissions report from report templates

See merge request artica/pandorafms!3744
2021-01-11 18:11:58 +01:00
Daniel Rodriguez 86794af7b4 Merge branch 'ent-6889-vista-usuarios-aparece-ip' into 'develop'
Removed ip from connected user list

See merge request artica/pandorafms!3741
2021-01-11 18:11:28 +01:00
Daniel Rodriguez ed50126b1b Merge branch 'ent-3661-poder-elegir-dataserver-en-vmware-a-traves-de-discovery' into 'develop'
Ent 3661 poder elegir dataserver en vmware a traves de discovery

See merge request artica/pandorafms!3683
2021-01-11 15:43:18 +01:00
fbsanchez 749b729c0c fix local auth 2021-01-11 15:08:07 +01:00
Daniel Rodriguez 7bbecceacc Merge branch 'ent-6779-Cambio-label-en-campo-de-alertas-SNMP' into 'develop'
Ent 6779 cambio label en campo de alertas snmp

See merge request artica/pandorafms!3661
2021-01-11 14:58:14 +01:00
Daniel Rodriguez 14985c35ec Merge branch 'ent-6407-server-to-execute-snmp-browser' into 'develop'
Fixed snmp server selection

See merge request artica/pandorafms!3658
2021-01-11 14:57:12 +01:00
José González 55f1d3516f Cleaned trace 2021-01-11 14:26:15 +01:00
Daniel Rodriguez 8605061d36 Merge branch 'ent-6790-cepsa-review-results-sale-en-tareas-oracle' into 'develop'
Set default value for review_mode to 1 instead 0

See merge request artica/pandorafms!3760
2021-01-11 14:17:52 +01:00
Daniel Rodriguez 8d7ac33cf1 Merge branch 'ent-6653-Error-enlace-publico-en-Consolas-Visuales-linkadas' into 'develop'
fix public view link remove hash

See merge request artica/pandorafms!3639
2021-01-11 13:23:05 +01:00
Daniel Rodriguez 38dd3b960e Merge branch 'ent-4953-local-admin-nunca-prueba-remotos-meta' into 'develop'
Force try remote before falling back to local if admin user

See merge request artica/pandorafms!3715
2021-01-11 09:22:14 +01:00
artica 732ba9d030 Auto-updated build strings. 2021-01-11 01:00:14 +01:00
artica ec6a6db6c0 Auto-updated build strings. 2021-01-10 01:00:15 +01:00
artica b13fc73b6c Auto-updated build strings. 2021-01-09 01:00:16 +01:00
fbsanchez f35ae98e78 Merge remote-tracking branch 'origin/develop' into ent-3661-poder-elegir-dataserver-en-vmware-a-traves-de-discovery 2021-01-08 13:21:58 +01:00
fbsanchez 8f2109003b avoid review for non H&D tasks 2021-01-08 10:31:38 +01:00
artica 2b17ab4496 Auto-updated build strings. 2021-01-08 01:00:18 +01:00
fbsanchez dd08b7937c Set default value for review_mode to 1 instead 0 2021-01-07 14:36:56 +01:00
José González 3199b3d6b5 Merge branch 'develop' into 'ent-6407-server-to-execute-snmp-browser'
# Conflicts:
#   pandora_console/include/ajax/snmp_browser.ajax.php
2021-01-07 14:14:33 +01:00
fbsanchez 186b807ff7 Merge remote-tracking branch 'origin/develop' into ent-3661-poder-elegir-dataserver-en-vmware-a-traves-de-discovery
Conflicts:
	pandora_console/include/styles/wizard.css
2021-01-07 10:50:57 +01:00
fbsanchez 6667b38729 Merge remote-tracking branch 'origin/develop' into ent-6652-pandora_db-en-historico
Conflicts:
	pandora_server/util/pandora_db.pl
2021-01-07 10:42:29 +01:00
artica 1ff2800178 Auto-updated build strings. 2021-01-07 01:00:32 +01:00
artica b21eca13d5 Auto-updated build strings. 2021-01-06 01:00:36 +01:00
Daniel Rodriguez 40921b96f9 Merge branch 'ent-6791-sesiones-se-borran-con-pandora_db' into 'develop'
Avoid erase ALL sessions from tsessions_php (pandora_db)

See merge request artica/pandorafms!3663
2021-01-05 13:43:42 +01:00
Daniel Rodriguez 6faa827bfa Merge branch 'ent-6896-error-ACL-command-snapshot' into 'develop'
Fixed module id on snapshot view

See merge request artica/pandorafms!3746
2021-01-05 12:41:04 +01:00
artica 93473de7c6 Auto-updated build strings. 2021-01-05 01:00:16 +01:00
Daniel Maya c11c122032 Fixed custom graph 2021-01-04 12:53:42 +01:00
Daniel Rodriguez 05645afd44 Merge branch 'ent-6797-11099-graficas-informe-de-proyeccion-fallan-en-pdf-de-forma-aleatoria' into 'develop'
Increased phantomjs timeout to 120 seconds per resource

See merge request artica/pandorafms!3730
2021-01-04 11:17:37 +01:00
Daniel Rodriguez 2e07d6215f Merge branch 'ent-6822-Error-SQL-en-SNMP-console' into 'develop'
Ent 6822 error sql en snmp console

See merge request artica/pandorafms!3708
2021-01-04 11:16:35 +01:00
Daniel Rodriguez f528e47cdc Merge branch 'ent-6582-Bug-con-masivas-de-modulos-y-filtro-module-status' into 'develop'
fixed status filter when applying changes to a module of any agent

See merge request artica/pandorafms!3630
2021-01-04 11:16:07 +01:00
Daniel Rodriguez 2a2e63fedb Merge branch 'ent-6209-10494-quickshell-duplica-pantalla-en-firefox' into 'develop'
Fix firefox double load of quickshell

See merge request artica/pandorafms!3686
2021-01-04 11:15:26 +01:00
Daniel Rodriguez b3861ad2c5 Merge branch 'ent-6534-Migracion-consolas-visuales' into 'develop'
css simple value css CV

See merge request artica/pandorafms!3684
2021-01-04 11:13:35 +01:00
Daniel Rodriguez 70fcba1b11 Merge branch 'ent-6765-11050-Bug-en-operaciones-masivas-sobre-modulos-SNMP-v3' into 'develop'
fixed selector

See merge request artica/pandorafms!3644
2021-01-04 11:11:48 +01:00
Daniel Rodriguez b9a2998c49 Merge branch 'ent-6490-Errores-en-edicion-de-acciones-de-alertas' into 'develop'
Ent 6490 errores en edicion de acciones de alertas

See merge request artica/pandorafms!3657
2021-01-04 11:11:16 +01:00
Daniel Rodriguez 5658b52e3f Merge branch 'ent-6498-Alertas-siempre-marcan-modulos-como-critical-en-los-correos-con-el-mail-to-admin-por-defecto' into 'develop'
changed mail to admin default action

See merge request artica/pandorafms!3656
2021-01-04 11:10:19 +01:00
Daniel Maya f2b673b62b merge conflict resolved 2021-01-04 09:16:14 +01:00
artica a2033961a7 Auto-updated build strings. 2021-01-04 01:00:14 +01:00
artica dfec568055 Auto-updated build strings. 2021-01-03 01:00:13 +01:00
artica 740e2f6abe Auto-updated build strings. 2021-01-02 01:00:13 +01:00
artica dca12930fe Auto-updated build strings. 2021-01-01 01:00:15 +01:00
artica 35e5ab60d6 Auto-updated build strings. 2020-12-31 01:00:13 +01:00
artica de7fe26e65 Auto-updated build strings. 2020-12-30 01:00:14 +01:00
slerena a5f0784c24 Merge branch 'ent-fix-massive-user-management' into 'develop'
Fixed problem that users with UM in specific groups can assign/delete profiles in other groups.

See merge request artica/pandorafms!3745
2020-12-29 15:07:43 +01:00
artica 1b80a157e0 Auto-updated build strings. 2020-12-29 01:00:13 +01:00
Luis Calvo 47088a87b7 Fixed module id on snapshot view 2020-12-28 11:59:02 +01:00
artica 66afea7289 Auto-updated build strings. 2020-12-28 01:00:14 +01:00
artica 7915ee970a Auto-updated build strings. 2020-12-27 01:00:13 +01:00
artica 223457100a Auto-updated build strings. 2020-12-26 01:00:14 +01:00
Junichi Satoh 1c8b70d1eb Fixed problem that users with UM in specific groups can assign/delete profiles in other groups. 2020-12-25 17:38:03 +09:00
artica 57c1433764 Auto-updated build strings. 2020-12-25 01:00:15 +01:00
Daniel Rodriguez aee7ec4cb2 Merge branch 'ent-6897-estilos-rotos-metaconsola' into 'develop'
Fixed broken styles in meta

See merge request artica/pandorafms!3743
2020-12-24 10:30:01 +01:00
Luis Calvo 97a1020ec2 Removed item permissions report from report templates 2020-12-24 09:06:38 +01:00
artica 91b3aca7cf Auto-updated build strings. 2020-12-24 01:00:19 +01:00
Luis Calvo d8900704ed Fixed broken styles in meta 2020-12-23 17:58:05 +01:00
Daniel Rodriguez b0f862b4c7 Merge branch 'ent-1175-copyright-actualizados' into 'develop'
Updated copyrights

Closes pandora_enterprise#1175

See merge request artica/pandorafms!3668
2020-12-23 17:19:46 +01:00
Daniel Rodriguez fc49958c96 Merge branch 'ent-6681-SNMP-Browser-multiple-remote-components-y-abrir-ventana-adicional-en-el-navegador' into 'develop'
Ent 6681 snmp browser multiple remote components y abrir ventana adicional en el navegador

See merge request artica/pandorafms!3608
2020-12-23 16:55:56 +01:00
Luis Calvo f6a1260eef Fixed event filter creation with empty name 2020-12-23 15:33:52 +01:00
Luis Calvo 69c33b45fa Removed ip from connected user list 2020-12-23 14:33:20 +01:00
Daniel Rodriguez bc74565662 Merge branch 'ent-4491-Mostrar-siempre-arriba-el-valor-de-la-barra-de-grafico-en-consola-visual' into 'develop'
fix custom graph

See merge request artica/pandorafms!3655
2020-12-23 11:48:03 +01:00
Daniel Rodriguez 4f2d6bf136 Merge branch 'ent-6799-Edicion-Dashboards-fallo-al-cambiar-ancho-widgets' into 'develop'
Fix gridstack js version 1.2

See merge request artica/pandorafms!3687
2020-12-23 11:47:07 +01:00
Daniel Rodriguez 41730cbe58 Merge branch 'ent-6339-Monitors-View-Metaconsole' into 'develop'
Ent 6339 monitors view metaconsole

See merge request artica/pandorafms!3676
2020-12-23 11:46:00 +01:00
José González 02475d25b6 Merge branch 'develop' into 'ent-1175-copyright-actualizados'
# Conflicts:
#   pandora_console/general/header.php
#   pandora_console/general/sap_view.php
2020-12-23 06:48:22 +01:00
artica 71371a10a9 Auto-updated build strings. 2020-12-23 01:00:15 +01:00
Daniel Rodriguez 30915ea8f8 Merge branch 'ent-6501-home-screen-link-externo' into 'develop'
Added external link feature

See merge request artica/pandorafms!3665
2020-12-22 16:30:44 +01:00
Daniel Rodriguez b2363fb003 Merge branch 'ent-6509-agent-details-error-en-conteo-total-de-modulos' into 'develop'
included not init modules in total count

See merge request artica/pandorafms!3645
2020-12-22 16:29:39 +01:00
Daniel Rodriguez 4b0fb7e762 Merge branch 'ent-6404-Bug-en-widget-Consolas-visuales-en-dashboard' into 'develop'
fix dashboard VC

See merge request artica/pandorafms!3650
2020-12-22 16:05:21 +01:00