Merge remote-tracking branch 'remotes/upstream/master' into beta
[pub/Android/ownCloud.git] / src / com / owncloud / android / MainApp.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-18 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/multiSel...
2015-11-18 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/resizeCa...
2015-11-15 Bartosz PrzybylskiAdd unfinished local directories browser for storage...
2015-11-15 tobiasKaminskyPrepare preferences and project to use user defined...
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-06 tobiasKaminskyMerge branch 'setAsWallpaper' into beta
2015-11-05 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/resizedI...
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 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-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-18 tobiasKaminskyenabled all occurrences.
2015-09-01 masensioMerge branch 'develop' into uploadWhenCharging
2015-08-05 masensioMerge commit 'refs/pr/707' into text_file_preview_pr_70...
2015-07-22 tobiasKaminskyMerge remote-tracking branch 'upstream/develop' into...
2015-07-06 masensioMerge branch 'release-1.7.2'
2015-07-01 tobiasKaminskyMerge remote-tracking branch 'upstream/develop' into...
2015-06-22 David A. VelascoMerge branch 'master' into develop
2015-06-15 masensioMerge branch 'develop' into forbidden_characters_from_s...
2015-06-15 masensioMerge pull request #995 from owncloud/navigationDrawer_...
2015-06-15 masensioMerge remote-tracking branch 'origin/develop' into...
2015-06-15 David A. VelascoMerge branch 'develop' into navigationDrawer_basic
2015-05-27 tobiasKaminskyMerge branch 'navigationDrawer_update' of github.com...
2015-05-27 masensioMerge branch 'remove_ActionBarSherlock' into navigation...
2015-05-25 masensioDisable On Device option in Navigation Drawer
2015-05-21 tobiasKaminskyMerge remote-tracking branch 'upstream/develop' into...
2015-05-08 David A. VelascoMerge pull request #973 from owncloud/delete_share_opti...
2015-05-06 purigarciaMerge branch 'develop' into automationTest
2015-05-06 masensioMerge branch 'develop' into thumbnailOOM
2015-05-06 masensioMerge pull request #970 from owncloud/pinEnhancement
2015-05-05 masensioMerge branch 'develop' into pinEnhancement
2015-05-05 David A. VelascoMerge branch 'develop' into pinEnhancement
2015-05-04 David A. VelascoWhen pass code is enabled, the app is sent to backgroun...
2015-04-30 David A. VelascoLogs on activities life cycle simplified
2015-04-30 David A. VelascoPrevent that PIN code is requested when system windows...
2015-04-29 David A. VelascoRefactored location of passcode check: a callback to...
2015-04-28 David A. VelascoMerge branch 'develop' into pinEnhancement
2015-04-16 purigarciaMerge branch 'develop' into automationTest
2015-04-09 masensioMerge branch 'master' into develop
2015-04-09 David A. VelascoMerge pull request #939 from owncloud/hotfix_user_agent
2015-04-09 masensioUdpate imports in MainApp oc-android-1.7.1_oem
2015-04-09 masensioHotfix user_agent
2015-04-08 purigarciaMerge branch 'develop' into automationTest
2015-04-07 masensioMerge remote-tracking branch 'origin/develop' into...
2015-04-07 masensioMerge branch 'release-1.7.1' oc-android-1.7.1_signed
2015-03-31 David A. VelascoOnce again, disable session based client
2015-03-26 masensioEnable session support ( in MainApp )
2015-03-25 purigarciaMerge branch 'develop' into automationTest
2015-03-25 David A. VelascoMerge pull request #924 from owncloud/add_user_agent_su...
2015-03-25 masensioChanges from comments in PR#924
2015-03-24 masensioUpdate uger agent string
2015-03-24 masensioRefactor parameter user_agent out of RemoteOperation...
2015-03-24 masensioModify User Agent string
2015-03-18 masensioAdd user-agent string to setup options
2015-03-18 masensioMerge branch 'develop' into add_user_agent_support
2015-03-16 masensioMerge branch 'develop' into create_folder_during_upload...
2015-03-13 masensioAdd user agent in android project
2015-03-10 masensioMerge branch 'develop' into accessibility
2015-03-09 David A. VelascoMerge branch 'develop' into update_propfind_for_server_8.1
2015-03-06 masensioMerge branch 'develop' into share_password_support
2015-03-06 David A. VelascoMerge pull request #912 from owncloud/review_license
2015-03-05 masensioUpdate year in license
2015-03-05 masensioAdd author's line in license
2015-02-24 masensioMerge remote-tracking branch 'origin/cancel_transfer_fo...
2015-02-24 masensioMerge branch 'develop' into cancel_transfer_for_deleted...
2015-02-24 masensioMerge pull request #888 from owncloud/enable_cookies
2015-02-19 masensioMerge branch 'develop' into enable_cookies
next