Merge remote-tracking branch 'remotes/upstream/avoidDuplicateFiles' into beta
[pub/Android/ownCloud.git] / src / com / owncloud / android / datamodel / ThumbnailsCacheManager.java
2015-11-22 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/avoidDup...
2015-11-21 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/setAsWal...
2015-11-21 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/resizedI...
2015-11-21 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/master...
2015-11-21 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/avoidDup...
2015-11-21 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/switchOf...
2015-11-21 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/master...
2015-11-20 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/bug_1251...
2015-11-20 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/1193_upl...
2015-11-20 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/external...
2015-11-20 Maria AsensioMerge pull request #1119 from owncloud/strip-index...
2015-11-18 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/multiSel...
2015-11-18 tobiasKaminskyMerge remote-tracking branch 'upstream/beta' into beta
2015-11-18 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/resizeCa...
2015-11-14 tobiasKaminskyMerge branch 'master' of github.com:owncloud/android...
2015-11-13 tobiasKaminskyshow cache size in mb
2015-11-13 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/master...
2015-11-13 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/target_m...
2015-11-13 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/cancelUp...
2015-11-13 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/material...
2015-11-13 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/switchLi...
2015-11-13 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/descendI...
2015-11-13 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/master...
2015-11-13 tobiasKaminskyshow thumbnail while waiting for resized image
2015-11-10 Andy ScherzingerMerge branch 'master' of https://github.com/owncloud...
2015-11-10 Andy ScherzingerMerge branch '1193_uploader_layout' of https://github...
2015-11-06 tobiasKaminskyMerge branch 'setAsWallpaper' into beta
2015-11-05 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/resizedI...
2015-11-05 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/master...
2015-11-04 Andy ScherzingerMerge branch 'material_buttons' of https://github.com...
2015-11-04 Andy ScherzingerMerge branch 'material_buttons' of https://github.com...
2015-11-02 Andy ScherzingerMerge branch 'material_buttons' of https://github.com...
2015-11-02 tobiasKaminskyMerge branch 'setAsWallpaper' into beta
2015-11-02 tobiasKaminskyMerge branch 'setAsWallpaper' into beta
2015-11-01 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/streamin...
2015-11-01 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/video_th...
2015-11-01 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/streamin...
2015-10-31 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/master...
2015-10-31 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/master...
2015-10-31 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/resizedI...
2015-10-31 tobiasKaminskyfixed storing thumbnails by correct imageKey
2015-10-31 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/resizedI...
2015-10-29 David A. VelascoMerge pull request #1105 from owncloud/fixLegacyTravis
2015-10-29 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/multiSel...
2015-10-29 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/avoidDup...
2015-10-29 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/sortInUp...
2015-10-29 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/videoBig...
2015-10-29 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/resizeCa...
2015-10-29 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/switchOf...
2015-10-29 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/material...
2015-10-29 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/material...
2015-10-29 tobiasKaminskyMerge branch 'switchListVsGridMaster' into beta
2015-10-29 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/master...
2015-10-29 Andy ScherzingerMerge branch 'descendIntoFolder' of https://github...
2015-10-27 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/animated...
2015-10-27 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/master...
2015-10-26 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/resizedI...
2015-10-18 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/master...
2015-10-18 tobiasKaminskyMerge branch 'uploadWhenCharging' of github.com:ownclou...
2015-10-15 masensioMerge branch 'detailThumbnail' of git://github.com...
2015-10-12 tobiasKaminskycache size is read from cache on preference start
2015-10-12 tobiasKaminskycache resize
2015-10-09 Andy ScherzingerMerge branch 'master' of https://github.com/owncloud...
2015-10-02 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/master...
2015-10-01 masensioMerge pull request #839 from fluffy88/develop
2015-09-30 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/multiSel...
2015-09-30 masensioMerge branch 'master' into sync_full_folder
2015-09-29 tobiasKaminskyMerge branch 'master' of github.com:owncloud/android...
2015-09-28 masensioMerge branch 'release-1.8'
2015-09-27 Andy ScherzingerMerge branch 'notification_coloring' of https://github...
2015-09-24 masensioMerge pull request #1174 from owncloud/release_bug_fixes
2015-09-24 Andy ScherzingerMerge branch 'release-1.8' of https://github.com/ownclo...
2015-09-24 Andy ScherzingerMerge branch 'release-1.8' of https://github.com/ownclo...
2015-09-22 masensioMerge pull request #1171 from owncloud/fix_lock_of_uplo...
2015-09-21 David A. VelascoGrant that cancellations of tasks generating thumbnails...
2015-09-16 masensioMerge branch 'release-1.8' of github.com:owncloud/andro...
2015-09-16 masensioMerge pull request #1157 from owncloud/fix_file_list_ic...
2015-09-16 masensioMerge pull request #1149 from owncloud/new_filetype_icons
2015-09-15 Andy ScherzingerMerge branch 'master' of https://github.com/owncloud...
2015-09-15 Andy ScherzingerMerge branch 'master' of https://github.com/owncloud...
2015-09-13 Andy ScherzingerMerge branch 'master' of https://github.com/owncloud...
2015-09-11 Andy ScherzingerMerge branch 'new_filetype_icons' of https://github...
2015-09-11 Andy ScherzingerMerge branch 'new_filetype_icons' of https://github...
2015-09-10 Andy Scherzingershortened this prediction, since it will always be...
2015-09-09 masensioMerge pull request #1124 from Kernald/new-filetype...
2015-09-07 Andy ScherzingerMerge branch 'new-filetype-icons' of https://github...
2015-09-04 Andy ScherzingerMerge branch 'material_buttons' of https://github.com...
2015-09-04 Andy ScherzingerMerge branch 'master' of https://github.com/owncloud...
2015-09-04 masensioMerge pull request #1102 from owncloud/copy
2015-09-02 masensioMerge branch 'text_file_preview_pr_707_with_develop...
2015-09-02 masensioMerge remote-tracking branch 'origin/master' into text_...
2015-09-02 David A. VelascoMerge pull request #1114 from owncloud/tryFix1113
2015-09-01 David A. VelascoMerge branch 'master' into copy
2015-09-01 masensioMerge branch 'develop' into uploadWhenCharging
2015-08-31 masensioSet background color as background for png with tranparency
2015-08-28 masensioRemove transparent background in icons
2015-08-25 masensioMerge branch 'master' into create_folder_button_on_acti...
2015-08-24 masensioMerge pull request #1082 from owncloud/ignoreHiddenFiles
2015-08-24 masensioMerge pull request #1078 from gstraube/develop
2015-08-24 masensioMerge branch 'master' of github.com:owncloud/android
next