projects / pub / Android / ownCloud.git / history
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
Detect conflict when local and server version are changed
[pub/Android/ownCloud.git] / src /
2015-10-29 masensioDetect conflict when local and server version are changed tree | commitdiff
2015-10-27 masensioFix Select Local Version or Keep Both behaviour when... tree | commitdiff
2015-10-27 masensioMerge branch 'master' into sync_full_folder tree | commitdiff
2015-10-22 David A. VelascoMerge pull request #1177 from owncloud/notification_col... tree | commitdiff
2015-10-16 Maria AsensioMerge pull request #1199 from owncloud/display_thumbnai... tree | commitdiff
2015-10-15 tobiasKaminskyfixed missing refresh of thumbnail after sync tree | commitdiff
2015-10-15 masensioMerge remote-tracking branch 'origin/develop' tree | commitdiff
2015-10-15 masensioMerge branch 'zmatsuo-detailThumbnail' into develop tree | commitdiff
2015-10-15 masensioMerge branch 'detailThumbnail' of git://github.com... tree | commitdiff
2015-10-14 Andy ScherzingerMerge branch 'master' of https://github.com/owncloud... tree | commitdiff
2015-10-09 Andy ScherzingerMerge branch 'master' of https://github.com/owncloud... tree | commitdiff
2015-10-07 Maria AsensioMerge pull request #1190 from owncloud/1182_Open_With_Fix tree | commitdiff
2015-10-06 Maria AsensioMerge pull request #1117 from owncloud/sortAccents tree | commitdiff
2015-10-06 Andy ScherzingerCode review tree | commitdiff
2015-10-05 Andy ScherzingerFix for #1182 on Android 5 tree | commitdiff
2015-10-02 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/master... tree | commitdiff
2015-10-01 masensioMerge pull request #839 from fluffy88/develop tree | commitdiff
2015-09-30 masensioUse SYNC_CONFLICT instead CONFLICT for conflicts in... tree | commitdiff
2015-09-30 masensioMerge branch 'master' into sync_full_folder tree | commitdiff
2015-09-28 masensioMerge branch 'release-1.8' tree | commitdiff
2015-09-28 David A. VelascoUpload operations end in conflict if overriding a versi... tree | commitdiff
2015-09-27 Andy ScherzingerAdd ownCloud color to notifications (only works on... tree | commitdiff
2015-09-25 David A. VelascoUpdated error message for failed folder synchronization... tree | commitdiff
2015-09-25 David A. VelascoRemoved some logs tree | commitdiff
2015-09-25 David A. VelascoClean-up: removed unused imports and methods, and comme... tree | commitdiff
2015-09-25 David A. VelascoRemoved separated 'download folder' in contextual menu... tree | commitdiff
2015-09-25 David A. VelascoFixed permanent 'uploading' icon on files that are... tree | commitdiff
2015-09-25 David A. VelascoSafe blanket to clean DB if wrong conflicts keep stored tree | commitdiff
2015-09-25 David A. VelascoRemove conflict badge from ancestors when conflict... tree | commitdiff
2015-09-25 David A. VelascoRemoved conflict badge when conflict is solved tree | commitdiff
2015-09-25 David A. VelascoAdded conflict icon to folders containing files with... tree | commitdiff
2015-09-25 David A. VelascoPersist conflicts in local database and show with an... tree | commitdiff
2015-09-25 David A. VelascoETag used to detect changes in remote files (not only... tree | commitdiff
2015-09-25 David A. VelascoFixed NullPointerExceptionS in upload cancelations tree | commitdiff
2015-09-25 David A. VelascoJoin cancelation of downloads and uploads in 'cancel... tree | commitdiff
2015-09-25 David A. VelascoRewritten queue of FileUploader based on IndexedForest tree | commitdiff
2015-09-25 David A. VelascoAdded icon for files synchronizing; folders use it... tree | commitdiff
2015-09-25 David A. VelascoKeep the old operation to sync folder as DownloadFolder... tree | commitdiff
2015-09-25 David A. VelascoExtend SyncFolderOperation to check local changes of... tree | commitdiff
2015-09-24 masensioMerge pull request #1174 from owncloud/release_bug_fixes tree | commitdiff
2015-09-24 David A. VelascoClose dangling Cursors in FileContentProvider tree | commitdiff
2015-09-24 David A. VelascoSet default static values to prevent weird crash tree | commitdiff
2015-09-24 David A. VelascoFix repetition of already finished access to root folde... tree | commitdiff
2015-09-22 masensioMerge pull request #1171 from owncloud/fix_lock_of_uplo... tree | commitdiff
2015-09-22 David A. VelascoFixed crashed on cancelled download in gallery tree | commitdiff
2015-09-21 David A. VelascoGrant that cancellations of tasks generating thumbnails... tree | commitdiff
2015-09-16 masensioMerge branch 'release-1.8' of github.com:owncloud/andro... tree | commitdiff
2015-09-16 masensioMerge pull request #1157 from owncloud/fix_file_list_ic... tree | commitdiff
2015-09-16 masensioMerge pull request #1149 from owncloud/new_filetype_icons tree | commitdiff
2015-09-15 Andy Scherzingeradapting web's way of choosing icons tree | commitdiff
2015-09-14 masensioMerge branch 'update_share_link_for_OC_8.2' of github... tree | commitdiff
2015-09-11 David A. VelascoMerge pull request #1141 from owncloud/559_longpress_fi... tree | commitdiff
2015-09-11 Andy Scherzingerfurther cleanup, moving folder icon determination into... tree | commitdiff
2015-09-11 Andy ScherzingerAdd further javadoc descsribing how to maintain further... tree | commitdiff
2015-09-10 Andy Scherzingerremove commented out test code tree | commitdiff
2015-09-10 Andy Scherzingeradded mapping for bin to be iconized with "application" tree | commitdiff
2015-09-10 Andy Scherzingerrewrite for icon determination with refactoring into... tree | commitdiff
2015-09-10 Andy Scherzingershortened this prediction, since it will always be... tree | commitdiff
2015-09-09 masensioMerge pull request #1124 from Kernald/new-filetype... tree | commitdiff
2015-09-07 Andy Scherzingershowing the filename in the long press menu on file... tree | commitdiff
2015-09-07 masensioMerge pull request #1095 from owncloud/text_file_previe... tree | commitdiff
2015-09-07 masensioMerge branch 'master' into text_file_preview_pr_707_wit... tree | commitdiff
2015-09-07 David A. VelascoFixed text preview filter to take into account local... tree | commitdiff
2015-09-04 David A. VelascoReverse filter for preview of text files: all text... tree | commitdiff
2015-09-04 masensioMerge branch 'master' into text_file_preview_pr_707_wit... tree | commitdiff
2015-09-04 masensioMerge pull request #1102 from owncloud/copy tree | commitdiff
2015-09-02 masensioMerge branch 'text_file_preview_pr_707_with_develop... tree | commitdiff
2015-09-02 masensioMerge remote-tracking branch 'origin/master' into text_... tree | commitdiff
2015-09-02 David A. VelascoMerge pull request #1114 from owncloud/tryFix1113 tree | commitdiff
2015-09-01 David A. VelascoMerge branch 'master' into copy tree | commitdiff
2015-08-31 David A. VelascoMerge pull request #1122 from owncloud/create_folder_bu... tree | commitdiff
2015-08-31 masensioSet background color as background for png with tranparency tree | commitdiff
2015-08-28 masensioRemove transparent background in icons tree | commitdiff
2015-08-25 tobiasKaminskyremoved commented code tree | commitdiff
2015-08-25 tobiasKaminskyfix #1110: accents not sorted tree | commitdiff
2015-08-25 masensioMerge branch 'master' into create_folder_button_on_acti... tree | commitdiff
2015-08-25 tobiasKaminskyto be sure ;) tree | commitdiff
2015-08-25 tobiasKaminskytry fix #1113 tree | commitdiff
2015-08-24 masensioMerge branch 'develop' tree | commitdiff
2015-08-24 masensioMerge pull request #1082 from owncloud/ignoreHiddenFiles tree | commitdiff
2015-08-24 masensioMerge branch 'develop' tree | commitdiff
2015-08-24 masensioMerge pull request #1078 from gstraube/develop tree | commitdiff
2015-08-24 masensioMerge branch 'master' of github.com:owncloud/android tree | commitdiff
2015-08-24 masensioMerge pull request #1056 from owncloud/svgTransparentBa... tree | commitdiff
2015-08-22 tobiasKaminskyThumbnails add checkerboard to png tree | commitdiff
2015-08-21 gstraubeMerge remote-tracking branch 'upstream/develop' into... tree | commitdiff
2015-08-21 tobiasKaminskyMerge branch 'develop' of github.com:owncloud/android... tree | commitdiff
2015-08-21 purigarciaMerge branch 'develop' into ignoreHiddenFiles tree | commitdiff
2015-08-20 masensioMerge pull request #1076 from owncloud/material_toolbar tree | commitdiff
2015-08-20 Andy Scherzingerfurther m-prefixing tree | commitdiff
2015-08-20 Andy Scherzingerfixed m-Prefixing tree | commitdiff
2015-08-20 Andy ScherzingerNullCheck for drawer tree | commitdiff
2015-08-20 Andy Scherzingerprefixed variables with 'm' tree | commitdiff
2015-08-19 Jorge Antonio Diaz... Fixes the text preview issue tree | commitdiff
2015-08-19 Andy ScherzingerNPE Fix for setting the color on the IndeterminateProgr... tree | commitdiff
2015-08-18 Andy ScherzingerFix for long click menue for account management in... tree | commitdiff
2015-08-18 Andy Scherzingerfix for the progress bar on pre lollipop devices via... tree | commitdiff
2015-08-18 Jorge Antonio Diaz... Fixes the last reported bugs tree | commitdiff
2015-08-18 Andy Scherzingerreverted back to light colored login tree | commitdiff
2015-08-18 Jorge Antonio Diaz... Removes a static modifier that sneaked in tree | commitdiff
next
ownCloud Android App