daniel
|
6b80ce6967
|
Merge remote-tracking branch 'origin/develop' into 1826-Graficas_TIP_eje_x_no_mantiene_ratio
|
2018-02-26 08:36:31 +01:00 |
artica
|
4b9dd69a0f
|
Auto-updated build strings.
|
2018-02-26 00:01:52 +01:00 |
|
artica
|
6eb5f20d17
|
Auto-updated build strings.
|
2018-02-25 00:02:06 +01:00 |
|
artica
|
4dae0c97c0
|
Auto-updated build strings.
|
2018-02-24 00:01:59 +01:00 |
daniel
|
40aa1a1175
|
Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio
|
2018-02-23 14:31:30 +01:00 |
|
daniel
|
688acb8a4b
|
fixed error graphs
|
2018-02-23 14:31:00 +01:00 |
|
artica
|
effe16a275
|
Auto-updated build strings.
|
2018-02-23 00:01:27 +01:00 |
|
artica
|
e752e26ee3
|
Auto-updated build strings.
|
2018-02-22 00:01:52 +01:00 |
|
daniel
|
f69fb8a5f9
|
Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio
|
2018-02-21 14:00:14 +01:00 |
|
daniel
|
4b654bd87d
|
fixed errors grapgh
|
2018-02-21 11:54:24 +01:00 |
vgilc
|
3b94629f8f
|
Merge branch '1403-Añadir-relojes-a-consolas-visuales-4622-com1-final' into 'develop'
Change visual console digital clock colors - #1403
See merge request artica/pandorafms!1307
|
2018-02-20 09:55:50 +01:00 |
|
artica
|
cc088314b8
|
Auto-updated build strings.
|
2018-02-20 00:01:14 +01:00 |
enriquecd
|
9a525f3b2e
|
Change visual console digital clock colors - #1403
|
2018-02-19 19:17:53 +01:00 |
|
daniel
|
25242e19d4
|
Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio
|
2018-02-19 09:32:42 +01:00 |
|
daniel
|
8be776e3ea
|
fixed errrors graphs
|
2018-02-19 09:31:45 +01:00 |
|
artica
|
87ffae2d88
|
Auto-updated build strings.
|
2018-02-19 00:01:12 +01:00 |
|
artica
|
fe1b911f02
|
Auto-updated build strings.
|
2018-02-18 00:01:12 +01:00 |
|
artica
|
5e6bcd34d8
|
Auto-updated build strings.
|
2018-02-17 00:01:14 +01:00 |
|
daniel
|
b6798bf31c
|
update flot.js
|
2018-02-16 13:41:31 +01:00 |
|
daniel
|
d7a8283994
|
Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio
|
2018-02-16 13:14:45 +01:00 |
|
artica
|
12ef611493
|
Auto-updated build strings.
|
2018-02-16 00:01:13 +01:00 |
fbsanchez
|
df0480d12a
|
Fixed dbuncompress short unknown events
|
2018-02-15 11:19:44 +01:00 |
|
vgilc
|
e83201c457
|
Merge branch '1877-Cluster-Nuevo-diseño-del-cluster-view' into 'develop'
Change cluster view design - #1877
See merge request artica/pandorafms!1301
|
2018-02-15 09:42:46 +01:00 |
|
artica
|
d90c6ef778
|
Auto-updated build strings.
|
2018-02-15 00:01:13 +01:00 |
|
enriquecd
|
b51dc73cd6
|
Change cluster view design - #1877
|
2018-02-14 18:37:27 +01:00 |
danielmaya
|
a0c01ed57d
|
Added safe_output for password in ldap
|
2018-02-14 10:57:08 +01:00 |
|
vgilc
|
ef3ec1238a
|
Merge branch '1867-errores-en-vista-de-eventos-con-usuario-con-tags-tmb' into 'develop'
Fix avoid unexistent tag in tevent acl check
See merge request artica/pandorafms!1297
|
2018-02-14 08:49:14 +01:00 |
|
artica
|
4fbf0820a4
|
Auto-updated build strings.
|
2018-02-14 00:01:13 +01:00 |
|
fbsanchez
|
92287916eb
|
Fix avoid unexistent tag in tevent acl check
|
2018-02-13 16:48:36 +01:00 |
artica
|
77392c70fc
|
Updated version and build strings.
|
2018-02-13 11:51:11 +01:00 |
|
artica
|
ab10cec7ba
|
Auto-updated build strings.
|
2018-02-13 00:01:13 +01:00 |
|
daniel
|
b419f71e7c
|
fixed error in acl combined profile
|
2018-02-12 16:10:29 +01:00 |
|
daniel
|
7bc9a6cfb5
|
graph
|
2018-02-12 13:29:25 +01:00 |
|
daniel
|
2417cae01d
|
Merge branch 'develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio
|
2018-02-12 12:47:53 +01:00 |
|
daniel
|
fabe14b7ea
|
fixed error acl
|
2018-02-12 12:38:28 +01:00 |
|
vgilc
|
8c7c3b2c09
|
Merge branch '1867-Errores_en_vista_de_eventos_con_usuario_con_tags' into 'develop'
fixed error show events
See merge request artica/pandorafms!1287
|
2018-02-12 08:52:04 +01:00 |
|
artica
|
be4509cbf1
|
Auto-updated build strings.
|
2018-02-10 00:01:14 +01:00 |
|
daniel
|
74a8212032
|
fixed error show events
|
2018-02-09 14:20:49 +01:00 |
|
artica
|
a6451d01e2
|
Auto-updated build strings.
|
2018-02-09 00:01:15 +01:00 |
|
daniel
|
3e0edcfda8
|
fixed errors in automatic combined graph meta with TIP
|
2018-02-08 17:07:54 +01:00 |
|
vgilc
|
a5a6371270
|
Merge branch '1782-Esos-mapas-dev' into 'develop'
Fixed colour bug in interface link
See merge request artica/pandorafms!1283
|
2018-02-08 16:27:54 +01:00 |
|
danielmaya
|
eb38025b19
|
Fixed colour bug in interface link
|
2018-02-08 16:20:29 +01:00 |
|
daniel
|
af9e11ffca
|
reconfigure charts
|
2018-02-08 15:47:12 +01:00 |
|
fbsanchez
|
571ed36276
|
Fixed image handle in data view
|
2018-02-08 14:17:08 +01:00 |
|
artica
|
4aab64be3d
|
Auto-updated build strings.
|
2018-02-08 00:01:15 +01:00 |
|
enriquecd
|
a04f941a55
|
Merge branch 'develop' into 1403-Añadir-relojes-a-consolas-visuales-com1
Conflicts:
pandora_console/include/styles/pandora.css
|
2018-02-07 17:02:15 +01:00 |
|
vgilc
|
9531984eac
|
Merge branch '1748-Sistema-de-gestión-de-Clusters' into 'develop'
1748 sistema de gestión de clusters
See merge request artica/pandorafms!1279
|
2018-02-07 15:41:29 +01:00 |
|
enriquecd
|
ae471bb9f2
|
Merge remote-tracking branch 'origin/clusters' into 1748-Sistema-de-gestión-de-Clusters
|
2018-02-07 13:52:44 +01:00 |
|
enriquecd
|
6851af5943
|
Show correct info in visual console static graphs tooltips - #1634
|
2018-02-07 12:46:29 +01:00 |
|
artica
|
520e968500
|
Auto-updated build strings.
|
2018-02-07 00:01:14 +01:00 |