Alejandro Fraguas
|
47838a1134
|
Merge branch 'ent-4213-SNMP-Walk-dede-modulo-creado-no-muestra-parametros-v3' into 'develop'
Ent 4213 snmp walk dede modulo creado no muestra parametros v3
See merge request artica/pandorafms!2511
|
2019-07-01 09:48:33 +02:00 |
|
Alejandro Fraguas
|
9b0defdc34
|
Merge branch 'ent-4075-Bug-Tactical-view-en-dashboard-publico-cuando-no-hacemos-login_2' into 'develop'
Fixed bug showing total events in tactical view on dashboard - #4075
See merge request artica/pandorafms!2509
|
2019-07-01 09:39:05 +02:00 |
|
artica
|
dd75aa6a42
|
Auto-updated build strings.
|
2019-07-01 00:01:07 +02:00 |
|
artica
|
c9f101eda6
|
Auto-updated build strings.
|
2019-06-30 00:01:05 +02:00 |
|
artica
|
eeffe40b6b
|
Auto-updated build strings.
|
2019-06-29 00:01:07 +02:00 |
|
Tatiana Llorente
|
c28185965a
|
Merge remote-tracking branch 'origin/develop' into ent-4112-Bug-visual-cuadro-de-datos-tipo-string
Conflicts:
pandora_console/include/styles/js/jquery-ui_custom.css
|
2019-06-28 12:28:13 +02:00 |
|
Daniel Maya
|
63e0df4434
|
Fixed unordered groups
|
2019-06-28 12:11:25 +02:00 |
|
Tatiana Llorente
|
52f391667a
|
Style changes - #4250
|
2019-06-28 10:24:53 +02:00 |
|
artica
|
8a04e2eec2
|
Auto-updated build strings.
|
2019-06-28 00:01:06 +02:00 |
|
alejandro-campos
|
3d75e045f9
|
added new fields to saml configuration and added check to not allow user creation with all group in case an empty value was specified in group name attribute input
|
2019-06-27 17:42:29 +02:00 |
|
Daniel Rodriguez
|
30e6d14a7a
|
Merge branch 'fix/dbschema-735' into 'develop'
Revert 28.sql
See merge request artica/pandorafms!2554
|
2019-06-27 16:07:58 +02:00 |
|
fbsanchez
|
5ccc16d7d6
|
Revert 28.sql
|
2019-06-27 15:04:58 +02:00 |
|
fbsanchez
|
d4971c8509
|
Merge branch 'fix/dbschema-735' into 'develop'
Minor fixes
See merge request artica/pandorafms!2552
|
2019-06-27 10:44:42 +02:00 |
|
fbsanchez
|
d956f08011
|
Minor fixes
|
2019-06-27 10:39:43 +02:00 |
|
artica
|
ead768c9df
|
Auto-updated build strings.
|
2019-06-27 00:01:10 +02:00 |
|
fbsanchez
|
cbd75f3d96
|
Merge branch 'fix/736-mr-aws-migration' into 'develop'
MR forgotten change
See merge request artica/pandorafms!2549
|
2019-06-26 19:41:55 +02:00 |
|
fbsanchez
|
470e399f50
|
Fixed url edit task in RDS
|
2019-06-26 19:34:34 +02:00 |
|
fbsanchez
|
225de6b5ea
|
MR forgotten change
|
2019-06-26 19:33:42 +02:00 |
|
alejandro-campos
|
2a69e3a75e
|
Merge remote-tracking branch 'origin/develop' into ent-3090-Personalizacion-saml-2
|
2019-06-26 18:06:23 +02:00 |
|
alejandro-campos
|
058abdd552
|
Add condition in tactical view to exclude disabled alerts from count of triggered alerts
|
2019-06-26 17:17:56 +02:00 |
|
Daniel Rodriguez
|
6f4ccff8b2
|
Merge branch 'ent-4256-cuenta-atras' into 'develop'
improved countdown
See merge request artica/pandorafms!2546
|
2019-06-26 17:00:12 +02:00 |
|
Alejandro Fraguas
|
4c6505e971
|
Merge branch 'ent-2966-net-tools' into 'develop'
Fixed
See merge request artica/pandorafms!2537
|
2019-06-26 16:31:28 +02:00 |
|
fbsanchez
|
58483e8748
|
improved countdown
|
2019-06-26 16:23:54 +02:00 |
|
daniel
|
dac6b3cc30
|
Merge branch 'update_current_package_736' into 'develop'
update current package
See merge request artica/pandorafms!2545
|
2019-06-26 15:41:16 +02:00 |
|
Daniel Barbero Martin
|
a10cf51b1b
|
update current package
|
2019-06-26 15:37:04 +02:00 |
|
Daniel Rodriguez
|
f681809f7b
|
Merge branch 'ent-4266-eliminar-los-flashes-al-recargar-graficas-en-la-consola-visuall' into 'develop'
Eliminar los flashes al recargar gráficas en la consola visual
See merge request artica/pandorafms!2533
|
2019-06-26 14:14:35 +02:00 |
|
Alejandro Fraguas
|
cda9cd6fe1
|
Merge branch 'ent-4234-Ventana-popup-que-muestra-graficas-no-tiene-en-cuenta-los-unknown-y-no-cabe' into 'develop'
Changed size for modal window for module graph- #4234
See merge request artica/pandorafms!2536
|
2019-06-26 13:43:57 +02:00 |
|
artica
|
fb407c51f2
|
Updated version and build strings.
|
2019-06-26 13:25:57 +02:00 |
|
artica
|
7fa78d62fb
|
Merge branch 'develop' of https://192.168.50.5:8081/artica/pandorafms into develop
|
2019-06-26 13:25:48 +02:00 |
|
Alejandro Gallardo Escobar
|
f36e7966a1
|
Merge remote-tracking branch 'origin/develop' into ent-4266-eliminar-los-flashes-al-recargar-graficas-en-la-consola-visuall
|
2019-06-26 13:13:36 +02:00 |
|
Daniel Rodriguez
|
4136f19190
|
Merge branch 'ent-4258-visual-console-movement-redimension-mode' into 'develop'
Visual Console's movement and redimension mode
See merge request artica/pandorafms!2527
|
2019-06-26 13:06:02 +02:00 |
|
Daniel Rodriguez
|
321ea717af
|
Merge branch 'ent-3644-bug-redireccion-de-static-graph' into 'develop'
Changed js
See merge request artica/pandorafms!2544
|
2019-06-26 13:02:50 +02:00 |
|
marcos.alconada
|
c223e0bdad
|
Changed js
|
2019-06-26 12:50:19 +02:00 |
|
marcos.alconada
|
006e0cd4ec
|
Changed js
|
2019-06-26 12:31:47 +02:00 |
|
Alejandro Fraguas
|
88ce26dee6
|
Merge branch 'ent-4141-Errores-en-el-Log-del-servidor' into 'develop'
Fixed uninitialized value in pattern match
See merge request artica/pandorafms!2542
|
2019-06-26 12:23:42 +02:00 |
|
Daniel Rodriguez
|
d68617eda1
|
Merge branch 'ent-4265-array-en-valor-min' into 'develop'
Changed variable that modify min values
See merge request artica/pandorafms!2538
|
2019-06-26 12:04:41 +02:00 |
|
Daniel Rodriguez
|
0ea5b7ff1b
|
Merge branch 'ent-4196-Eliminar-funcionalidad-QR-Code-in-header' into 'develop'
Removed option to show qr code in header - #4196
See merge request artica/pandorafms!2494
|
2019-06-26 12:04:00 +02:00 |
|
Daniel Rodriguez
|
6a27778efb
|
Merge branch 'ent-4204-error-al-editar-una-grafica-combinada-usando-previamente-un-filtro-de-busqueda' into 'develop'
Ent 4204 error al editar una grafica combinada usando previamente un filtro de busqueda
See merge request artica/pandorafms!2505
|
2019-06-26 12:03:13 +02:00 |
|
Daniel Rodriguez
|
6976ba9c8e
|
Merge branch 'ent-3800-mal-enrutamiento-discovery' into 'develop'
Ent 3800 mal enrutamiento discovery
See merge request artica/pandorafms!2350
|
2019-06-26 12:02:43 +02:00 |
|
artica
|
ff48757077
|
Merge remote-tracking branch 'remotes/origin/ent-4141-Errores-en-el-Log-del-servidor' into develop
|
2019-06-26 11:36:22 +02:00 |
|
Alejandro Gallardo Escobar
|
2993278178
|
Removed the resize functionality of the module graph vc item
|
2019-06-26 11:33:45 +02:00 |
|
Alejandro Fraguas
|
7224974520
|
Merge branch 'ent-3980-7966-aws-multicuenta-y-mejora-monitorizacion' into 'develop'
first steps credential store
See merge request artica/pandorafms!2523
|
2019-06-26 11:21:49 +02:00 |
|
fbsanchez
|
690b5cd7fd
|
Merge branch 'fix/adblock-avoid' into 'develop'
Fix class names to avoid addblock hide them
See merge request artica/pandorafms!2543
|
2019-06-26 11:16:23 +02:00 |
|
fbsanchez
|
f66e5b5ef8
|
Fix class names to avoid addblock hide them
|
2019-06-26 11:11:21 +02:00 |
|
fbsanchez
|
fdf2a983d2
|
general review credential store
|
2019-06-26 10:39:18 +02:00 |
|
fbsanchez
|
4754e20784
|
Merge remote-tracking branch 'origin/develop' into ent-3980-7966-aws-multicuenta-y-mejora-monitorizacion
|
2019-06-26 09:52:22 +02:00 |
|
Alejandro Fraguas
|
084c4cc651
|
Merge branch 'ent-4095-8090-cron-lock-ha' into 'develop'
Added get_lock/release_lock functions to functions_db
See merge request artica/pandorafms!2526
|
2019-06-26 09:24:58 +02:00 |
|
artica
|
9a65d8188a
|
Auto-updated build strings.
|
2019-06-26 00:01:09 +02:00 |
|
Daniel Rodriguez
|
61e07abf3a
|
Merge branch 'ent-4238-eventos-csv-e-historico' into 'develop'
Ent 4238 eventos csv e historico
See merge request artica/pandorafms!2515
|
2019-06-25 18:33:49 +02:00 |
|
Daniel Rodriguez
|
35c914dc34
|
Merge branch 'ent-4181-7962-LDAP-no-parsea-Advanced-Permissions-LDAP' into 'develop'
Fixed Advanced Permissions LDAP
See merge request artica/pandorafms!2521
|
2019-06-25 18:21:42 +02:00 |
|