Merge remote-tracking branch 'remotes/upstream/material_buttons' into beta
[pub/Android/ownCloud.git] / src / com / owncloud / android / ui / activity / FileDisplayActivity.java
2015-11-27 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/material...
2015-11-27 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/avoidDup...
2015-11-27 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/master...
2015-11-27 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/master...
2015-11-25 David A. VelascoMerge pull request #1307 from owncloud/share_with_passw...
2015-11-25 masensioDelete any rest of old public share/unshare flow
2015-11-22 Andy ScherzingerMerge branch 'master' of https://github.com/owncloud...
2015-11-22 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/avoidDup...
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/master...
2015-11-21 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/avoidDup...
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/bug_1251...
2015-11-20 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/1193_upl...
2015-11-20 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/external...
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 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/resizeCa...
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/master...
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-10 Andy ScherzingerMerge branch 'master' of https://github.com/owncloud...
2015-11-10 Andy ScherzingerMerge branch '1193_uploader_layout' of https://github...
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-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 tobiasKaminskyfixed according to review
2015-11-02 Andy ScherzingerMerge branch 'material_buttons' of https://github.com...
2015-11-02 Andy ScherzingerMerge branch 'material_buttons' of https://github.com...
2015-11-02 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 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. VelascoRefactoring: a single method to request ShareActivity
2015-10-30 David A. VelascoSimplified handling of life cycle in ShareActivity...
2015-10-30 David A. VelascoFixed error messages related with network in ShareActivity
2015-10-30 David A. VelascoAdded operation to create shares with a sharee, separat...
2015-10-30 masensioAdapt UnshareLinkOperation to support also ShareType...
2015-10-30 masensioShow the 'search' layout in phone and tablet
2015-10-30 masensioShow the layout to hsare with user in phone and tablet
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-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 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-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-18 tobiasKaminskyrefresh after chage
2015-10-18 tobiasKaminskyenabled all occurrences.
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...
next