Merge remote-tracking branch 'remotes/upstream/target_marshmallow' into beta
[pub/Android/ownCloud.git] / src / com / owncloud / android / utils /
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-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-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 tobiasKaminskyimplements #1233
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 David A. VelascoFixed error messages related with network in ShareActivity
2015-10-30 David A. VelascoShow error messages from server when share-specific...
2015-10-30 David A. VelascoAdded operation to create shares with a sharee, separat...
2015-10-30 masensioGet users/group from Server, to fill in 'Share with...
2015-10-30 masensioUse UnshareOperation instead an AsyncTask, for unshare...
2015-10-30 masensioAdapt UnshareLinkOperation to support also ShareType...
2015-10-30 masensioAdd unshare with users/groups, from Share wiht view
2015-10-30 masensioAdd new string for share_groups_indicator
2015-10-30 masensioShow users/groups in share with view, getting the data...
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 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 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/resizeCa...
2015-10-29 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/switchOf...
2015-10-29 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/material...
2015-10-29 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/material...
2015-10-29 tobiasKaminskyMerge branch 'switchListVsGridMaster' into beta
2015-10-29 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/master...
2015-10-29 Andy Scherzingerreturn standard date string as fallback
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 Andy ScherzingerMerge branch 'master' of https://github.com/owncloud...
2015-10-27 masensioMerge branch 'master' into sync_full_folder
2015-10-26 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/resizedI...
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-19 Andy ScherzingerMerge branch 'master' of https://github.com/owncloud...
2015-10-19 Andy ScherzingerMerge branch 'master' of https://github.com/owncloud...
2015-10-18 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/master...
2015-10-18 tobiasKaminskyMerge branch 'uploadWhenCharging' of github.com:ownclou...
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-15 masensioMerge remote-tracking branch 'origin/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-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 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-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-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 Andy ScherzingerMerge branch 'master' of https://github.com/owncloud...
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. VelascoUpdated error message for failed folder synchronization...
next