Merge remote-tracking branch 'remotes/upstream/avoidDuplicateFiles' into beta
[pub/Android/ownCloud.git] / src / com / owncloud / android / providers / FileContentProvider.java
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/switchOf...
2015-11-21 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/master...
2015-11-20 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/1193_upl...
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 Tobias KaminskyMerge pull request #1290 from przybylski/bug_1288
2015-11-14 tobiasKaminskyMerge branch 'master' of github.com:owncloud/android...
2015-11-13 tobiasKaminskyMerge branch 'beta' of github.com:owncloud/android...
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-12 David A. VelascoMerge pull request #1254 from owncloud/droid-update
2015-11-12 David A. VelascoMerge pull request #1274 from owncloud/read_capabilitie...
2015-11-12 masensioRead capabilities for showing Share Options
2015-11-06 tobiasKaminskyMerge branch 'setAsWallpaper' into beta
2015-11-06 Andy ScherzingerMerge branch 'material_fab' of https://github.com/owncl...
2015-11-06 Andy ScherzingerMerge branch 'material_buttons' of https://github.com...
2015-11-06 Andy ScherzingerMerge branch 'master' of https://github.com/owncloud...
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-05 Maria AsensioMerge pull request #1252 from owncloud/share_with_users
2015-11-02 tobiasKaminsky"set picture as" finished
2015-11-02 tobiasKaminskywip
2015-11-02 Andy ScherzingerMerge branch 'master' of https://github.com/owncloud...
2015-11-01 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/video_th...
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/resizedI...
2015-10-31 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/resizedI...
2015-10-30 David A. VelascoAdded operation to create shares with a sharee, separat...
2015-10-30 masensioGet shares from Database, fix in insert shares in DB
2015-10-30 David A. VelascoSync user and group shares into database
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-30 David A. VelascoMerge pull request #1219 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/avoidDup...
2015-10-29 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/sortInUp...
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/master...
2015-10-27 masensioFix Select Local Version or Keep Both behaviour when...
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 branch 'detailThumbnail' of git://github.com...
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-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. VelascoPersist conflicts in local database and show with an...
2015-09-24 masensioMerge pull request #1174 from owncloud/release_bug_fixes
2015-09-24 David A. VelascoClose dangling Cursors in FileContentProvider
2015-09-01 masensioMerge branch 'develop' into uploadWhenCharging
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-06 masensioMerge branch 'release-1.7.2'
2015-07-01 tobiasKaminskyMerge remote-tracking branch 'upstream/develop' into...
2015-06-22 David A. VelascoMerge branch 'master' into develop
2015-05-21 tobiasKaminskyMerge remote-tracking branch 'upstream/develop' into...
2015-05-05 masensioMerge branch 'develop' into thumbnailOOM
2015-05-04 purigarciaMerge branch 'develop' into automationTest
2015-04-28 David A. VelascoMerge branch 'develop' into pinEnhancement
2015-04-22 David A. VelascoMerge pull request #957 from owncloud/fix_crash_invalid...
2015-04-22 David A. VelascoMerge pull request #951 from owncloud/loging_different_...
2015-04-22 David A. VelascoFixes after CR
2015-04-22 David A. VelascoMerge branch 'develop' into loging_different_servers_sa...
2015-04-21 David A. VelascoTransaction signaled as successful in the right place...
2015-04-17 masensioRemove comments
2015-04-17 masensioReplace rawQuery by query, onUpgrade --> updateDownload...
2015-04-16 masensioReplace account.name by newAccountName in onUpgrade
2015-04-15 masensioSelect * in updateDownloadedFiles
2015-04-15 masensioChanges in update for downloaded files
2015-04-15 masensioUpdate downloaded files
2015-04-15 masensioMerge pull request #946 from owncloud/upgrading_account...
2015-04-15 David A. VelascoUpgraded accounts in AccountManager with new account...
2015-04-15 masensioRemove old update sql for 10 version, in onUpgrade...
2015-04-15 David A. VelascoMerge branch 'develop' into upgrading_account_manager
2015-04-15 masensioChange update query and add log in onUpgrade (10 DB...
2015-04-14 David A. VelascoModify upgrade of account names in database; upgrade...
2015-04-14 masensioUpgrade account name in all the rows of files table...
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
next