2020 Commits

Author SHA1 Message Date
Jose Gonzalez
1fc1752b01 Solved merge 2021-01-12 13:26:48 +01:00
fbsanchez
3eb4af5fd7 Merge remote-tracking branch 'origin/develop' into ent-6782-revision-general-de-la-consola-movil
Conflicts:
	pandora_console/mobile/operation/visualmap.php
	pandora_console/mobile/operation/visualmaps.php
2021-01-07 10:59:02 +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
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
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
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
fbsanchez
f72dabb04c New VC in mobile view (RC1) 2020-12-21 14:23:50 +01:00
Jose Gonzalez
5f0d686034 Changed Network Tools for External Tools 2020-12-18 12:31:44 +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
ec472f6c6f Merge branch 'ent-6446-Bug-visual-en-el-full-screen-mode-de-consolas-visuales' into 'develop'
fix visual view pure CV

See merge request artica/pandorafms!3643
2020-12-17 16:45:05 +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 Barbero Martin
aa52ab01df Fix loading charts modules and interfaces 2020-12-09 14:05:40 +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
34374159de gcp reviewed 2020-12-03 18:00:20 +01:00
Daniel Rodriguez
9aaae58cc7 Merge branch 'ent-2323-Modo-Debug-instantáneo' into 'develop'
Added QueryResult ui type

See merge request artica/pandorafms!3517
2020-12-03 14:43:44 +01:00
Daniel Rodriguez
e8071f18b1 Merge branch 'ent-6795-clase-invisible-no-importa-tanto' into 'develop'
Fixed

Closes pandora_enterprise#6795

See merge request artica/pandorafms!3678
2020-12-03 12:29:22 +01:00
alejandro-campos
8aa18a1236 active user password check 2020-12-02 16:29:45 +01:00
Jose Gonzalez
f2a94b9aa5 Merge 2020-12-02 11:38:22 +01:00
Jose Gonzalez
eeac1ca35e Merge 2020-12-02 11:28:46 +01:00
Marcos Alconada
909645b4ab fixed visual error alert correlated alerts 2020-12-02 10:15:33 +01:00
fbsanchez
eb67b387b9 Merge remote-tracking branch 'origin/develop' into ent-4231-crear-plugin-para-google-cloud-y-anadirlo-a-discovery
Conflicts:
	pandora_console/include/class/CredentialStore.class.php
2020-12-01 17:32:02 +01:00
Jose Gonzalez
82202fe620 Fixed 2020-12-01 12:39:37 +01:00
fbsanchez
54d5529599 removed duplicated methods (unified in HTML class) added minor improvements 2020-11-30 17:50:36 +01:00
Luis
734341bf2d Ent 6148 new report permissions 2020-11-30 14:52:03 +01:00
Daniel Rodriguez
3801fffa6e Merge branch 'ent-5719-9894-2fa-forzar-habilitado-y-no-poder-ser-desactivado-por-el-usuario' into 'develop'
F2 feature

See merge request artica/pandorafms!3493
2020-11-30 14:28:03 +01:00
Jose Gonzalez
649442f794 Updated copyrights 2020-11-27 13:52:35 +01:00
marcos
1ce48c812f updated 2fa all user 2020-11-26 18:11:30 +01:00
Daniel Barbero Martin
9c99058f30 fix custom graph 2020-11-25 17:29:09 +01:00
Jose Gonzalez
60ca2109f3 Solved issue with full screen 2020-11-25 11:59:03 +01:00
Jose Gonzalez
7984d9fcab Fix visual issue 2020-11-25 11:44:12 +01:00
Jose Gonzalez
912b2179bd Fix visual issues 2020-11-25 11:36:14 +01:00
Jose Gonzalez
ed1b8f9713 Fix some bugs and added surround input feature 2020-11-24 15:51:02 +01:00
Daniel Barbero Martin
af6bab49e9 fix visual view pure CV 2020-11-24 12:04:25 +01:00
Jose Gonzalez
f081a6e376 Merge remote-tracking branch 'origin/develop' into ent-6542-agents-alerts-view-fallos-visuales
Merge with last updates
2020-11-23 10:08:16 +01:00
Daniel Barbero Martin
1ad1671612 fix remove acl widget agent/module 2020-11-23 09:29:11 +01:00
fbsanchez
4e73d8045a Minor fixes 2020-11-17 11:07:59 +01:00
Jose Gonzalez
b5dc75ce93 WIP: Backup upload 2020-11-04 16:40:18 +01:00
fbsanchez
b585a4e372 Merge remote-tracking branch 'origin/develop' into ent-6384-consola-visual-nuevo-elemento-interfaz-de-red 2020-11-03 16:35:25 +01:00
fbsanchez
d85c1ace3c WIP network links VC 2020-11-03 16:35:11 +01:00
Daniel Rodriguez
79db1c3236 Merge branch 'ent-6599-errores-en-filtro-de-monitor-detail' into 'develop'
removed strict-user from monitor detail

See merge request artica/pandorafms!3568
2020-10-30 13:28:35 +01:00
Daniel Rodriguez
64df831302 Merge branch 'ent-6657-Se-quedan-bloqueados-zooms-en-las-graficas' into 'develop'
fix charts

See merge request artica/pandorafms!3581
2020-10-30 13:23:03 +01:00
fbsanchez
24ba5f2615 Merge remote-tracking branch 'origin/develop' into ent-6599-errores-en-filtro-de-monitor-detail 2020-10-29 12:13:21 +01:00
fbsanchez
fe681ba9d7 minor style added 2020-10-29 12:13:15 +01:00
Daniel Rodriguez
318094d758 Merge branch 'ent-6478-Bug-en-la-vista-HTML-y-PDF-de-los-items-AVG-MAX-MIN-Value-de-informes-y-templates' into 'develop'
fixed report avg-min-max

See merge request artica/pandorafms!3540
2020-10-28 15:19:32 +01:00
Daniel Barbero Martin
9b81da193b fix charts 2020-10-28 12:50:15 +01:00
Daniel Barbero Martin
2b2acefa31 Snmp and WMI in recon task move open 2020-10-27 15:02:05 +01:00
Daniel Barbero Martin
685acc6c20 fixed report avg-min-max 2020-10-20 16:00:19 +02:00
Jose Gonzalez
dc15125cd8 Merge remote-tracking branch 'origin/develop' into ent-2323-Modo-Debug-instantáneo
Update
2020-10-15 12:27:59 +02:00
Daniel Barbero Martin
8a72074a8a fixed sql graph pie 2020-10-09 12:05:57 +02:00
Jose Gonzalez
3b14453d1e WIP: Added QueryResult ui type 2020-10-08 13:47:26 +02:00