tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
21,558 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

21558 Commits

Author SHA1 Message Date
Daniel Maya 5ee9c6c536 Fixed encoded 2019-06-24 18:24:22 +02:00
Alejandro Gallardo Escobar b6f10f89d0 Fixed missing styles 2019-06-24 17:57:45 +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
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
Alejandro Gallardo Escobar 9076e9f2d8 Improved the vc items movement 2019-06-21 14:16:19 +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
artica e2e53cf248 Auto-updated build strings. 2019-06-21 00:01:08 +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
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
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
Alejandro Gallardo Escobar 7a932aceec Fixed the resizement of a vc item when it has a label 2019-06-20 11:27:08 +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
Daniel Maya ac8efd2bef delete cache item when updating 2019-06-19 18:00:53 +02:00
marcos.alconada 98eb1acf00 Add name alert to message 2019-06-19 17:55:09 +02:00
marcos.alconada 358c3f6a55 Changed message to module name 2019-06-19 16:04:08 +02:00
Alejandro Gallardo Escobar 08f100d608 Merge remote-tracking branch 'origin/develop' into ent-3997-anadir-posicionamiento-a-los-elementos-de-la-consola-visual 2019-06-19 15:19:38 +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
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
Rafael Ameijeiras 47fc2d70ad Merge branch 'ent-4235-deltete_forgoten_file' into 'develop' 
Ent 4235  deltete_forgoten_file

See merge request artica/pandorafms!2514
 2019-06-19 10:23:01 +02:00
Rafael Ameijeiras b428797004 delete_file 2019-06-19 10:12:06 +02:00
fbsanchez a7f9484adb minor style change 2019-06-19 08:43:37 +02:00
artica a5b140768a Auto-updated build strings. 2019-06-19 00:01:09 +02:00
fbsanchez 37e98d108b fit mc 2019-06-18 19:17:21 +02:00
fbsanchez 8b8d17f089 event ajax validation little improvement 2019-06-18 18:35:34 +02:00
Alejandro Gallardo Escobar 50b05728b7 Limited the vc item resizement to its container 2019-06-18 18:08:52 +02:00
fbsanchez 24025ebb74 Merge remote-tracking branch 'origin/develop' into ent-4136-button-styles 2019-06-18 17:48:03 +02:00
fbsanchez c3ebe88178 style review 2019-06-18 17:40:31 +02:00
Daniel Maya 649689b1a1 Update 2019-06-18 17:28:36 +02:00
Daniel Rodriguez a87e3ce97e Merge branch 'ent-3739-Vista-Agent-Module-view-no-funciona-en-pantalla-completa-y-autorefresco' into 'develop' 
Fixed bug in Agent-Module fullscreen view

See merge request artica/pandorafms!2299
 2019-06-18 17:00:15 +02:00
Alejandro Fraguas bb64524da9 Merge branch 'ent-4222-No-genera-custom-graphs-lines-average-summation' into 'develop' 
Fixed sum/avg graph infinite loop

See merge request artica/pandorafms!2513
 2019-06-18 16:58:33 +02:00
fbsanchez d290b91b28 RC1 event viewer v2 2019-06-18 16:07:53 +02:00
fbsanchez a1f004fdec minor fixes 2019-06-18 15:03:49 +02:00
Tatiana Llorente 46f64f75c8 Fixed autorefresh in full screen - #3739 2019-06-18 14:54:40 +02:00
fbsanchez 22272225b8 massive operations over events 2019-06-18 14:26:55 +02:00
Luis Calvo d3016a2839 Fixed sum/avg graph infinite loop 2019-06-18 14:04:38 +02:00
marcos.alconada d39be510cf Remove entitites to availability reports 2019-06-18 14:03:51 +02:00