15166 Commits

Author SHA1 Message Date
Alejandro Fraguas
1acfaa9cdc Merge branch 'ent-5429-Cambios-en-el-editor-de-modulos' into 'develop'
Ent 5429 cambios en el editor de modulos

See merge request artica/pandorafms!3052
2020-02-18 14:03:36 +01:00
marcos
2dffb967cc Merge remote-tracking branch 'origin/develop' into ent-4705-encriptado-de-nuevos-tokens 2020-02-18 12:58:11 +01:00
alejandro-campos
b9e3c70374 fix bug when saving netflow filters 2020-02-18 11:25:45 +01:00
Daniel Barbero Martin
1ab92fe798 Fixed error event history VC 2020-02-18 08:08:56 +01:00
Daniel Barbero Martin
dd437be186 Merge remote-tracking branch 'origin/develop' into ent-5408-consola-visual-nueva-bugs 2020-02-18 07:55:19 +01:00
artica
92e1492f2b Auto-updated build strings. 2020-02-18 00:01:12 +01:00
marcos
7564249207 Merge remote-tracking branch 'origin/develop' into ent-4705-encriptado-de-nuevos-tokens 2020-02-17 16:15:29 +01:00
marcos
fbea1e7077 remove entities reports 2020-02-17 15:54:09 +01:00
marcos
dea661f14d update 2020-02-17 14:49:34 +01:00
marcos
6a8fa93358 updates 2020-02-17 13:53:38 +01:00
marcos
b521cc37fd update reports entitines 2020-02-17 13:17:33 +01:00
Daniel Barbero Martin
3ad9e3c420 Fixed error event history VC 2020-02-17 08:19:36 +01:00
Daniel Barbero Martin
f3b744717e Merge remote-tracking branch 'origin/develop' into ent-5408-consola-visual-nueva-bugs 2020-02-17 08:06:50 +01:00
artica
bf0211c9b8 Auto-updated build strings. 2020-02-17 00:01:09 +01:00
artica
6a3d1b4992 Auto-updated build strings. 2020-02-16 00:01:08 +01:00
artica
19b59f2819 Auto-updated build strings. 2020-02-15 00:01:16 +01:00
artica
e60ccb8a68 Auto-updated build strings. 2020-02-14 00:01:12 +01:00
Daniel Barbero Martin
f9c944fa8d Fixed error events history VC 2020-02-13 10:08:50 +01:00
Daniel Barbero Martin
c96dd8e930 Fix selector modules only string in VC barsgraph and donutgraph 2020-02-13 09:55:49 +01:00
Daniel Barbero Martin
cad6889c46 Merge remote-tracking branch 'origin/develop' into ent-5408-consola-visual-nueva-bugs 2020-02-13 07:58:06 +01:00
artica
d1663cd242 Auto-updated build strings. 2020-02-13 00:01:09 +01:00
Daniel Maya
e908019d4f Ent 5318 no hay opcion de pantalla completa para las consolas visuales en la meta 2020-02-12 17:05:29 +01:00
artica
79fe01ee56 Auto-updated build strings. 2020-02-12 00:01:09 +01:00
Daniel Rodriguez
5d436d214b Merge branch 'ent-4740-revision-completa-de-informes-templates-en-nodo' into 'develop'
Fixed bug in prediction report item 4740

See merge request artica/pandorafms!2872
2020-02-11 15:39:26 +01:00
marcos
97cda17560 remove help_event_alert.php 2020-02-11 12:00:04 +01:00
alejandro-campos
526ba37151 minor visual change in threshold graph 2020-02-11 10:10:03 +01:00
Daniel Barbero Martin
962b3d2248 Fix linked ACL another VC 2020-02-11 09:45:43 +01:00
Alejandro Fraguas
f1a52d6272 Merge branch 'ent-4771-Revision-llamada-API-create-event-en-metaconsola' into 'develop'
Ent 4771 revision llamada api create event en metaconsola

See merge request artica/pandorafms!2793
2020-02-11 09:37:40 +01:00
Daniel Barbero Martin
1d2ad47507 Merge remote-tracking branch 'origin/develop' into ent-5408-consola-visual-nueva-bugs 2020-02-11 07:57:42 +01:00
artica
0db7abbe9e Auto-updated build strings. 2020-02-11 00:01:12 +01:00
Daniel Barbero Martin
0042f390ef Fixed errors VC 2020-02-10 17:31:48 +01:00
Tatiana Llorente
740dcdb35b Changed id_agent for id_tagent 2020-02-10 17:10:39 +01:00
Tatiana Llorente
9a84c8c893 Changed id_agent for id_tagent 2020-02-10 17:05:03 +01:00
Tatiana Llorente
19f07b9b9e Changed id_agent for id_tagent 2020-02-10 17:01:36 +01:00
Tatiana Llorente
6dd1ee24e5 Merge remote-tracking branch 'origin/develop' into ent-4771-Revision-llamada-API-create-event-en-metaconsola 2020-02-10 16:48:38 +01:00
Daniel Maya
363b3e8a80 Changed pandora fms by product name 2020-02-10 16:21:04 +01:00
Alejandro Fraguas
0538bd5185 Merge branch 'ent-5227-Problema-encoding-aplicación-politicas' into 'develop'
Ent 5227 problema encoding aplicación politicas

See merge request artica/pandorafms!3055
2020-02-10 12:14:19 +01:00
Jose Gonzalez
0b7d4a9463 Added solution for UTF8 charset in treeview and main agent view 2020-02-10 11:16:57 +01:00
Daniel Rodriguez
6faac04672 Merge branch 'ent-5267-Fechas-erroneas-en-availability-graph' into 'develop'
Fixed date in availability graph

See merge request artica/pandorafms!3027
2020-02-10 10:46:55 +01:00
Daniel Rodriguez
6e3d70cd76 Merge branch 'ent-5411-Availability-graphs-visualización-pdf' into 'develop'
Ent 5411 availability graphs visualización pdf

See merge request artica/pandorafms!3048
2020-02-10 10:06:15 +01:00
Daniel Barbero Martin
d99d31b432 Merge remote-tracking branch 'origin/develop' into ent-5408-consola-visual-nueva-bugs 2020-02-10 09:54:03 +01:00
artica
583c605b31 Auto-updated build strings. 2020-02-10 00:01:08 +01:00
artica
47b60c29d6 Auto-updated build strings. 2020-02-09 00:01:08 +01:00
artica
1be17441e7 Auto-updated build strings. 2020-02-08 00:01:08 +01:00
alejandro-campos
58364f90d5 visual changes in module creation 2020-02-07 14:01:59 +01:00
alejandro-campos
bc96e0b32a visual changes in module creation 2020-02-07 13:59:50 +01:00
artica
0cb2f88540 Auto-updated build strings. 2020-02-07 00:01:25 +01:00
Luis
56a2970755 Ent 5112 error nodos ficticios widget mapa red 2020-02-06 14:32:43 +01:00
artica
36fdaf3ff7 Auto-updated build strings. 2020-02-06 00:01:11 +01:00
Daniel Barbero Martin
68dd01ba09 fixed errors VC 2020-02-05 18:56:28 +01:00