Merge remote-tracking branch 'remotes/upstream/avoidDuplicateFiles' into beta
[pub/Android/ownCloud.git] / src / com / owncloud / android / media / MediaService.java
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-18 Tobias KaminskyMerge pull request #1290 from przybylski/bug_1288
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-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_buttons' of https://github.com...
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-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 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-01 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/video_th...
2015-11-01 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/streamin...
2015-11-01 tobiasKaminskytidy up once more
2015-11-01 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/master...
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-27 Andy ScherzingerMove to NotificationCompat.Builder to create/replace...
2015-10-25 tobiasKaminskywip
2015-10-25 tobiasKaminskyMerge branch 'master' of github.com:owncloud/android...
2015-10-25 tobiasKaminskywip
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-05-21 tobiasKaminskyMerge remote-tracking branch 'upstream/develop' into...
2015-04-28 David A. VelascoMerge branch 'develop' into pinEnhancement
2015-04-07 masensioMerge branch 'release-1.7.1' oc-android-1.7.1_signed
2015-03-16 masensioMerge branch 'develop' into create_folder_during_upload...
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
2014-11-05 tobiasKaminskyMerge remote-tracking branch 'upstream/develop' into...
2014-10-29 grecepMerge pull request #669 from grecep/master
2014-10-24 tobiasKaminskyMerge remote-tracking branch 'upstream/develop' into
2014-10-24 tobiasKaminskyMerge remote-tracking branch 'upstream/develop' into...
2014-10-24 jabarrosMerge branch 'thumbnails_from_server' of https://github...
2014-10-23 jabarrosMerge branch 'sortingFiles' of https://github.com/tobia...
2014-10-22 tobiasKaminskyMerge remote-tracking branch 'upstream/develop' into...
2014-10-17 MMMarcyMerge remote-tracking branch 'theirs/develop' into...
2014-10-17 Magnus SjoqvistMerge with develop
2014-10-15 jabarrosMerge branch 'idn_hosts' of https://github.com/ogasser...
2014-10-09 jabarrosMerge branch 'sortingFiles' of https://github.com/tobia...
2014-10-06 jabarrosMerge branch 'master' of https://github.com/loripino21...
2014-10-01 Javier GonzalezMerge pull request #641 from owncloud/thumbnails_for_do...
2014-09-18 David A. VelascoMerge branch 'develop' into release-1.6.0
2014-09-18 David A. VelascoMerge pull request #627 from owncloud/better_loggin_system
2014-09-18 David A. VelascoFixed conflict - Merge branch 'develop' into better_log...
2014-09-17 jabarrosMerge branch 'develop' into better_loggin_system
2014-09-11 jabarrosMove Logger class to owncloud library and update refere...
2014-05-20 David A. VelascoMerge pull request #500 from owncloud/refactor_update_f...
2014-05-20 masensioMerge branch 'develop' into refactor_update_filelist_fr...
2014-05-19 masensioMerge pull request #495 from owncloud/fixed_loading_dia...
2014-05-19 David A. VelascoReview of calls to super. in Activity/Fragment life...
2014-04-08 masensioMerge branch 'develop' into videoInstandUploads
2013-12-04 David A. VelascoMerge branch 'master' into develop
2013-11-19 David A. VelascoMerge pull request #304 from owncloud/refactor_remote_o...
2013-11-18 David A. VelascoMerge branch 'develop' into refactor_remote_operation_t...
2013-11-13 masensioMerge remote-tracking branch 'origin/refactor_remote_op...
2013-11-13 David A. VelascoMoved some classes from root package to .utils
2013-11-12 David A. VelascoMerge branch 'develop' into refactor_remote_operation_t...
2013-11-06 David A. VelascoMerge pull request #294 from owncloud/setup_buttons
2013-11-06 David A. VelascoMerge branch 'develop' into setup_buttons
2013-11-06 David A. VelascoMerge branch 'develop' into setup_buttons
2013-10-29 masensioMerge branch 'develop' into setup_buttons
2013-10-29 masensioUpdate packageName
2013-10-24 masensioUpdate package name
2013-06-19 David A. VelascoMerge branch 'develop'after SPRINT-002
2013-06-19 David A. VelascoMerge pull request #186 from owncloud/fixed_contradicte...
2013-06-19 David A. VelascoMerge branch 'fixed_contradicted_messages_in_login_view...
2013-06-17 masensioMerge remote-tracking branch 'origin/develop' into...
2013-06-17 David A. VelascoMerge pull request #178 from owncloud/login_smart_clip_...
2013-06-12 masensioMerge pull request #180 from owncloud/direct_download_w...
2013-06-12 David A. VelascoMerge branch 'develop' into direct_download_with_click_...
next