Merge branch 'develop' into better_loggin_system
authorjabarros <jabarros@solidgear.es>
Wed, 17 Sep 2014 07:47:34 +0000 (09:47 +0200)
committerjabarros <jabarros@solidgear.es>
Wed, 17 Sep 2014 07:47:34 +0000 (09:47 +0200)
commit2ef886af316609c2e4a1fe5f2ee32345a8008e33
tree9ff87663d270e59bf4808c4a919dfa8011f65350
parent208d44d61632c3796aeab3c6e37c58c39c643bb1
parentc20c9100e56177531a1b962784421085f7c206bf
Merge branch 'develop' into better_loggin_system
17 files changed:
res/values/strings.xml
src/com/owncloud/android/authentication/AuthenticatorActivity.java
src/com/owncloud/android/authentication/SsoWebViewClient.java
src/com/owncloud/android/datamodel/FileDataStorageManager.java
src/com/owncloud/android/files/FileOperationsHelper.java
src/com/owncloud/android/files/services/FileUploader.java
src/com/owncloud/android/services/OperationsService.java
src/com/owncloud/android/ui/activity/FileActivity.java
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
src/com/owncloud/android/ui/activity/MoveActivity.java
src/com/owncloud/android/ui/activity/Preferences.java
src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
src/com/owncloud/android/ui/fragment/FileDetailFragment.java
src/com/owncloud/android/ui/fragment/LocalFileListFragment.java
src/com/owncloud/android/ui/fragment/OCFileListFragment.java
src/com/owncloud/android/ui/preview/PreviewImageFragment.java
src/com/owncloud/android/ui/preview/PreviewMediaFragment.java