Merge remote-tracking branch 'remotes/upstream/avoidDuplicateFiles' into beta
[pub/Android/ownCloud.git] / src / com / owncloud / android / utils / FileStorageUtils.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 'remotes/upstream/resizeCa...
2015-11-15 Bartosz PrzybylskiCode cleanups
2015-11-15 Bartosz PrzybylskiAdd unfinished local directories browser for storage...
2015-11-15 tobiasKaminskyPrepare preferences and project to use user defined...
2015-11-14 tobiasKaminskyMerge branch 'master' of github.com:owncloud/android...
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-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-06 Maria AsensioMerge pull request #1184 from Wikinaut/show-certificate...
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-02 Andy ScherzingerMerge branch 'master' of https://github.com/owncloud...
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-11-01 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/master...
2015-10-31 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/resizedI...
2015-10-31 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/resizedI...
2015-10-30 Andy ScherzingerMerge branch 'master' of https://github.com/owncloud...
2015-10-30 Andy ScherzingerMerge branch 'master' of https://github.com/owncloud...
2015-10-30 Maria AsensioMerge pull request #1109 from owncloud/sync_full_folder
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/master...
2015-10-29 Andy ScherzingerMerge branch 'descendIntoFolder' of https://github...
2015-10-29 Andy ScherzingerMerge branch 'master' of https://github.com/owncloud...
2015-10-27 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/master...
2015-10-27 masensioMerge branch 'master' into sync_full_folder
2015-10-26 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/resizedI...
2015-10-18 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/master...
2015-10-15 masensioMerge remote-tracking branch 'origin/develop'
2015-10-15 masensioMerge branch 'detailThumbnail' of git://github.com...
2015-10-14 Andy ScherzingerMerge branch 'master' of https://github.com/owncloud...
2015-10-09 Andy ScherzingerMerge branch 'master' of https://github.com/owncloud...
2015-10-07 tobiasKaminskyMerge branch 'master' of github.com:owncloud/android...
2015-10-07 Andy ScherzingerMerge branch 'master' of https://github.com/owncloud...
2015-10-07 Maria AsensioMerge pull request #1190 from owncloud/1182_Open_With_Fix
2015-10-06 Maria AsensioMerge pull request #1117 from owncloud/sortAccents
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-25 Andy ScherzingerMerge branch 'release-1.8' of https://github.com/ownclo...
2015-09-25 Andy ScherzingerMerge branch 'release-1.8' of https://github.com/ownclo...
2015-09-25 David A. VelascoClean-up: removed unused imports and methods, and comme...
2015-09-25 David A. VelascoETag used to detect changes in remote files (not only...
2015-09-24 masensioMerge pull request #1174 from owncloud/release_bug_fixes
2015-09-24 David A. VelascoSet default static values to prevent weird crash
2015-09-01 masensioMerge branch 'develop' into uploadWhenCharging
2015-08-25 tobiasKaminskyfix #1110: accents not sorted
2015-08-05 masensioMerge commit 'refs/pr/707' into text_file_preview_pr_70...
2015-07-22 tobiasKaminskyMerge remote-tracking branch 'upstream/develop' into...
2015-07-10 tobiasKaminskyadd sort to UploadFileActiviy
2015-05-21 tobiasKaminskyMerge remote-tracking branch 'upstream/develop' into...
2015-04-28 David A. VelascoMerge branch 'develop' into pinEnhancement
2015-04-07 masensioMerge branch 'release-1.7.1' oc-android-1.7.1_signed
2015-03-16 masensioMerge branch 'develop' into create_folder_during_upload...
2015-03-10 masensioMerge branch 'develop' into accessibility
2015-03-09 David A. VelascoMerge branch 'develop' into update_propfind_for_server_8.1
2015-03-06 masensioMerge branch 'develop' into share_password_support
2015-03-06 David A. VelascoMerge pull request #912 from owncloud/review_license
2015-03-05 masensioUpdate year in license
2015-03-05 masensioAdd author's line in license
2015-02-03 David A. VelascoMerge branch 'master' into release-1.7.0
2015-02-02 David A. VelascoMerge branch 'develop' into imageGrid
2015-02-02 David A. VelascoMerge pull request #844 from owncloud/delete_local_files
2015-01-30 masensioMerge commit 'refs/pr/701' into create_folder_during_up...
2015-01-29 masensioFix bug: When renaming a folder, in the photos apps...
next