Luis Calvo
|
6742881009
|
Fixed ui message icon bug on meta
|
2020-01-10 13:16:53 +01:00 |
Daniel Rodriguez
|
2734b6461e
|
Merge branch 'ent-4895-error-redireccion-plantillas-cron-tasklist' into 'develop'
Fixed template redirection tasklist on cron extension
See merge request artica/pandorafms!3006
|
2020-01-10 11:12:39 +01:00 |
|
Daniel Rodriguez
|
1ebcfd58e4
|
Merge branch 'ent-4693-Pete-en-el-contador-de-intervalo-de-agente-con-intervalo-largo' into 'develop'
fixed interval counter
See merge request artica/pandorafms!2938
|
2020-01-10 11:12:05 +01:00 |
Daniel Maya
|
c9a524b128
|
fixed interval counter
|
2020-01-10 11:12:05 +01:00 |
Daniel Barbero Martin
|
f34387b24e
|
Fixed modal send more forms
|
2020-01-10 08:41:07 +01:00 |
|
Daniel Barbero Martin
|
14e4e37c2a
|
Merge remote-tracking branch 'origin/develop' into new-vc-line-element
|
2020-01-10 08:09:13 +01:00 |
artica
|
467db373b7
|
Auto-updated build strings.
|
2020-01-10 00:01:55 +01:00 |
|
Daniel Barbero
|
7e4cb02ceb
|
fixed styles and more
|
2020-01-09 18:05:21 +01:00 |
|
Luis Calvo
|
4ff1c9cb7d
|
Fixed template redirection tasklist on cron extension
|
2020-01-09 17:56:34 +01:00 |
Jose Gonzalez
|
4670ed922a
|
Added control for correct UTF8 encoding
|
2020-01-09 17:25:24 +01:00 |
manuel
|
62c915d6df
|
Added log when offline update fails
|
2020-01-09 17:09:55 +01:00 |
|
Daniel Rodriguez
|
1cef8aa62f
|
Merge branch 'ent-4658-cross-site-seguridad-base64' into 'develop'
Changed the mode of obtain the title
See merge request artica/pandorafms!2743
|
2020-01-09 16:46:58 +01:00 |
|
Daniel Barbero
|
a933a091ea
|
styles fixed
|
2020-01-09 12:07:19 +01:00 |
|
Daniel Rodriguez
|
063600fda2
|
Merge branch 'ent-4597-bug-items-consola-visual-se-superponen-sobre-menu-superior' into 'develop'
Fixed z-index header
See merge request artica/pandorafms!2888
|
2020-01-09 11:52:27 +01:00 |
|
Manuel Montes
|
5e058df052
|
Fixed z-index header
|
2020-01-09 11:52:27 +01:00 |
|
Luis Calvo
|
2d303635ae
|
Merge remote-tracking branch 'origin/develop' into ent-5165-error-pdf-report-names-generated-by-template
|
2020-01-09 10:42:46 +01:00 |
|
Daniel Barbero
|
b40f5b17c1
|
Merge remote-tracking branch 'origin/develop' into new-vc-line-element
|
2020-01-09 09:43:57 +01:00 |
fbsanchez
|
320ca5d021
|
Merge branch 'develop' into 'ent-4697-cicd-pandorafms'
Conflicts:
pandora_server/pandora_server.spec
|
2020-01-09 09:28:33 +01:00 |
|
artica
|
d8b97885a9
|
Auto-updated build strings.
|
2020-01-09 00:01:13 +01:00 |
|
fbsanchez
|
2084a233c3
|
test
|
2020-01-08 20:01:46 +01:00 |
|
fbsanchez
|
93380430ef
|
alternative dpkg-deb
|
2020-01-08 19:45:50 +01:00 |
|
fbsanchez
|
2e1ab56ae3
|
minor updates
|
2020-01-08 19:38:12 +01:00 |
|
fbsanchez
|
8563ff52fb
|
minor updates in make_deb_pacakge.sh
|
2020-01-08 19:36:15 +01:00 |
|
Daniel Barbero Martin
|
909dc4bf7c
|
fixed css
|
2020-01-08 18:08:20 +01:00 |
|
Daniel Barbero Martin
|
c25a64e737
|
fix styles main.css
|
2020-01-08 18:00:32 +01:00 |
|
Daniel Barbero Martin
|
a8e9c69e9a
|
save min.js and min.js.map
|
2020-01-08 17:33:00 +01:00 |
|
Daniel Barbero Martin
|
d97cdfbc7a
|
fix element line
|
2020-01-08 17:28:03 +01:00 |
|
fbsanchez
|
aac8acfd19
|
pandora_agent spec update
|
2020-01-08 16:36:26 +01:00 |
Tatiana Llorente
|
665e9e4c98
|
Show gis icon only if enabled gis
|
2020-01-08 15:57:18 +01:00 |
|
Tatiana Llorente
|
f61ba42dd7
|
Resolve conflicts
|
2020-01-08 15:48:07 +01:00 |
|
Tatiana Llorente
|
7701ff7ad1
|
Resolve conflicts
|
2020-01-08 15:44:59 +01:00 |
|
Tatiana Llorente
|
eb222cc82f
|
Merge remote-tracking branch 'origin/develop' into ent-4788-Icono-GIS-en-Setup-desaparecido
Conflicts:
pandora_console/godmode/setup/setup.php
|
2020-01-08 15:41:45 +01:00 |
|
fbsanchez
|
6dd779c249
|
minor fix
|
2020-01-08 15:35:03 +01:00 |
|
Tatiana Llorente
|
b6d5d1a15a
|
Fixed bug with clock item in the visual consoles in meta
|
2020-01-08 15:23:39 +01:00 |
|
Daniel Rodriguez
|
1f15fd5dae
|
Merge branch 'ent-5181-Pete-SQL-y-mal-funcionamineto-de-Auto-combined-graph' into 'develop'
Ent 5181 pete sql y mal funcionamineto de auto combined graph
See merge request artica/pandorafms!3000
|
2020-01-08 14:46:29 +01:00 |
|
fbsanchez
|
73e0a6d519
|
spec setup quiet
|
2020-01-08 13:19:51 +01:00 |
|
Tatiana Llorente
|
2c019f04ee
|
Fixed bug in auto combined graph
|
2020-01-08 11:37:44 +01:00 |
|
Daniel Rodriguez
|
c30e9eb1fe
|
Merge branch 'ent-4980-No-cambia-el-Shape-de-los-fictional-nodes-de-Circle-a-Square-Rhombus-en-un-mapa-de-red' into 'develop'
Ent 4980 no cambia el shape de los fictional nodes de circle a square rhombus en un mapa de red
See merge request artica/pandorafms!2896
|
2020-01-08 11:33:27 +01:00 |
|
fbsanchez
|
be6e1e93f9
|
spec minor changes
|
2020-01-08 11:24:38 +01:00 |
|
fbsanchez
|
e26e12ea9d
|
spec changes reverted
|
2020-01-08 11:22:14 +01:00 |
|
fbsanchez
|
a9259d94f2
|
spec review
|
2020-01-08 10:45:16 +01:00 |
|
fbsanchez
|
c32e645e1b
|
Merge remote-tracking branch 'origin/develop' into ent-4697-cicd-pandorafms
|
2020-01-08 10:37:43 +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 |
|
artica
|
64e63dad63
|
Auto-updated build strings.
|
2020-01-08 00:01:15 +01:00 |
|
Daniel Barbero Martin
|
da01883902
|
Fixed items vc line
|
2020-01-07 18:07:07 +01:00 |
|
Jose Gonzalez
|
f6163f4f80
|
Secured get_file script for unauthorized file download
|
2020-01-07 17:31:14 +01:00 |
|
Daniel Barbero Martin
|
b49dd76ce4
|
Add images input
|
2020-01-07 15:43:44 +01:00 |
|
Daniel Barbero Martin
|
9e2c048895
|
new styles VC
|
2020-01-07 12:06:35 +01:00 |
|
Daniel Barbero Martin
|
4813bef53e
|
Add new input linked visual console
|
2020-01-07 12:00:39 +01:00 |
Alejandro Campos
|
0468c85a4d
|
Merge branch 'develop' into 'ent-4967-9083-Valores-unidades-en-graficas-no-son-por-1024'
# Conflicts:
# pandora_console/godmode/setup/setup_visuals.php
|
2020-01-07 12:00:27 +01:00 |