Merge remote-tracking branch 'remotes/upstream/master' into beta
[pub/Android/ownCloud.git] / src / com / owncloud / android / ui / activity / Preferences.java
2015-11-27 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/master...
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-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-19 Bartosz PrzybylskiDon't allow to remove passcode without entering it...
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-18 tobiasKaminskyremoved last ref to BuildConfig
2015-11-18 tobiasKaminskyversion code is now read by package an not by BuildConf...
2015-11-15 Bartosz PrzybylskiFix after rebase
2015-11-15 Bartosz PrzybylskiCode cleanups
2015-11-15 Bartosz PrzybylskiAdd cleanup and rollback step when migrating. Correctly...
2015-11-15 Bartosz PrzybylskiAdd more migration stuff. cleanup step is still missing
2015-11-15 Bartosz PrzybylskiAdd unfinished local directories browser for storage...
2015-11-15 tobiasKaminskyPrepare preferences and project to use user defined...
2015-11-14 tobiasKaminskyMerge branch 'master' 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-10 Andy ScherzingerMerge branch 'master' of https://github.com/owncloud...
2015-11-10 Andy ScherzingerMerge branch '1193_uploader_layout' of https://github...
2015-11-09 Andy ScherzingerMerge branch 'beta' of https://github.com/owncloud...
2015-11-09 tobiasKaminskyfix #1265
2015-11-06 tobiasKaminskyMerge branch 'setAsWallpaper' into beta
2015-11-06 tobiasKaminskyVersionstring shows YYYYMMDD
2015-11-05 tobiasKaminskyupdate version url
2015-11-05 tobiasKaminskywip
2015-11-05 tobiasKaminskywip
2015-11-05 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/resizedI...
2015-11-05 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/master...
2015-11-05 tobiasKaminskycheck available beta version
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-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-10-31 tobiasKaminskylink to latest beta
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-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 Andy ScherzingerMerge branch 'descendIntoFolder' of https://github...
2015-10-27 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/animated...
2015-10-26 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/resizedI...
2015-10-26 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/uploadWh...
2015-10-18 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/master...
2015-10-18 tobiasKaminskyMerge branch 'uploadWhenCharging' of github.com:ownclou...
2015-10-17 tobiasKaminskyfixed according to andys comments
2015-10-15 masensioMerge branch 'detailThumbnail' of git://github.com...
2015-10-12 tobiasKaminskycache size is read from cache on preference start
2015-10-12 tobiasKaminskycache resize
2015-10-01 masensioMerge pull request #839 from fluffy88/develop
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-01 David A. VelascoMerge branch 'master' into copy
2015-09-01 masensioMerge branch 'develop' into uploadWhenCharging
2015-08-25 masensioMerge branch 'master' into create_folder_button_on_acti...
2015-08-23 tobiasKaminskyMerge branch 'develop' of github.com:owncloud/android...
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-18 Andy ScherzingerMerge branch 'material_buttons' of https://github.com...
2015-08-18 Andy ScherzingerMerge branch 'material_toolbar' of https://github.com...
2015-08-18 Andy ScherzingerFix for long click menue for account management in...
2015-08-17 Andy ScherzingerMerge branch 'master' of https://github.com/owncloud...
2015-08-10 Andy ScherzingerMerge branch 'master' of https://github.com/owncloud...
2015-08-10 Andy ScherzingerMerge branch 'master' of https://github.com/owncloud...
2015-08-07 Andy ScherzingerMerge branch 'master' of https://github.com/owncloud...
2015-08-06 Andy ScherzingerMerge branch 'develop' of https://github.com/owncloud...
2015-08-05 masensioMerge commit 'refs/pr/707' into text_file_preview_pr_70...
2015-08-04 Andy ScherzingerMerge branch 'develop' of https://github.com/owncloud...
2015-08-04 Andy ScherzingerMerge branch 'develop' of https://github.com/owncloud...
2015-08-03 Andy ScherzingerMerge branch 'develop' of https://github.com/owncloud...
2015-07-26 AndyScherzingerMerge branch 'develop' of https://github.com/owncloud...
2015-07-25 AndyScherzingerinitial material design changes for the action bar
next