Commit Graph

10717 Commits

Author SHA1 Message Date
Arturo Gonzalez 8ae921402c Added mr folder cleaner 2017-03-21 14:48:12 +01:00
m-lopez-f 77ee30df20 Fixed merge request 2017-03-21 13:44:41 +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
m-lopez-f 26b3754ee8 Fixed interfaces snmp, because dont show icon of open graphs and problems with show graphs when click in icons. Gitlab: #541 2017-03-17 10:13:57 +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
Arturo Gonzalez cc79905e6a Added some modifications about RR 2017-03-17 09:19:55 +01:00
enriquecd f0cbe509f9 Not show graph icons legend - #96 2017-03-17 09:19:55 +01:00
Arturo Gonzalez 0ce515197b new sql mr 2017-03-17 09:19:55 +01:00
vanessa gil 08c20fcfab new file 2017-03-17 09:19:55 +01:00
Hirofumi Kosaka 6ef5614904 Fixed 2 wrong ACL check about reporting.
- 'IR' was required for listing custom graphs at editting items.
  - 'IW' was required for add/delete SLA items at editting SLA items
2017-03-17 09:19:55 +01:00
vanessa gil cb3c9c0cdb New file 2017-03-17 09:19:55 +01:00
Arturo Gonzalez 5f72dbafcc Debug UM and RR system 2017-03-17 09:19:55 +01:00
artica a7fdf6b579 Auto-updated build strings. 2017-03-17 09:19:55 +01:00
enriquecd 8da7194590 Show agent - module in pdf reports item - #528 2017-03-17 09:19:55 +01:00
m-lopez-f 9b5a8773c3 Revert "Fixed problems with backgrounds when add visual console in dashboards. Gitlab: #533"
This reverts commit 4563ef34a4.
2017-03-17 09:19:55 +01:00
vanessa gil 16febc3d67 New mr. 2017-03-17 09:19:55 +01:00
m-lopez-f 4446cd1425 Fixed problems with backgrounds when add visual console in dashboards. Gitlab: #533 2017-03-17 09:19:55 +01:00
Arturo Gonzalez f1ca499cd9 Update translations 2017-03-17 09:19:55 +01:00
vanessa gil f4051b825a Deleted files. 2017-03-17 09:19:55 +01:00
Arturo Gonzalez e7b811c39d Fixed error in um offline oum path to get mrs. 2017-03-17 09:02:40 +01:00
artica a9cc5cd593 Auto-updated build strings. 2017-03-17 00:01:18 +01:00
Arturo Gonzalez e713b843dc Added a message whe system have a mr pending 2017-03-16 19:18:42 +01:00
Arturo Gonzalez 831b5e2c7d Added a lot of modifications to integrate mr with um 2017-03-16 19:14:33 +01:00
Daniel Maya 317b5cfb04 Fixed the migration to pandora 7 2017-03-16 19:03:15 +01:00
daniel e888675766 fixed minor error 2017-03-16 18:43:07 +01:00
daniel 1325601082 fixed errors 2017-03-16 18:41:53 +01:00
Arturo Gonzalez 01b9572edc Added more changes to um online open with mr 2017-03-16 18:23:07 +01:00
Arturo Gonzalez b9702a5b00 Added a lot of changes in update manager online open to integrate with mr 2017-03-16 18:07:19 +01:00
Arturo Gonzalez c8a0946eda Added code to rr system 2017-03-16 16:28:27 +01:00
Daniel Maya 44231b6515 Fixed bug in qr 2017-03-16 16:14:11 +01:00
Arturo Gonzalez 54959257c0 Added more code to um and rr 2017-03-16 16:00:57 +01:00
Arturo Gonzalez 2b9e75237a Added changes to rr apply 2017-03-16 15:45:26 +01:00
Arturo Gonzalez c7fb00b46a Added a few modifications in RR system 2017-03-16 14:56:10 +01:00
daniel b9b040665e add new custom field in visual styles meta 2017-03-16 14:35:31 +01:00
Arturo Gonzalez 0c51650590 Revert "Added some modifications about RR"
This reverts commit e9cb769cbf.
2017-03-16 14:31:33 +01:00
Arturo Gonzalez e9cb769cbf Added some modifications about RR 2017-03-16 14:22:42 +01:00
enriquecd 8a547961c4 Not show graph icons legend - #96 2017-03-16 12:45:33 +01:00
Arturo Gonzalez 37fd8f8851 new sql mr 2017-03-16 12:23:25 +01:00
vanessa gil 5d09cfdef3 new file 2017-03-16 12:03:29 +01:00
Hirofumi Kosaka f4c812c469 Fixed 2 wrong ACL check about reporting.
- 'IR' was required for listing custom graphs at editting items.
  - 'IW' was required for add/delete SLA items at editting SLA items
2017-03-16 19:54:05 +09:00
vanessa gil e7fa5d1f00 New file 2017-03-16 11:15:36 +01:00
Arturo Gonzalez 51cd53b3b3 Debug UM and RR system 2017-03-16 10:46:41 +01:00
artica 41072d8347 Auto-updated build strings. 2017-03-16 00:01:21 +01:00
enriquecd 00f0a171b4 Show agent - module in pdf reports item - #528 2017-03-15 18:45:52 +01:00
m-lopez-f 18123ac62d Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop 2017-03-15 17:23:08 +01:00
m-lopez-f 7a7a42b04e Revert "Fixed problems with backgrounds when add visual console in dashboards. Gitlab: #533"
This reverts commit 4563ef34a4.
2017-03-15 17:22:50 +01:00
vanessa gil 309ed42a8f New mr. 2017-03-15 17:20:16 +01:00
m-lopez-f 994432c335 Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop 2017-03-15 17:19:07 +01:00
m-lopez-f 4563ef34a4 Fixed problems with backgrounds when add visual console in dashboards. Gitlab: #533 2017-03-15 17:18:53 +01:00
Arturo Gonzalez e5011a010b Update translations 2017-03-15 17:13:21 +01:00
daniel e252135979 merge develop 2017-03-15 17:09:40 +01:00
vanessa gil def9172bb9 Deleted files. 2017-03-15 17:04:40 +01:00
daniel 6191ac705a delete img 2017-03-15 16:53:15 +01:00
daniel 3d4bd9f23a delete img 2017-03-15 16:52:15 +01:00
Arturo Gonzalez fa885faf8e Added a new fine filter to RR 2017-03-15 16:45:55 +01:00
Arturo Gonzalez 41f40d8310 Update translations in develop 2017-03-15 16:00:19 +01:00
vgilc 41c774ac99 Merge branch 'cherry-pick-22138f62' into 'develop'
DEVELOP::: Fixed problems with htmld tags in list events and other view that include list of events. Gitlab: #529

See merge request !257
2017-03-15 15:58:45 +01:00
vanessa gil a094f67dd9 New file. 2017-03-15 15:50:36 +01:00
daniel aec0d91109 login page new 2017-03-15 15:23:28 +01:00