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

5451 Commits

Author SHA1 Message Date
Daniel Rodriguez 07a29fae04 Merge branch 'ent-6608-OPEN-Servidores-SMTP-externos-no-mandan-e-mail-test' into 'develop' 
fixed string

See merge request artica/pandorafms!3870
 2021-03-01 10:05:04 +00:00
Daniel Rodriguez a0335b5fe6 Merge branch 'ent-4336-8257-separar-alertas-de-system-status-para-elegir-cuales-deseamos-recibir' into 'develop' 
Ent 4336 8257 separar alertas de system status para elegir cuales deseamos recibir

See merge request artica/pandorafms!3846
 2021-03-01 09:57:51 +00:00
Daniel Rodriguez 43c842ec75 Merge branch 'ent-6931-Cabecera-duplicada-en-Remote-component-management' into 'develop' 
Ent 6931 cabecera duplicada en remote component management

See merge request artica/pandorafms!3782
 2021-03-01 09:54:35 +00:00
Daniel Rodriguez 1767712c72 Merge branch 'ent-2530-bug-tokens-webserver-module' into 'develop' 
Fixed tokens htpp_auth user,avoid repetiton

See merge request artica/pandorafms!3734
 2021-03-01 09:53:55 +00:00
alejandro.campos@artica.es 86cd01418f fixed string 2021-02-26 09:41:53 +01:00
fbsanchez 0fb3ba9232 System status notifications filtered by subtype 2021-02-19 13:36:29 +01:00
Daniel Barbero Martin 6e3a3a1d38 Fixed error reports sla selected modules in metaconsole 2021-02-18 14:09:23 +01:00
fbsanchez b17d6349f7 Multiple fixes port defition 2021-02-09 13:44:21 +01:00
fbsanchez 5a38d31a6d Wizard (interfaces) backend performance improved 2021-02-04 13:11:47 +01:00
Daniel Rodriguez aba8813095 Merge branch 'ent-6384-consola-visual-nuevo-elemento-interfaz-de-red' into 'develop' 
First steps VC network link

See merge request artica/pandorafms!3521
 2021-02-03 13:29:44 +01:00
Marcos Alconada b7bf265cb4 changed ssl/tls to ssl 2021-02-03 11:09:38 +01:00
fbsanchez 380c77be02 Merge remote-tracking branch 'origin/develop' into ent-6384-consola-visual-nuevo-elemento-interfaz-de-red 
Conflicts:
	pandora_console/include/lib/Module.php
	pandora_console/include/visual-console-client/vc.main.css.map
 2021-02-02 12:15:24 +01:00
Luis e6cf2fe9eb Remove visual console manager extension 2021-01-28 11:57:52 +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
Jose Gonzalez d5b99f255a Solved issue 2021-01-26 13:46:12 +01:00
Jose Gonzalez 38ea74ed11 Updated merge 2021-01-25 13:36:12 +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 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
alejandro-campos 731d486455 changed behavior of All group and fixed acl vulnerability 2021-01-20 18:22:43 +01:00
Daniel Maya adf4c988ec Added warning 2021-01-19 16:03:34 +01:00
Daniel Maya 9bb6e7067b removed second head 2021-01-18 16:28:15 +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
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
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
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 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
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
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 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
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
Luis Calvo f6a1260eef Fixed event filter creation with empty name 2020-12-23 15:33:52 +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
Luis Calvo a8ab897d44 Fixed tokens htpp_auth user,avoid repetiton 2020-12-17 17:42:53 +01:00
Daniel Rodriguez 30650abaf0 Merge branch 'ent-6628-Titulo-y-subtitulos-borrados-en-la-open' into 'develop' 
Ent 6628 titulo y subtitulos borrados en la open

See merge request artica/pandorafms!3669
 2020-12-17 17:06:05 +01:00
Daniel Rodriguez 22159a6d69 Merge branch 'ent-6800-campos-no-se-guaerdan-plantillas' into 'develop' 
Ent 6800 campos no se guaerdan plantillas

Closes pandora_enterprise#6800

See merge request artica/pandorafms!3693
 2020-12-17 17:00:07 +01:00
daniel 76da033775 fix legend pdf chart verticals 2020-12-17 16:58:20 +01:00
Daniel Rodriguez b75d1149e0 Merge branch 'ent-4025-Cambio-de-contrase-en-user-edit-no-pide-contraseña-actual' into 'develop' 
active user password check

See merge request artica/pandorafms!3689
 2020-12-17 16:48:26 +01:00
Daniel Rodriguez 15df6c066b Merge branch 'ent-6613-bug-en-filtro-de-network-components-metaconsola' into 'develop' 
Ent 6613 bug en filtro de network components metaconsola

See merge request artica/pandorafms!3599
 2020-12-17 16:39:49 +01:00
José González 623b729001 Merge branch 'develop' into 'ent-1175-copyright-actualizados' 
# Conflicts:
#   pandora_agents/pc/Win32/pandora_agent.conf
#   pandora_agents/win32/bin/pandora_agent.conf
#   pandora_console/extensions/realtime_graphs.php
#   pandora_console/godmode/snmpconsole/snmp_alert.php
#   pandora_console/include/functions_ui.php
#   pandora_console/install.php
#   pandora_console/operation/agentes/realtime_win.php
 2020-12-14 11:10:35 +01:00
Daniel Rodriguez 4b51e26086 Merge branch 'ent-4231-crear-plugin-para-google-cloud-y-anadirlo-a-discovery' into 'develop' 
discovery.cloud.gcp

See merge request artica/pandorafms!3479
 2020-12-09 13:54:25 +01:00
fbsanchez b4bb0a1dcf warn while no instances are shown in map quick preview (discovery GCP) 2020-12-09 12:23:49 +01:00
fbsanchez d45a72f355 minor fix PM -> UM for cred access (managemnt) 2020-12-04 13:32:42 +01:00
Daniel Maya 369002cb96 inventory alerts 2020-12-04 10:31:22 +01:00
Jose Gonzalez 3fd983fb72 Fix 2020-12-03 15:51:40 +01:00
Daniel Maya 296cb9125e Ent 5316 anadir seccion credential store al menu de discovery 2020-12-03 14:48:12 +01:00