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 |
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 |
|
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 |
|
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
|
34374159de
|
gcp reviewed
|
2020-12-03 18:00:20 +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
|
82202fe620
|
Fixed
|
2020-12-01 12:39:37 +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
|
ed1b8f9713
|
Fix some bugs and added surround input feature
|
2020-11-24 15:51:02 +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 |
|
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 |
|
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 Barbero Martin
|
9b81da193b
|
fix charts
|
2020-10-28 12:50:15 +01:00 |
|
Daniel Barbero Martin
|
685acc6c20
|
fixed report avg-min-max
|
2020-10-20 16:00:19 +02:00 |
|
Daniel Barbero Martin
|
8a72074a8a
|
fixed sql graph pie
|
2020-10-09 12:05:57 +02:00 |
|
daniel
|
3455de7f85
|
fixed visual errors and default values
|
2020-10-07 16:03:52 +02:00 |
|
fbsanchez
|
2187f9d0c9
|
Merge remote-tracking branch 'origin/develop' into ent-5822-prueba-concepto-modal-selector-de-grupos
Conflicts:
pandora_console/godmode/reporting/reporting_builder.item_editor.php
|
2020-10-02 14:56:07 +02:00 |
|
daniel
|
a5d5a45cac
|
add render graph to reports
|
2020-10-02 14:16:55 +02:00 |
|
daniel
|
0db539c444
|
fix visual windows charts
|
2020-10-01 15:29:54 +02:00 |
|
fbsanchez
|
679d72e5c0
|
minor fix
|
2020-10-01 14:05:25 +02:00 |
|
fbsanchez
|
5d63bc547e
|
Group selection review
|
2020-09-29 14:22:58 +02:00 |
|
fbsanchez
|
5f4893ef1a
|
Merge remote-tracking branch 'origin/develop' into ent-5822-prueba-concepto-modal-selector-de-grupos
|
2020-09-29 12:47:11 +02:00 |
|
fbsanchez
|
f69166bd53
|
Updates style width group selector
|
2020-09-28 18:04:46 +02:00 |
|
fbsanchez
|
d152ba2980
|
estado_agente prevent filter options overlapping
|
2020-09-28 16:11:26 +02:00 |
|
fbsanchez
|
589d9c1d7c
|
minor fixes
|
2020-09-14 17:48:38 +02:00 |
|
fbsanchez
|
3374a89ae0
|
Group selection improvement
|
2020-09-11 14:34:41 +02:00 |
|
Daniel Rodriguez
|
846fd10ce1
|
Merge branch 'ent-5824-connection-lost-warn' into 'develop'
Ent 5824 connection lost warn
See merge request artica/pandorafms!3326
|
2020-07-14 18:10:11 +02:00 |
|
fbsanchez
|
3d493f14da
|
massive services
|
2020-07-07 19:10:24 +02:00 |
|
Luis Calvo
|
d3087de163
|
Merge remote-tracking branch 'origin/develop' into ent-5824-connection-lost-warn
|
2020-07-06 10:49:24 +02:00 |
|
José González
|
311b259684
|
Backup upload
|
2020-06-30 12:16:51 +02:00 |
|
Luis Calvo
|
d346c76322
|
Connection error dialog working
|
2020-06-19 23:03:37 +02:00 |
|
fbsanchez
|
b3cf532c16
|
Merge remote-tracking branch 'origin/develop' into ent-5756-pantallas-de-configuracion-del-cluster
|
2020-05-29 12:30:49 +02:00 |
Tatiana Llorente
|
b99298786e
|
Ent 5754 editor de usuarios de godmode que sea visualmente similar al editor de usuarios el propio usuario
|
2020-05-19 08:20:04 +02:00 |
|
fbsanchez
|
57ccd783b0
|
Merge branch 'develop' into 'ent-5756-pantallas-de-configuracion-del-cluster'
|
2020-05-14 17:42:58 +02:00 |
|
fbsanchez
|
92ff713651
|
1st approach
|
2020-05-05 18:58:45 +02:00 |
|
fbsanchez
|
7024863fd7
|
Merge remote-tracking branch 'origin/develop' into ent-4176-8084-8169-actualizacion-selenium-firefox-wux
Conflicts:
pandora_console/extras/mr/37.sql
|
2020-04-14 16:06:17 +02:00 |
|
Jose Gonzalez
|
6f0b1c005f
|
Added invisible class
|
2020-04-13 15:41:35 +02:00 |
|
fbsanchez
|
5c405b1d32
|
Merge remote-tracking branch 'origin/develop' into ent-4176-8084-8169-actualizacion-selenium-firefox-wux
|
2020-04-08 10:18:13 +02:00 |