Merge branch 'material_buttons' of https://github.com/owncloud/android into target_ma...
[pub/Android/ownCloud.git] / src / com /
2015-11-04 Andy ScherzingerMerge branch 'material_buttons' of https://github.com...
2015-11-04 Andy ScherzingerFix visibility of file size and separator for folder...
2015-11-02 Andy Scherzingercorrect text field names
2015-11-02 Andy Scherzingerfixed another typo
2015-11-02 Andy ScherzingerMerge branch 'target_marshmallow' of https://github...
2015-11-02 Andy ScherzingerMerge branch 'material_buttons' of https://github.com...
2015-11-02 Andy Scherzingertypos fixed
2015-11-02 Andy ScherzingerMerge branch 'material_buttons' of https://github.com...
2015-11-02 Andy ScherzingerMerge branch 'master' of https://github.com/owncloud...
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-30 Maria AsensioMerge pull request #1200 from owncloud/fix_1192_date_time
2015-10-29 LukeOwncloudMC: Updated comment only
2015-10-29 David A. VelascoMerge pull request #1105 from owncloud/fixLegacyTravis
2015-10-29 masensioDetect conflict when local and server version are changed
2015-10-29 Andy Scherzingerreturn standard date string as fallback
2015-10-27 Andy ScherzingerMove to NotificationCompat.Builder to create/replace...
2015-10-27 masensioFix Select Local Version or Keep Both behaviour when...
2015-10-27 Andy ScherzingerMerge branch 'master' of https://github.com/owncloud...
2015-10-27 Andy Scherzingerhide FAB in copy/move folder chooser
2015-10-27 masensioMerge branch 'master' into sync_full_folder
2015-10-26 Andy ScherzingerMerge branch 'master' of https://github.com/owncloud...
2015-10-26 Andy ScherzingerMerge branch 'master' of https://github.com/owncloud...
2015-10-22 Andy ScherzingerMerge branch 'master' of https://github.com/owncloud...
2015-10-22 Andy ScherzingerMerge branch 'master' of https://github.com/owncloud...
2015-10-22 David A. VelascoMerge pull request #1177 from owncloud/notification_col...
2015-10-19 Andy ScherzingerMerge branch 'master' of https://github.com/owncloud...
2015-10-19 Andy ScherzingerMerge branch 'master' of https://github.com/owncloud...
2015-10-16 Andy ScherzingerMerge branch 'fix_1192_date_time' of https://github...
2015-10-16 Andy Scherzingerflipped the if/else for performance optimization
2015-10-16 Andy ScherzingerMerge branch 'master' of https://github.com/owncloud...
2015-10-16 Andy ScherzingerMerge branch 'master' of https://github.com/owncloud...
2015-10-16 Andy ScherzingerMerge branch 'master' of https://github.com/owncloud...
2015-10-16 Maria AsensioMerge pull request #1199 from owncloud/display_thumbnai...
2015-10-15 tobiasKaminskyfixed missing refresh of thumbnail after sync
2015-10-15 masensioMerge remote-tracking branch 'origin/develop'
2015-10-15 masensioMerge branch 'zmatsuo-detailThumbnail' into develop
2015-10-15 masensioMerge branch 'detailThumbnail' of git://github.com...
2015-10-15 Andy Scherzingerfix for #1192
2015-10-14 Andy ScherzingerMerge branch 'master' of https://github.com/owncloud...
2015-10-14 Andy ScherzingerMerge branch 'master' of https://github.com/owncloud...
2015-10-14 Andy ScherzingerMerge branch 'master' of https://github.com/owncloud...
2015-10-11 Andy ScherzingerMerge branch 'master' of https://github.com/owncloud...
2015-10-09 Andy ScherzingerMerge branch 'master' of https://github.com/owncloud...
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-06 Andy ScherzingerCode review
2015-10-05 Andy ScherzingerMerge branch '1182_Open_With_Fix' of https://github...
2015-10-05 Andy ScherzingerMerge branch 'master' of https://github.com/owncloud...
2015-10-05 Andy ScherzingerFix for #1182 on Android 5
2015-10-02 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/master...
2015-10-01 masensioMerge pull request #839 from fluffy88/develop
2015-09-30 masensioUse SYNC_CONFLICT instead CONFLICT for conflicts in...
2015-09-30 masensioMerge branch 'master' into sync_full_folder
2015-09-28 Andy ScherzingerMerge branch 'master' of https://github.com/owncloud...
2015-09-28 masensioMerge branch 'release-1.8'
2015-09-28 David A. VelascoUpload operations end in conflict if overriding a versi...
2015-09-27 Andy ScherzingerMerge branch 'material_buttons' of https://github.com...
2015-09-27 Andy ScherzingerMerge branch 'notification_coloring' of https://github...
2015-09-27 Andy ScherzingerAdd ownCloud color to notifications (only works on...
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. VelascoUpdated error message for failed folder synchronization...
2015-09-25 David A. VelascoRemoved some logs
2015-09-25 David A. VelascoClean-up: removed unused imports and methods, and comme...
2015-09-25 David A. VelascoRemoved separated 'download folder' in contextual menu...
2015-09-25 David A. VelascoFixed permanent 'uploading' icon on files that are...
2015-09-25 David A. VelascoSafe blanket to clean DB if wrong conflicts keep stored
2015-09-25 David A. VelascoRemove conflict badge from ancestors when conflict...
2015-09-25 David A. VelascoRemoved conflict badge when conflict is solved
2015-09-25 David A. VelascoAdded conflict icon to folders containing files with...
2015-09-25 David A. VelascoPersist conflicts in local database and show with an...
2015-09-25 David A. VelascoETag used to detect changes in remote files (not only...
2015-09-25 David A. VelascoFixed NullPointerExceptionS in upload cancelations
2015-09-25 David A. VelascoJoin cancelation of downloads and uploads in 'cancel...
2015-09-25 David A. VelascoRewritten queue of FileUploader based on IndexedForest
2015-09-25 David A. VelascoAdded icon for files synchronizing; folders use it...
2015-09-25 David A. VelascoKeep the old operation to sync folder as DownloadFolder...
2015-09-25 David A. VelascoExtend SyncFolderOperation to check local changes of...
2015-09-24 masensioMerge pull request #1174 from owncloud/release_bug_fixes
2015-09-24 David A. VelascoClose dangling Cursors in FileContentProvider
2015-09-24 David A. VelascoSet default static values to prevent weird crash
2015-09-24 David A. VelascoFix repetition of already finished access to root folde...
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-22 Andy ScherzingerMerge branch 'master' of https://github.com/owncloud...
2015-09-22 Andy ScherzingerMerge branch 'master' of https://github.com/owncloud...
2015-09-22 Andy ScherzingerMerge branch 'release-1.8' of https://github.com/ownclo...
2015-09-22 Andy ScherzingerMerge branch 'release-1.8' of https://github.com/ownclo...
2015-09-22 David A. VelascoFixed crashed on cancelled download in gallery
2015-09-21 David A. VelascoGrant that cancellations of tasks generating thumbnails...
2015-09-17 Andy ScherzingerMerge branch 'material_buttons' of https://github.com...
2015-09-17 Andy ScherzingerMerge branch 'Fix_refreshClickException' of https:...
2015-09-17 Andy ScherzingerMerge branch 'Fix_refreshClickException' of https:...
2015-09-16 Andy ScherzingerMerge branch 'material_buttons' of https://github.com...
2015-09-16 Andy Scherzingerfix for refresh bug
next