24159 Commits

Author SHA1 Message Date
Alejandro Gallardo Escobar
b6f10f89d0 Fixed missing styles 2019-06-24 17:57:45 +02:00
marcos.alconada
280459dc1a Show new filters for group events reports 2019-06-24 17:28:46 +02:00
Alejandro Gallardo Escobar
83acaf3164 Updated the visual console client bundles 2019-06-24 17:25:36 +02:00
Alejandro Gallardo Escobar
94764bf92e Bugfixes
(cherry picked from commit 3421f21cdf71447bf029028c138e203689aa38a2)
2019-06-24 17:23:55 +02:00
Tatiana Llorente
13ecec40c2 Fixed visual bug in snmp browser - #4160 2019-06-24 17:08:21 +02:00
Tatiana Llorente
43b83af2c6 Changed default images status set for css - #4195 2019-06-24 11:59:17 +02:00
Ramon Novoa
3fe4256743 HA related fixes to the Recon Server. 2019-06-24 11:25:26 +02:00
Alejandro Gallardo Escobar
d9fee539a8 Merge branch 'develop' into 'ent-4258-visual-console-movement-redimension-mode'
# Conflicts:
#   pandora_console/include/visual-console-client/vc.main.css
2019-06-24 10:31:53 +02:00
Alejandro Gallardo Escobar
84f2129f5e Updated the visual console client bundles 2019-06-24 10:18:27 +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
fbsanchez
38f72bed8d AWS multi account 2019-06-22 13:11:35 +02:00
fbsanchez
c11cd556ce WIP: AWS CS controller 2019-06-22 01:10:05 +02:00
artica
0878af4ab1 Auto-updated build strings. 2019-06-22 00:01:08 +02:00
fbsanchez
5658b98f0b intuitive credential store 2019-06-21 23:51:22 +02:00
fbsanchez
e4f6a95a89 MR29 credential store 2019-06-21 23:05:21 +02:00
fbsanchez
e9ef9b64a3 credential_store 2019-06-21 19:34:47 +02:00
Luis Calvo
f7f81f5344 Custom fields url improved 2019-06-21 16:26:13 +02:00
Alejandro Gallardo Escobar
9076e9f2d8 Improved the vc items movement 2019-06-21 14:16:19 +02:00
alejandro-campos
58009b43c6 fix bug: custom graphs not showing properly 2019-06-21 13:39:48 +02:00
Daniel Maya
8f5a206027 Fixed vc-control in public visual console 2019-06-21 13:17:37 +02:00
Daniel Maya
379a0039ae Fixed vc-control 2019-06-21 12:41:05 +02:00
marcos.alconada
96799cb743 Merge branch 'ent-3837-7848-campo-id_source_event-en-vista-de-eventos-y-poder-filtrar-por-este' of https://brutus.artica.lan:8081/artica/pandorafms into ent-3837-7848-campo-id_source_event-en-vista-de-eventos-y-poder-filtrar-por-este 2019-06-21 12:37:51 +02:00
marcos.alconada
31ec8933a2 changed duplicated code with id_souce_event field 2019-06-21 12:37:32 +02:00
Marcos Alconada
fb24d9bf86 Update 29.sql 2019-06-21 12:08:31 +02:00
fbsanchez
6682bad19f first steps credential store 2019-06-21 12:03:25 +02:00
Marcos Alconada
56a7943a06 Update pandoradb_migrate_6.0_to_7.0.mysql.sql 2019-06-21 11:35:56 +02:00
marcos.alconada
effbf5094f Merge branch 'ent-3837-7848-campo-id_source_event-en-vista-de-eventos-y-poder-filtrar-por-este' of https://brutus.artica.lan:8081/artica/pandorafms into ent-3837-7848-campo-id_source_event-en-vista-de-eventos-y-poder-filtrar-por-este 2019-06-21 11:34:49 +02:00
marcos.alconada
3fd12975aa added 2 lines 2019-06-21 11:34:36 +02:00
Marcos Alconada
f1110c6d56 Merge branch 'develop' into 'ent-3837-7848-campo-id_source_event-en-vista-de-eventos-y-poder-filtrar-por-este'
# Conflicts:
#   pandora_console/extras/mr/29.sql
2019-06-21 11:31:01 +02:00
marcos.alconada
1dc826c9ff Added field to tevent_filter (id_source_event) 2019-06-21 11:29:51 +02:00
marcos.alconada
a0c6dc69aa add element id_source_event to filters events 2019-06-21 11:22:06 +02:00
artica
e2e53cf248 Auto-updated build strings. 2019-06-21 00:01:08 +02:00
fbsanchez
7a425e7e96 qa event viewer latest fixes 2019-06-20 21:33:38 +02:00
fbsanchez
526ebdebd9 ajax comments 2019-06-20 21:11:56 +02:00
fbsanchez
9fa9a346ca Merge remote-tracking branch 'origin/develop' into ent-4238-eventos-csv-e-historico 2019-06-20 19:23:39 +02:00
fbsanchez
8671c7c88c events qa adjustments 2019-06-20 19:23:13 +02:00
Alejandro Gallardo Escobar
cd5ad59f56 WIP: VC items movement 2019-06-20 18:19:10 +02:00
Daniel Maya
71ea94eea3 Fixed item save 2019-06-20 16:36:24 +02:00
Daniel Rodriguez
265202f1ed Merge branch 'ent-4136-button-styles' into 'develop'
Review 1

See merge request artica/pandorafms!2470
2019-06-20 16:35:12 +02:00
fbsanchez
2c5cd007d2 reset form on load filter none 2019-06-20 14:18:49 +02:00
Alejandro Fraguas
c173f9a58f Merge branch 'ent-4209-bug-vc-grafica-sla-automatica-explota-en-cuanto-se-le-ajustan-un-label' into 'develop'
Bug en label de  auto sla graph

See merge request artica/pandorafms!2517
2019-06-20 13:53:07 +02:00
fbsanchez
aa238165d9 events rss 2019-06-20 13:33:37 +02:00
alejandro-campos
13e53e5b10 modified api function for adding agent to policy to make it available on meta 2019-06-20 13:05:19 +02:00
fbsanchez
cfe16ee8c3 minor fixes 2019-06-20 11:46:01 +02:00
Alejandro Fraguas
4660ca286f Merge branch 'ent-4225-No-se-pueden-crear-componentes-de-red-en-la-meta' into 'develop'
Ent 4225 no se pueden crear componentes de red en la meta

See merge request artica/pandorafms!2516
2019-06-20 11:41:21 +02:00
Daniel Maya
e182997308 Merge branch 'ent-3994-Añadir-actualización-de-ciertos-valores-a-la-api-web-de-la-consola-visual' into ent-3997-anadir-posicionamiento-a-los-elementos-de-la-consola-visual 2019-06-20 11:40:33 +02:00