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 |
|
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 |
|
fbsanchez
|
e1bf12a1fb
|
Credential store
|
2019-06-25 18:21:23 +02:00 |
|
fbsanchez
|
8f914b69a6
|
Minor fixes
|
2019-06-25 17:24:16 +02:00 |
|
fbsanchez
|
22d936d4f3
|
credential store some js controls
|
2019-06-25 16:43:38 +02:00 |
|
fbsanchez
|
96ca26dc97
|
minor fix in event mass response process
|
2019-06-25 16:05:56 +02:00 |
|
Daniel Rodriguez
|
6af895b9c1
|
Merge branch 'ent-3999-No-se-ve-icono-SO-en-eventos-en-metaconsola' into 'develop'
Added meta option in function ui_print_os_icon - #3999
See merge request artica/pandorafms!2502
|
2019-06-25 16:04:51 +02:00 |
|
fbsanchez
|
4ec8299b0c
|
Merge branch 'fix/alert-color' into 'ent-4238-eventos-csv-e-historico'
Fix/alert color
See merge request artica/pandorafms!2541
|
2019-06-25 15:31:44 +02:00 |
|
fbsanchez
|
c5675ded4c
|
fixed alert color
|
2019-06-25 15:24:42 +02:00 |
|
fbsanchez
|
004eb11048
|
MR29
|
2019-06-25 15:24:15 +02:00 |
|
Daniel Rodriguez
|
10aa0631af
|
Merge branch 'ent-4208-Ayuda-vacia-modulos-unknown' into 'develop'
Removed empty help in unknown modules - #4208
See merge request artica/pandorafms!2499
|
2019-06-25 14:47:20 +02:00 |
|
Daniel Rodriguez
|
b18de5cb1c
|
Merge branch 'ent-4160-Fallo-visual-SNMP-browser' into 'develop'
Fixed visual bug in snmp browser - #4160
See merge request artica/pandorafms!2531
|
2019-06-25 14:46:25 +02:00 |
|
Daniel Rodriguez
|
01514ba5b6
|
Merge branch 'ent-3699-descuadre-visual-recuperar-password' into 'develop'
Ent 3699 descuadre visual recuperar password
See merge request artica/pandorafms!2336
|
2019-06-25 14:26:57 +02:00 |
|
Daniel Rodriguez
|
63eca254f6
|
Merge branch 'ent-3888-cambio-titulo-plugin-creation' into 'develop'
changed title plugin creation to plugin registration
See merge request artica/pandorafms!2358
|
2019-06-25 14:25:34 +02:00 |
|
fbsanchez
|
1966c81f2d
|
Merge remote-tracking branch 'origin/develop' into ent-4238-eventos-csv-e-historico
|
2019-06-25 14:10:32 +02:00 |
|
Daniel Rodriguez
|
a3d0e3b55d
|
Merge branch 'ent-4040-menu-resources-no-esta-resaltado-en-vista-de-agente' into 'develop'
Condition is added to keep the selection color in the main menu
See merge request artica/pandorafms!2464
|
2019-06-25 13:10:15 +02:00 |
|
Daniel Rodriguez
|
2ab7e26d07
|
Merge branch 'ent-3821-Option-servers-operator-read' into 'develop'
Deleted Servers menu option for operator(read)
See merge request artica/pandorafms!2328
|
2019-06-25 13:09:23 +02:00 |
|
fbsanchez
|
674c68bd2b
|
avoided issue latin1 btoa javascript event transfer
|
2019-06-25 12:49:17 +02:00 |
|
fbsanchez
|
86600ca454
|
RSS menu filter loaded
|
2019-06-25 12:21:18 +02:00 |
|
Daniel Rodriguez
|
c5be8e55ae
|
Merge branch 'ent-3807-html-special-chars-conversion' into 'develop'
Ent 3807 html special chars conversion
See merge request artica/pandorafms!2320
|
2019-06-25 12:19:01 +02:00 |
|
Daniel Rodriguez
|
569bfa2329
|
Merge branch 'ent-3697-no-hay-opcion-a-ver-todos-los-grupos-con-permisos-correctos' into 'develop'
Pending Q&A
See merge request artica/pandorafms!2262
|
2019-06-25 12:06:07 +02:00 |
|
Daniel Rodriguez
|
ea7e4892c3
|
Merge branch 'ent-4064-7999-pandora-ha-eventserver-alertas-duplicadas' into 'develop'
HA related fixes to the Recon Server.
See merge request artica/pandorafms!2529
|
2019-06-25 10:36:16 +02:00 |
|
fbsanchez
|
a507d28c1f
|
Update Aws agent names
|
2019-06-25 10:12:25 +02:00 |
|
artica
|
a469ff29da
|
Auto-updated build strings.
|
2019-06-25 00:01:09 +02:00 |
|
fbsanchez
|
882aa67b3a
|
aws multi account viewer rc1
|
2019-06-24 20:35:24 +02:00 |
|
fbsanchez
|
2a95fbb87a
|
Merge remote-tracking branch 'origin/develop' into ent-3980-7966-aws-multicuenta-y-mejora-monitorizacion
|
2019-06-24 19:58:33 +02:00 |
|
fbsanchez
|
180948c51c
|
Import previous aws account
|
2019-06-24 19:36:50 +02:00 |
|
fbsanchez
|
381e30941d
|
Merge branch 'ent-4244-hearbeat-designs-gif' into 'develop'
new hearbeat designs
See merge request artica/pandorafms!2535
|
2019-06-24 19:32:11 +02:00 |
|
fbsanchez
|
c24d7dbbda
|
new hearbeat designs
|
2019-06-24 19:28:19 +02:00 |
|
fbsanchez
|
c1ac6b7ed6
|
mini_severity virtual column added
|
2019-06-24 19:23:41 +02:00 |
|
fbsanchez
|
c85965d793
|
SQLerror tasg reference
|
2019-06-24 19:05:46 +02:00 |
|
fbsanchez
|
0ea8904e0a
|
SQLerror tasg reference
|
2019-06-24 18:52:38 +02:00 |
|
fbsanchez
|
0ed382c42c
|
SQLerror tasg reference
|
2019-06-24 18:48:44 +02:00 |
|
Tatiana Llorente
|
13ecec40c2
|
Fixed visual bug in snmp browser - #4160
|
2019-06-24 17:08:21 +02:00 |
|
Ramon Novoa
|
3fe4256743
|
HA related fixes to the Recon Server.
|
2019-06-24 11:25:26 +02:00 |
|
fbsanchez
|
d6cb1bc207
|
minor fix in type check
|
2019-06-24 10:13:47 +02:00 |
|
fbsanchez
|
3616d6e871
|
Added get_lock/release_lock functions to functions_db
|
2019-06-24 10:00:16 +02:00 |
|
Alejandro Fraguas
|
ce1231eae6
|
Merge branch 'ent-3916-bulk-operation-alerts-no-entuentra-alertas' into 'develop'
Added option in massive delete alerts to show alerts on disabled modules
See merge request artica/pandorafms!2396
|
2019-06-24 09:55:44 +02:00 |
|
artica
|
c56f1dea9e
|
Auto-updated build strings.
|
2019-06-24 00:01:06 +02:00 |
|
artica
|
3bd4743247
|
Auto-updated build strings.
|
2019-06-23 00:01:08 +02:00 |
|