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 |
|
fbsanchez
|
067a19f69b
|
WIP sticky lines
|
2020-11-06 20:37:37 +01:00 |
|
Luis
|
2f2556ef79
|
Ent 6680 ventana de perdida de conexion incorrecta
|
2020-11-04 16:41:25 +01:00 |
|
fbsanchez
|
c59042c034
|
WIP
|
2020-11-03 18:01:24 +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
|
c4e7c6b5f1
|
fix events acknowledge-by
|
2020-10-30 14:42:10 +01:00 |
|
fbsanchez
|
90f199c5ad
|
WIP NetworkLink
|
2020-10-30 14:07:44 +01:00 |
|
daniel
|
4e2d5bdf2b
|
fix counter groups child
|
2020-10-30 13:23:47 +01:00 |
|
fbsanchez
|
326d1dac49
|
Merge remote-tracking branch 'origin/develop' into ent-6384-consola-visual-nuevo-elemento-interfaz-de-red
|
2020-10-30 10:38:30 +01:00 |
|
Marcos Alconada
|
8e4c62a0e9
|
fixed error
|
2020-10-29 18:20:33 +01:00 |
|
fbsanchez
|
8e09a30a05
|
WIP Networklink POC
|
2020-10-29 17:20:16 +01:00 |
|
Daniel Rodriguez
|
0a24fedb5a
|
Merge branch 'ent-6606-mostrar-descripcion-de-servicios-en-vista-de-arbol' into 'develop'
Use service description instead of name in tree view
See merge request artica/pandorafms!3570
|
2020-10-28 11:19:49 +01:00 |
|
alejandro-campos
|
6ff11239e4
|
fixed connection check in public link of visual consoles
|
2020-10-26 14:44:05 +01:00 |
|
Kike
|
3287223b4d
|
Use service description instead of name in tree view
|
2020-10-26 12:05:37 +01:00 |
|