Merge remote-tracking branch 'remotes/upstream/cancelUploadOnWlanExit' into beta
[pub/Android/ownCloud.git] / src / com / owncloud / android / files / InstantUploadBroadcastReceiver.java
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-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 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-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-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 tobiasKaminskysplit "on charging" to photo and video
2015-10-18 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/master...
2015-10-07 tobiasKaminskywip
2015-10-07 tobiasKaminskyMerge branch 'master' of github.com:owncloud/android...
2015-10-07 tobiasKaminskyon wifi change: cancel all pending uploads, check prior...
2015-09-25 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/master...
2015-09-25 tobiasKaminskyfixed bug: behaviour is now obeyed for files that are...
2015-09-21 tobiasKaminskyjava 1.5 does not support switch with strings :/
2015-09-19 tobiasKaminsky#819, part 2: Instant uploads, depends on setting
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-05-21 tobiasKaminskyMerge remote-tracking branch 'upstream/develop' into...
2015-05-05 masensioMerge branch 'develop' into thumbnailOOM
2015-05-04 purigarciaMerge branch 'develop' into automationTest
2015-04-28 David A. VelascoMerge branch 'develop' into pinEnhancement
2015-04-22 David A. VelascoMerge pull request #957 from owncloud/fix_crash_invalid...
2015-04-22 David A. VelascoMerge pull request #951 from owncloud/loging_different_...
2015-04-22 David A. VelascoMerge branch 'develop' into loging_different_servers_sa...
2015-04-15 masensioMerge pull request #946 from owncloud/upgrading_account...
2015-04-15 David A. VelascoMerge branch 'develop' into upgrading_account_manager
2015-04-14 David A. VelascoRemoved 'support' for WebDAV entry point before OC...
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-01-18 tobiasKaminskyMerge branch 'develop2' into imageGrid2
2015-01-08 tobiasKaminskyMerge remote-tracking branch 'upstream/develop' into...
2014-12-26 jabarrosMerge branch 'develop' into obeySortOrder_fixmerge
2014-12-26 jabarrosMerge pull request #755 from owncloud/OpenWithInContextMenu
2014-12-19 jabarrosMerge branch 'develop' into thumbnailForUpload
2014-12-12 jabarrosMerge pull request #766 from owncloud/feedbackWithVersi...
2014-12-11 jabarrosMerge branch 'develop' into community_image-preview...
2014-12-11 jabarrosMerge branch 'develop' into community_rotateImage
2014-12-10 jabarrosMerge branch 'fix_protocol_send_mail' into fix_logs_cha...
2014-12-10 jabarrosMerge pull request #754 from owncloud/RadioListOnAccounts
2014-12-09 David A. VelascoMerge remote-tracking branch 'rhabbachi/feature/308_syn...
2014-12-05 SamMerge branch 'develop' of https://github.com/owncloud...
2014-12-03 Jorge Antonio Diaz... Merge remote-tracking branch 'upstream/develop' into...
2014-12-03 David A. VelascoMerge branch 'master' into develop
2014-12-03 jabarrosMerge branch 'release-1.6.2' oc-android-1.6.2
2014-11-26 David A. VelascoMerge pull request #752 from owncloud/instant_uploads_s...
2014-11-22 tobiasKaminsky- bugfix
2014-11-22 tobiasKaminsky-same for videos
2014-11-22 tobiasKaminsky- Instant upload only when charging
2014-11-19 jabarrosMerge branch 'develop' into instant_uploads_set_path
2014-11-19 jabarrosAdd new preference on settings for setting the upload...
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...
next