Merge pull request #1048 from owncloud/shareWithYou_icon_in_fileList
[pub/Android/ownCloud.git] / src / com / owncloud / android / ui / activity / Preferences.java
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-06-04 masensioFix issue #1000
2015-06-01 David A. VelascoFixed title and up button in Settings activity
2015-05-27 tobiasKaminskyMerge branch 'navigationDrawer_update' of github.com...
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-26 masensioMove 'Logs' from Settings to Navigation Drawer
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-05-08 David A. VelascoMerge pull request #973 from owncloud/delete_share_opti...
2015-05-06 purigarciaMerge branch 'develop' into automationTest
2015-05-06 masensioMerge branch 'develop' into thumbnailOOM
2015-05-06 masensioMerge pull request #970 from owncloud/pinEnhancement
2015-05-05 masensioMerge branch 'develop' into pinEnhancement
2015-05-05 David A. VelascoMerge branch 'develop' into pinEnhancement
2015-05-05 masensioMerge branch 'develop' into thumbnailOOM
2015-05-04 David A. VelascoCleaned code in PassCodeActivity
2015-05-04 David A. VelascoReplaced 'PIN code' by 'pass code'
2015-05-04 purigarciaMerge branch 'develop' into automationTest
2015-04-30 David A. VelascoPrevent that PIN code is requested when system windows...
2015-04-29 David A. VelascoRefactored location of passcode check: a callback to...
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 branch 'develop' into loging_different_servers_sa...
2015-04-20 masensioMerge pull request #956 from owncloud/fix_app_closes_ne...
2015-04-17 David A. VelascoFixed now - FileDisplayActivity is not recreated anymor...
2015-04-08 purigarciaMerge branch 'develop' into automationTest
2015-04-07 masensioMerge remote-tracking branch 'origin/develop' into...
2015-04-07 masensioMerge branch 'release-1.7.1' oc-android-1.7.1_signed
2015-03-30 David A. VelascoFixed crashes in Android 2.x due to accesibility code
2015-03-25 purigarciaMerge branch 'develop' into automationTest
2015-03-25 David A. VelascoMerge pull request #924 from owncloud/add_user_agent_su...
2015-03-20 masensioMerge branch 'develop' into create_folder_during_upload...
2015-03-19 David A. VelascoMerge pull request #914 from owncloud/accessibility
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
2015-02-25 David A. VelascoMerge pull request #886 from owncloud/cancel_transfer_f...
2015-02-25 masensioMerge branch 'develop' into cancel_transfer_for_deleted...
2015-02-24 masensioMerge branch 'develop' into cancel_transfer_for_deleted...
2015-02-19 masensioChanges from Comments in PR#886
2015-02-19 masensioMerge branch 'develop' into cancel_transfer_for_deleted...
2015-02-18 masensioCancel downloads for deleted users
2015-02-18 masensioMerge branch 'develop' into cancel_transfer_for_deleted...
2015-02-16 masensioCancel the current upload when it hasn't started yet
2015-02-16 masensioMerge branch 'develop' into cancel_transfer_for_deleted...
2015-02-13 masensioMerge branch 'develop' into cancel_transfer_for_deleted...
2015-02-04 masensioCancel the transfers of an account when the account...
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-23 jabarrosMerge pull request #825 from owncloud/SettingsGreyedOut
2015-01-22 jabarros'Fixed. 'Upload pictures via WIFI only' is hidden when...
2015-01-20 jabarrosMerge branch 'develop' into SettingsGreyedOut
2015-01-19 David A. VelascoMerge pull request #798 from LukeOwncloud/develop
2015-01-18 tobiasKaminskyMerge branch 'develop2' into imageGrid2
2015-01-13 jabarrosAdd context description tag to action bar title
2015-01-08 tobiasKaminskyMerge remote-tracking branch 'upstream/develop' into...
2015-01-08 jabarrosMerge branch 'download_folder' into download_folder__fi...
2015-01-07 jabarrosMerge branch 'develop' into download_folder
2015-01-05 tobiasKaminskyupdate
2014-12-30 tobiasKaminskyfix double pin entry on start
2014-12-29 tobiasKaminsky- fix #47
2014-12-26 jabarrosMerge branch 'develop' into obeySortOrder_fixmerge
2014-12-26 jabarrosMerge pull request #755 from owncloud/OpenWithInContextMenu
2014-12-26 jabarrosMerge pull request #784 from ekeitho/develop
2014-12-19 David A. VelascoMerge pull request #718 from owncloudChalmers/multi2
2014-12-19 jabarrosMerge branch 'develop' into thumbnailForUpload
2014-12-15 David A. VelascoMerge pull request #801 from owncloud/community_image...
2014-12-12 jabarrosMerge pull request #766 from owncloud/feedbackWithVersi...
2014-12-11 jabarrosMerge branch 'develop' into community_image-preview...
2014-12-11 David A. VelascoMerge pull request #781 from owncloud/fix_logs_change_o...
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 David A. VelascoMerge branch 'master' into develop
2014-12-03 jabarrosMerge branch 'release-1.6.2' oc-android-1.6.2
2014-11-27 tobiasKaminskyEmail from feedback contains version number
2014-11-26 David A. VelascoMerge pull request #752 from owncloud/instant_uploads_s...
2014-11-26 jabarrosRefactor after CR
2014-11-25 tobiasKaminsky- Account list is now a radiobutton list
2014-11-21 tobiasKaminskyMerge remote-tracking branch 'upstream/develop' into...
2014-11-21 tobiasKaminskyMerge remote-tracking branch 'upstream/develop' into...
2014-11-20 jabarrosRemove last slash from uploads path (video/image) when...
next