Merge branch 'zmatsuo-detailThumbnail' into develop
[pub/Android/ownCloud.git] / src / com / owncloud / android / ui / activity / ConflictsResolveActivity.java
2015-10-15 masensioMerge branch 'detailThumbnail' of git://github.com...
2015-10-01 masensioMerge pull request #839 from fluffy88/develop
2015-09-02 masensioMerge branch 'text_file_preview_pr_707_with_develop...
2015-09-02 masensioMerge remote-tracking branch 'origin/master' into text_...
2015-09-01 David A. VelascoMerge branch 'master' into copy
2015-08-25 masensioMerge branch 'master' into create_folder_button_on_acti...
2015-08-21 gstraubeMerge remote-tracking branch 'upstream/develop' into...
2015-08-21 tobiasKaminskyMerge branch 'develop' of github.com:owncloud/android...
2015-08-21 purigarciaMerge branch 'develop' into ignoreHiddenFiles
2015-08-20 masensioMerge pull request #1076 from owncloud/material_toolbar
2015-08-17 Andy ScherzingerMerge branch 'master' of https://github.com/owncloud...
2015-08-10 Andy ScherzingerMerge branch 'master' of https://github.com/owncloud...
2015-08-07 David A. VelascoMerge branch 'develop'
2015-08-06 Andy ScherzingerMerge branch 'develop' of https://github.com/owncloud...
2015-08-05 masensioMerge commit 'refs/pr/707' into text_file_preview_pr_70...
2015-08-05 masensioMerge pull request #1068 from owncloud/conflictDialog_n...
2015-08-04 Andy ScherzingerMerge branch 'develop' of https://github.com/owncloud...
2015-08-04 tobiasKaminskydownload file if "use server version"
2015-08-04 Andy ScherzingerMerge branch 'develop' of https://github.com/owncloud...
2015-08-03 Andy ScherzingerMerge branch 'develop' of https://github.com/owncloud...
2015-07-26 AndyScherzingerMerge branch 'develop' of https://github.com/owncloud...
2015-07-25 AndyScherzingerinitial material design changes for the action bar
2015-07-06 masensioMerge branch 'release-1.7.2'
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-27 masensioMerge branch 'develop' into remove_ActionBarSherlock
2015-05-21 tobiasKaminskyMerge remote-tracking branch 'upstream/develop' into...
2015-05-21 masensioMerge branch 'develop' into navigation_drawer
2015-05-18 masensioMerge branch 'develop' into navigation_drawer
2015-05-18 masensioRemove actionbarsherlock , replace it with Android...
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-04-08 masensioMerge branch 'develop' into videoInstandUploads
2014-03-13 Thomas MüllerMerge branch 'develop' into introduce-travis-ci
2014-02-14 masensioMerge pull request #311 from tobiasKaminsky/develop
2014-02-14 masensioMerge branch 'pr/311' into pull_request_311_with_develop
2014-02-13 David A. VelascoMerge pull request #367 from LukeOwncloud/renamed_oc_fr...
2014-02-07 masensioMerge pull request #390 from owncloud/share_link__new_share
2014-02-07 masensioMerge remote-tracking branch 'origin/develop' into...
2014-02-06 David A. VelascoMerge branch 'develop' into share_link__new_share
2014-02-06 David A. VelascoMerge branch 'share_link__new_share' into setup_additions
2014-02-05 masensioMerge branch 'share_link__new_share' into share_link__u...
2014-02-05 masensioMerge branch 'develop' into share_link__new_share
2014-02-04 David A. VelascoMerge branch 'develop' into share_link__new_share
2014-02-04 David A. VelascoConnected selection of app to send share link with...
2014-01-16 David A. VelascoMerge pull request #330 from LukeOwncloud/update_jackrabbit
2013-12-16 masensioMerge branch 'develop' into refactor_remote_operation_t...
2013-12-16 masensioMerge branch 'develop' into refactor_remote_operation_t...
2013-12-13 David A. VelascoMerge branch 'develop' into refactor_remote_operation_t...
2013-12-12 David A. VelascoAdded seasonal icon for winter holidays
2013-12-12 David A. VelascoMerge branch 'master' into develop
2013-12-11 David A. VelascoMerge remote-tracking branch 'origin/release-1.5.2...
2013-12-10 masensioMerge pull request #324 from owncloud/last_minute_relea...
2013-12-10 David A. VelascoAdded seasonal icon for winter holidays
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-06 David A. VelascoMerge branch 'develop' into setup_buttons
2013-10-29 masensioUpdate packageName
2013-10-28 David A. VelascoMerge branch 'develop' into clean_up
2013-10-24 masensioUpdate package name
2013-10-24 masensioMerge pull request #269 from owncloud/refresh_folder_co...
2013-10-24 David A. VelascoMerge branch 'develop' into refresh_folder_contents_whe...
2013-10-23 David A. VelascoMerge branch 'develop' into refresh_folder_contents_whe...
2013-10-22 David A. VelascoMerge branch 'develop' into refresh_folder_contents_whe...
2013-10-18 David A. VelascoMerge branch 'develop' into refresh_folder_contents_whe...
2013-10-14 David A. VelascoMerge remote-tracking branch 'origin/refresh_folder_con...
2013-10-14 David A. VelascoRemoved interface DataStorageManager
next