21565 Commits

Author SHA1 Message Date
fbsanchez
96ca26dc97 minor fix in event mass response process 2019-06-25 16:05:56 +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
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
artica
a469ff29da Auto-updated build strings. 2019-06-25 00:01:09 +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
Ramon Novoa
3fe4256743 HA related fixes to the Recon Server. 2019-06-24 11:25:26 +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
artica
0878af4ab1 Auto-updated build strings. 2019-06-22 00:01:08 +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
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
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
Alejandro Fraguas
57e3c147c8 Merge branch 'ent-3959-eventos-de-validacion-manual-de-alertas' into 'develop'
Changed message to module name

See merge request artica/pandorafms!2518
2019-06-20 10:22:15 +02:00
artica
61b35d4bf2 Auto-updated build strings. 2019-06-20 00:01:08 +02:00
marcos.alconada
98eb1acf00 Add name alert to message 2019-06-19 17:55:09 +02:00
fbsanchez
275261e6b3 wip csv export events 2019-06-19 17:30:32 +02:00
fbsanchez
6b944ead97 minor fix 2019-06-19 17:08:18 +02:00
fbsanchez
44d8b977cb event advanced filter fixes 2019-06-19 16:52:14 +02:00
marcos.alconada
358c3f6a55 Changed message to module name 2019-06-19 16:04:08 +02:00
Alejandro Gallardo Escobar
c87919af94 Bugfix 2019-06-19 15:17:13 +02:00
alejandro-campos
45d544ca5d remove typo error in commit 2019-06-19 15:14:41 +02:00
alejandro-campos
5503abc8e1 fix bug in metaconsoles network component creation 2019-06-19 15:12:17 +02:00
Alejandro Fraguas
9a24c90725 Merge branch 'ent-4134-los-informes-no-funcionan-al-exportar-a-csv-json-ni-xml' into 'develop'
Remove entities from json reports

See merge request artica/pandorafms!2512
2019-06-19 14:17:58 +02:00
fbsanchez
524575171a event history viewer 2019-06-19 12:56:16 +02:00
marcos.alconada
174db17a05 remove entities from reports 2019-06-19 12:33:11 +02:00
Daniel Rodriguez
cfaeaa3c9c Merge branch 'ent-3295-revision-comportamiento-metaconsola-con-nodo-multi-servidor' into 'develop'
Ent 3295 revision comportamiento metaconsola con nodo multi servidor

See merge request artica/pandorafms!2440
2019-06-19 12:15:14 +02:00
fbsanchez
4424189632 Merge remote-tracking branch 'origin/develop' into ent-3295-revision-comportamiento-metaconsola-con-nodo-multi-servidor 2019-06-19 10:51:34 +02:00