Merge remote-tracking branch 'remotes/upstream/master' into beta
[pub/Android/ownCloud.git] / .gitignore
2015-11-29 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/master...
2015-11-29 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/resizeCa...
2015-11-28 Andy ScherzingerMerge branch 'target_marshmallow' of https://github...
2015-11-28 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/master...
2015-11-27 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/external...
2015-11-27 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/bug_1300...
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-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-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 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 tobiasKaminskyupdated APK
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-26 tobiasKaminskyUpdated readme, changelod
2015-09-01 masensioMerge branch 'develop' into uploadWhenCharging
2015-07-22 tobiasKaminskyMerge remote-tracking branch 'upstream/develop' into...
2015-02-03 David A. VelascoMerge branch 'master' into release-1.7.0
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-03 David A. VelascoMerge branch 'master' into develop
2014-12-03 SamMerged with owncloud develop
2014-12-02 jabarrosMerge pull request #662 from tobiasKaminsky/fileCount
2014-11-29 tobiasKaminskyMerge remote-tracking branch 'upstream/develop' into...
2014-11-28 jabarrosMerge pull request #661 from owncloudChalmers/gradleWit...
2014-11-25 Jorge Antonio Diaz... Merge remote-tracking branch 'origin/gradleWithInternal...
2014-11-25 Jorge Antonio Diaz... Restore .gitignore and SETUP.md, remove files that...
2014-11-24 Jorge Antonio Diaz... Merge branch 'gradleWithInternalDependency' into us4_vi...
2014-11-24 Jorge Antonio Diaz... Update .gitignore and re-add missing files
2014-11-21 Jorge Antonio Diaz... Merge remote-tracking branch 'upstream/develop' into...
2014-11-17 Jorge Antonio Diaz... Merge remote-tracking branch 'upstream/develop' into...
2014-11-11 Magnus Sjoqvistmerge
2014-10-28 Jorge Antonio Diaz... Merge branch 'us4_view_text_files' of github.com:ownclo...
2014-10-28 Jorge Antonio Diaz... Minor updates
2014-10-28 MMMarcyCommit for the PR
2014-10-24 tobiasKaminskyMerge remote-tracking branch 'upstream/develop' into
2014-10-24 tobiasKaminskyMerge remote-tracking branch 'upstream/develop' into...
2014-10-22 tobiasKaminskyMerge remote-tracking branch 'upstream/develop' into...
2014-10-17 MMMarcyMerge remote-tracking branch 'theirs/develop' into...
2014-10-17 MMMarcyCommit for the PR
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. VelascoAllow the upload of project.properties and ant.properti...
2013-10-23 David A. VelascoMerge branch 'develop' into refresh_folder_contents_whe...
2013-10-22 David A. VelascoMerge pull request #284 from owncloud/setup_app_name
next