2176 Commits

Author SHA1 Message Date
Tatiana Llorente
ec57540fb0 Ent 5432 libreria de modulos de pandora integrada en consola 2020-02-27 11:20:24 +01:00
Daniel Barbero Martin
a55e431b46 Fixed error cache build link VC 2020-02-20 13:25:56 +01:00
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
alejandro-campos
526ba37151 minor visual change in threshold graph 2020-02-11 10:10:03 +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
Luis
56a2970755 Ent 5112 error nodos ficticios widget mapa red 2020-02-06 14:32:43 +01:00
Daniel Barbero Martin
e49ed85d03 fixed errors VC 2020-01-28 18:29:32 +01:00
Daniel Barbero Martin
570ebd9a0a fixed errors VC 2020-01-27 13:16:01 +01:00
Daniel Barbero Martin
5ff10ac514 fixed errors VC 2020-01-25 11:57:04 +01:00
Daniel Barbero Martin
fe697a98ec fixed errors VC 2020-01-23 19:54:47 +01:00
Daniel Barbero Martin
481f08bd5f fixed errors VC 2020-01-23 16:21:31 +01:00
Daniel Barbero Martin
3124e09c12 fixed errors VC 2020-01-23 09:20:40 +01:00
Daniel Barbero Martin
6c6403336f Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2020-01-23 08:14:24 +01:00
Daniel Barbero
f3dbf6391f Add confirm dialog remove item VC 2020-01-22 13:00:19 +01:00
Daniel Barbero
69e750da13 Fixed error Color cloud VC 2020-01-22 12:48:31 +01:00
Daniel Maya
32b28bea0c Added warning in update manager offline 2020-01-22 11:10:02 +01:00
Daniel Barbero Martin
ac4c091c9e Fixed errors VC 2020-01-21 17:43:41 +01:00
Daniel Barbero Martin
a557c25c31 Fixed errors VC 2020-01-21 12:55:54 +01:00
Daniel Barbero Martin
578400aa92 change load modal ?????? 2020-01-21 08:37:30 +01:00
Daniel Barbero Martin
89e83e38e0 Merge remote-tracking branch 'origin/develop' into new-vc-line-element
Conflicts:
	pandora_console/include/javascript/pandora.js
2020-01-21 08:28:00 +01:00
Daniel Barbero Martin
98ddf3c6ee Fixed errors VC 2020-01-20 17:46:52 +01:00
Daniel Barbero Martin
3545e28581 Fixed errors VC 2020-01-20 16:01:53 +01:00
Alejandro Campos
e7769b8bf4 Merge branch 'develop' into 'ent-4967-9083-Valores-unidades-en-graficas-no-son-por-1024'
# Conflicts:
#   pandora_console/extras/mr/35.sql
2020-01-20 12:00:42 +01:00
Daniel Rodriguez
738361d237 Merge branch 'ent-4876-pandora_ui.js' into 'develop'
first changes pandora.js to pandora_ui.js

See merge request artica/pandorafms!2909
2020-01-20 09:54:20 +01:00
Daniel Barbero Martin
861011257d Fixed errors VC 2020-01-19 22:57:31 +01:00
Daniel Barbero Martin
d5e21499c2 Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2020-01-16 14:08:07 +01:00
Tatiana Llorente
0980c9a74a Ent 5261 cambio de control de intervalo en alertas 2020-01-16 13:50:39 +01:00
Daniel Barbero Martin
d8a09bf359 Fixed errors VC 2020-01-15 17:37:24 +01:00
alejandro-campos
d9062def99 Merge branch 'ent-4967-9083-Valores-unidades-en-graficas-no-son-por-1024' of https://brutus.artica.es:8081/artica/pandorafms into ent-4967-9083-Valores-unidades-en-graficas-no-son-por-1024 2020-01-15 16:01:11 +01:00
alejandro-campos
3f26f2ef6f fix bug when deleting custom units and changed default value for byte multiplier 2020-01-15 16:00:33 +01:00
Daniel Barbero
89b43f1aee loading on resize and update elements VC 2020-01-14 15:52:47 +01:00
Daniel Barbero
ed53399c3c Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2020-01-14 09:34:31 +01:00
Tatiana Llorente
7c928b8100 Ent 4795 check seleccionar todos queda marcado 2020-01-14 08:37:04 +01:00
Daniel Barbero Martin
602ce39907 Fixed clock item VC 2020-01-13 17:13:52 +01:00
Daniel Barbero Martin
09f1e2b733 fixed errors in resize and move item percentile and value 2020-01-13 09:53:00 +01:00
Daniel Barbero Martin
d4b92a6913 Fixed errors in VC 2020-01-10 13:48:07 +01:00
Daniel Barbero Martin
f34387b24e Fixed modal send more forms 2020-01-10 08:41:07 +01:00
Daniel Barbero Martin
d97cdfbc7a fix element line 2020-01-08 17:28:03 +01:00
Daniel Barbero Martin
c4f0305f9b Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2020-01-08 08:29:59 +01:00
Daniel Barbero Martin
da01883902 Fixed items vc line 2020-01-07 18:07:07 +01:00
Daniel Barbero Martin
b49dd76ce4 Add images input 2020-01-07 15:43:44 +01:00
vgilc
996d322d5d Merge branch 'ent-5176-metaconsola-informes-tipo-texto' into 'develop'
Fixed visual bug in text report item

See merge request artica/pandorafms!2991
2020-01-07 10:17:10 +01:00
Daniel Rodriguez
0c2c7d9f3b Merge branch 'ent-2813-Muestra-de-información-en-el-tree-view' into 'develop'
Added stopPropagation

See merge request artica/pandorafms!2940
2020-01-07 09:24:38 +01:00
manuel
4214a32fb7 Fixed visual bug in text report item 2019-12-24 10:11:27 +01:00
Daniel Barbero
d4207ef67c Fixed form php VC 2019-12-20 13:58:47 +01:00
Daniel Barbero
14984faaaa Fixed errors Form VC 2019-12-19 20:42:29 +01:00
Daniel Barbero
7d60287018 Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2019-12-19 08:02:47 +01:00
Daniel Barbero
9b4f12a875 Fixed forms VC 2019-12-18 17:36:01 +01:00
Daniel Maya
7f1245e09d Fixed mceLast class 2019-12-18 10:23:27 +01:00