Merge branch 'master' into sync_full_folder
[pub/Android/ownCloud.git] / src / com / owncloud / android /
2015-10-27 masensioMerge branch 'master' into sync_full_folder
2015-10-22 David A. VelascoMerge pull request #1177 from owncloud/notification_col...
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-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 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 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 masensioMerge branch 'release-1.8'
2015-09-28 David A. VelascoUpload operations end in conflict if overriding a versi...
2015-09-27 Andy ScherzingerAdd ownCloud color to notifications (only works on...
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-22 masensioMerge pull request #1171 from owncloud/fix_lock_of_uplo...
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-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 Scherzingeradapting web's way of choosing icons
2015-09-14 masensioMerge branch 'update_share_link_for_OC_8.2' of github...
2015-09-11 David A. VelascoMerge pull request #1141 from owncloud/559_longpress_fi...
2015-09-11 Andy Scherzingerfurther cleanup, moving folder icon determination into...
2015-09-11 Andy ScherzingerAdd further javadoc descsribing how to maintain further...
2015-09-10 Andy Scherzingerremove commented out test code
2015-09-10 Andy Scherzingeradded mapping for bin to be iconized with "application"
2015-09-10 Andy Scherzingerrewrite for icon determination with refactoring into...
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 Scherzingershowing the filename in the long press menu on file...
2015-09-07 masensioMerge pull request #1095 from owncloud/text_file_previe...
2015-09-07 masensioMerge branch 'master' into text_file_preview_pr_707_wit...
2015-09-07 David A. VelascoFixed text preview filter to take into account local...
2015-09-04 David A. VelascoReverse filter for preview of text files: all text...
2015-09-04 masensioMerge branch 'master' into text_file_preview_pr_707_wit...
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-08-31 David A. VelascoMerge pull request #1122 from owncloud/create_folder_bu...
2015-08-31 masensioSet background color as background for png with tranparency
2015-08-28 masensioRemove transparent background in icons
2015-08-25 tobiasKaminskyfix #1110: accents not sorted
2015-08-25 masensioMerge branch 'master' into create_folder_button_on_acti...
2015-08-25 tobiasKaminskyto be sure ;)
2015-08-25 tobiasKaminskytry fix #1113
2015-08-24 masensioMerge branch 'develop'
2015-08-24 masensioMerge pull request #1082 from owncloud/ignoreHiddenFiles
2015-08-24 masensioMerge branch 'develop'
2015-08-24 masensioMerge pull request #1078 from gstraube/develop
2015-08-24 masensioMerge branch 'master' of github.com:owncloud/android
2015-08-24 masensioMerge pull request #1056 from owncloud/svgTransparentBa...
2015-08-22 tobiasKaminskyThumbnails add checkerboard to png
2015-08-21 gstraubeMerge remote-tracking branch 'upstream/develop' into...
2015-08-21 tobiasKaminskyMerge branch 'develop' of github.com:owncloud/android...
2015-08-21 purigarciaMerge branch 'develop' into ignoreHiddenFiles
2015-08-20 masensioMerge pull request #1076 from owncloud/material_toolbar
2015-08-20 Andy Scherzingerfurther m-prefixing
2015-08-20 Andy Scherzingerfixed m-Prefixing
2015-08-20 Andy ScherzingerNullCheck for drawer
2015-08-20 Andy Scherzingerprefixed variables with 'm'
2015-08-19 Jorge Antonio Diaz... Fixes the text preview issue
2015-08-19 Andy ScherzingerNPE Fix for setting the color on the IndeterminateProgr...
2015-08-18 Andy ScherzingerFix for long click menue for account management in...
2015-08-18 Andy Scherzingerfix for the progress bar on pre lollipop devices via...
2015-08-18 Jorge Antonio Diaz... Fixes the last reported bugs
2015-08-18 Andy Scherzingerreverted back to light colored login
2015-08-18 Jorge Antonio Diaz... Removes a static modifier that sneaked in
2015-08-18 Jorge Antonio Diaz... Refactored functionality to use the new FolderPickerAct...
2015-08-18 Jorge Antonio Diaz... Updated copy action
2015-08-18 Jorge Antonio Diaz... Added copy action
next