1662 Commits

Author SHA1 Message Date
daniel
6db07e5fe0 fixed errors CV dashboards 2021-03-03 12:42:02 +00:00
Daniel Rodriguez
23edf2f11f Merge branch 'ent-6751-Al-poner-en-unidades-distintas-del-selector-no-se-puede-volver-a-dejar-en-blanco' into 'develop'
Ent 6751 al poner en unidades distintas del selector no se puede volver a dejar en blanco

See merge request artica/pandorafms!3695
2021-03-01 12:14:54 +00:00
Daniel Rodriguez
72ecb53412 Merge branch 'ent-6602-AXA-Recursividad-de-grupos-no-funciona-en-operaciones-masivas' into 'develop'
fix recursivity check

See merge request artica/pandorafms!3711
2021-03-01 10:57:45 +00:00
Daniel Rodriguez
b2ed2f5511 Merge branch 'ent-6833-planned-downtimes-any-no-funciona' into 'develop'
Fix issue with adding agents and modules

Closes pandora_enterprise#6833

See merge request artica/pandorafms!3723
2021-03-01 10:05:59 +00:00
Jose Gonzalez
7cfc1d2f9a Fixed issue with all modules 2021-02-25 16:08:02 +01:00
Jose Gonzalez
ed6c6dfad5 Hide OK button meanwhile is loading data 2021-02-16 13:43:10 +01:00
Luis Calvo
514b3fca09 Fixed module library download links 2021-02-15 12:55:35 +01:00
Jose Gonzalez
e727f7c276 Added modals and fixed some bugs 2021-02-12 11:28:13 +01:00
fbsanchez
20dc58a140 Improved event widget, added custom filters 2021-02-10 18:41:53 +01:00
fbsanchez
b17d6349f7 Multiple fixes port defition 2021-02-09 13:44:21 +01:00
fbsanchez
ecf0f3d161 Force error catching while SNMP browsing 2021-02-09 10:25:42 +01:00
fbsanchez
e711239c69 Added port, limited base OID (default) removed timeout (browser) capturing error to message 2021-02-08 17:42:41 +01:00
Jose Gonzalez
d9d82e1803 Fixed sorting by description 2021-02-08 10:22:38 +01:00
fbsanchez
d2b166c295 fixes MC graphs in network link + vc links between mc and nodes 2021-02-03 12:53:05 +01:00
fbsanchez
906ac7f13f fixes VC in MC 2021-02-02 18:40:55 +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
Jose Gonzalez
38ea74ed11 Updated merge 2021-01-25 13:36:12 +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
fbsanchez
bf453ab0ef Effective command preview (action) 2021-01-21 17:09:36 +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
alejandro-campos
a0931d7ada changes in dashboard permissions 2021-01-15 13:52:31 +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
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
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
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
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
alejandro-campos
f03b4e59f8 several fixes in netscan custom 2020-12-18 11:40:22 +01:00
daniel
b230e17cc2 fix report groups status metaconsole 2020-12-17 17:04:52 +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
alejandro-campos
092011916b fix recursivity check 2020-12-10 16:07: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
Daniel Maya
244c4d56d6 Fixed unit 2020-12-04 12:32:38 +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
Luis
50b1fa3c56 Changed check connection method to ajax. Check deleted from login 2020-12-03 12:27:55 +01:00
Daniel Barbero Martin
3592368a3c Fix gridstack js version 1.2 2020-12-02 14:26:20 +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
f72d924f1e ticket 6435 2020-12-02 10:10:34 +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
Luis
734341bf2d Ent 6148 new report permissions 2020-11-30 14:52:03 +01:00
Jose Gonzalez
649442f794 Updated copyrights 2020-11-27 13:52:35 +01:00
Jose Gonzalez
9bf70add51 Fixed snmp server selection 2020-11-26 10:35:48 +01:00
Daniel Rodriguez
80b60d101c Merge branch 'ent-6157-Fallos-en-servicios-dinamicos' into 'develop'
Added new js file

Closes pandora_enterprise#6157

See merge request artica/pandorafms!3635
2020-11-25 10:35:47 +01:00
Jose Gonzalez
063bf967f4 Added new js file 2020-11-20 10:24:15 +01:00
José González
32dcd8a7ca Merge branch 'develop' into 'ent-6398-Poner-ojito-mostrar-passwords'
# Conflicts:
#   pandora_console/include/javascript/pandora_ui.js
2020-11-19 15:21:58 +01:00
fbsanchez
d08aa0b32b Updates in parent relationship ** WARN: bad relation line move while other lines are attached 2020-11-12 18:25:16 +01:00
fbsanchez
14db9c63c6 Sticky lines (VC) 2020-11-12 16:57:14 +01:00
Daniel Maya
0ea8196db0 Fixed create network components 2020-11-12 13:44:52 +01:00
fbsanchez
b8437bec79 Merge remote-tracking branch 'origin/develop' into ent-6384-consola-visual-nuevo-elemento-interfaz-de-red 2020-11-11 11:09:30 +01:00