Commit Graph

14003 Commits

Author SHA1 Message Date
artica dc085fa339 Auto-updated build strings. 2017-03-22 00:01:19 +01:00
m-lopez-f 34ecf27ac4 Revert "Fixed name of agents in report Agents/Modules. Gitlab: #553"
This reverts commit b333e79ea8.
2017-03-21 16:53:03 +01:00
m-lopez-f b333e79ea8 Fixed name of agents in report Agents/Modules. Gitlab: #553 2017-03-21 16:50:27 +01:00
Arturo Gonzalez 6731eb7da4 Fixed async error 2017-03-21 15:13:04 +01:00
Arturo Gonzalez 576b834d25 Fixed error in rr 2017-03-21 14:58:42 +01:00
Arturo Gonzalez 8ae921402c Added mr folder cleaner 2017-03-21 14:48:12 +01:00
vanessa gil 0b564c2866 new file 2017-03-21 13:43:01 +01:00
vanessa gil 2994a9f8a1 new file. 2017-03-21 13:32:08 +01:00
Arturo Gonzalez f6b7c5ce19 Clean mr folder before um process 2017-03-21 13:29:06 +01:00
Arturo Gonzalez a8e1cdba8f Added a change when mr is in updated folder. 2017-03-21 13:24:15 +01:00
m-lopez-f e34ec2109a Fixed problem with extension backup. Add new column in migrate sql. 2017-03-21 13:15:45 +01:00
vanessa gil c23767c5d7 new mr file. 2017-03-21 13:11:17 +01:00
fermin c1f00a63a4 Merge branch 'ent-526-Las-graficas-estaticas-en-la-7-estan-mal' into 'develop'
Position watermark inside the static graphs

See merge request !284
2017-03-21 13:07:52 +01:00
Arturo Gonzalez e8fbd1f7d1 Added minor change to um and rr system 2017-03-21 12:57:02 +01:00
fermin831 e3341ab15f Position watermark inside the static graphs 2017-03-21 12:33:00 +01:00
Daniel Maya 8cc316ff83 Fixed sql bug in custom report 2017-03-21 12:28:30 +01:00
vanessa gil d6fb515034 new file. 2017-03-21 12:23:46 +01:00
vanessa gil d5a70bc15e Deleted files. 2017-03-21 12:04:05 +01:00
daniel 8365afbe76 fixed errors in helps pandora and visual styles 2017-03-21 11:44:46 +01:00
Arturo Gonzalez b64afb7d6f Added a few changes to um and rr 2017-03-21 10:39:39 +01:00
vgilc 5278d2a8a8 Merge branch '98-agentes-codificados-en-vista-de-gis-data-dentro-de-la-vista-de-agente' into 'develop'
Show agent alias in gis maps with entities - #98

See merge request !281
2017-03-21 10:35:47 +01:00
artica e6ffb47535 Auto-updated build strings. 2017-03-21 00:01:17 +01:00
artica 53837de343 Auto-updated build strings. 2017-03-20 00:01:18 +01:00
artica 6610391bc3 Auto-updated build strings. 2017-03-19 00:01:15 +01:00
artica 40b3c318cd Auto-updated build strings. 2017-03-18 00:01:19 +01:00
Arturo Gonzalez d426cbbe4a Added the last correction to UM online open 2017-03-17 15:00:14 +01:00
Arturo Gonzalez c9fd56df75 Fixed errors in um online open 2017-03-17 14:22:04 +01:00
Arturo Gonzalez 8fc433f2a8 Added code to control the ocassional errors 2017-03-17 14:13:45 +01:00
Arturo Gonzalez 750203033f Added minor fixes to um open 2017-03-17 14:05:53 +01:00
Arturo Gonzalez 89727824a4 Fixed error in um online open 2017-03-17 13:56:38 +01:00
daniel aec7df9137 fixed minor error 2017-03-17 13:40:17 +01:00
daniel 4277661cc4 fixed minor errors in login page 2017-03-17 13:29:26 +01:00
Arturo Gonzalez aebbc783df Added changes to um online open to integrate mr 2017-03-17 13:27:06 +01:00
enriquecd 27d4a6c316 Show agent alias in gis maps with entities - #98 2017-03-17 11:55:34 +01:00
daniel 8d4b730b6c fixed minor errors 2017-03-17 11:37:43 +01:00
vanessa gil cb1cd58d83 new file 2017-03-17 11:36:10 +01:00
Arturo Gonzalez 011517f61d Fixed "cancel" text in offline um dialogs 2017-03-17 11:29:31 +01:00
daniel b8f6e045a9 Merge branch '497-nuevas-pantallas-de-login-open' into 'develop'
497 nuevas pantallas de login open

See merge request !278
2017-03-17 10:57:07 +01:00
daniel 060e8f1ddc merge develop 2017-03-17 10:12:53 +01:00
daniel 3c19207961 fixed images custom logo 2017-03-17 10:03:18 +01:00
Arturo Gonzalez 25fb6bd894 Added minor fixes to rr 2017-03-17 09:57:10 +01:00
daniel 3ff7d28240 fixed minor error in icon open source 2017-03-17 09:34:31 +01:00
daniel 3b54116147 fixed errors in css 2017-03-17 09:20:38 +01:00
Arturo Gonzalez 5a1192c412 Added more changes to um online open with mr 2017-03-17 09:19:55 +01:00
Arturo Gonzalez ff596fa797 Added a lot of changes in update manager online open to integrate with mr 2017-03-17 09:19:55 +01:00
Arturo Gonzalez cadfc0a30f Added code to rr system 2017-03-17 09:19:55 +01:00
Arturo Gonzalez 54642bef87 Added more code to um and rr 2017-03-17 09:19:55 +01:00
Arturo Gonzalez 2e7f7a1a38 Added changes to rr apply 2017-03-17 09:19:55 +01:00
Arturo Gonzalez d5fd732d8c Added a few modifications in RR system 2017-03-17 09:19:55 +01:00
Arturo Gonzalez 0321f8a895 Revert "Added some modifications about RR"
This reverts commit e9cb769cbf.
2017-03-17 09:19:55 +01:00