Merge branch 'develop' of https://github.com/owncloud/android into material_toolbar
[pub/Android/ownCloud.git] / .gitmodules
2015-05-21 tobiasKaminskyMerge remote-tracking branch 'upstream/develop' into...
2015-04-28 David A. VelascoMerge branch 'develop' into pinEnhancement
2015-03-10 masensioMerge branch 'develop' into accessibility
2015-02-03 David A. VelascoMerge branch 'master' into release-1.7.0
2015-02-02 David A. VelascoMerge branch 'develop' into imageGrid
2015-01-30 masensioMerge commit 'refs/pr/701' into create_folder_during_up...
2015-01-28 masensioMerge branch 'develop' into delete_local_files
2015-01-28 masensioMerge pull request #866 from owncloud/download_folder
2015-01-27 Carla Schroderadd submodule to user manual
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 #768 from owncloudChalmers/owncloud_...
2014-11-28 Jorge Antonio Diaz... Change submodule from owncloudChalmers/android-library...
2014-11-28 jabarrosMerge pull request #661 from owncloudChalmers/gradleWit...
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-11-01 Jorge Antonio Diaz... Update submodule
2014-10-28 MMMarcyReadded git link that was erraneously removed by the...
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 MMMarcyReadded git link that was erraneously removed by the...
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
2014-04-03 masensioMerge pull request #392 from pmarasse/pullup
2014-03-31 masensioMerge commit 'refs/pr/392' into improve_action_bar_pr_3...
2014-03-18 masensioMerge pull request #395 from dontcallmedom/master
2014-03-13 Thomas MüllerMerge branch 'develop' into introduce-travis-ci
2014-03-13 masensioMerge branch 'pr/395' into allow_multiline_checkbox_pre...
2014-02-24 masensioMerge branch 'develop' into remove_folder_size_info
2014-02-24 masensioMerge branch 'develop' into send_file_pr311_with_develop
2014-02-24 masensioMerge branch 'master' into develop
2014-02-20 David A. VelascoUpdated .gitmodules for easier access to ownCloud libra... oc-android-1.5.4
2014-02-14 masensioMerge pull request #311 from tobiasKaminsky/develop
2014-02-14 masensioMerge branch 'pr/311' into pull_request_311_with_develop
2014-01-29 David A. VelascoMerge pull request #354 from LukeOwncloud/added_more_gi...
2014-01-28 David A. VelascoMerge branch 'share_link_show_shared_files' into share_...
2014-01-27 masensioMerge branch 'develop' into share_link_show_shared_files
2014-01-27 masensioMerge pull request #360 from owncloud/oc_framework_clea...
2014-01-22 David A. VelascoMerge branch 'release-1.5.3' into oc_framework_cleanup_...
2014-01-21 David A. VelascoOc_framework, now owncloud-android-library, included...
2012-10-23 Bartek Przybylskirevert of 5ffdcdd25ebc2d08dc48b0d62ff906fbf16fdc59
2012-10-23 Bartek Przybylskiinclude actionbarsherlock as a part of owncloud application
2012-02-05 Lennart RosamAdded submodule: actionbarsherlock