Merge branch 'develop' into refactor_remote_operation_to_create_folder
authorDavid A. Velasco <dvelasco@solidgear.es>
Tue, 12 Nov 2013 14:22:36 +0000 (15:22 +0100)
committerDavid A. Velasco <dvelasco@solidgear.es>
Tue, 12 Nov 2013 14:22:36 +0000 (15:22 +0100)
commit89b37b750836b661e33875cad8ac00c3027e958c
tree78f8b813006b010665663ef082acfd35bc74a5a1
parent0421d5353debd21f8e19187475bf9650d207bfce
parent9fe7d5ba84cfa45038815e6fdf838d50c718d6a6
Merge branch 'develop' into refactor_remote_operation_to_create_folder
33 files changed:
oc_framework/src/com/owncloud/android/oc_framework/network/AdvancedSslSocketFactory.java
oc_framework/src/com/owncloud/android/oc_framework/network/AdvancedX509TrustManager.java
oc_framework/src/com/owncloud/android/oc_framework/network/BearerAuthScheme.java
oc_framework/src/com/owncloud/android/oc_framework/network/webdav/ChunkFromFileChannelRequestEntity.java
oc_framework/src/com/owncloud/android/oc_framework/network/webdav/FileRequestEntity.java
oc_framework/src/com/owncloud/android/oc_framework/network/webdav/WebdavClient.java
oc_framework/src/com/owncloud/android/oc_framework/network/webdav/WebdavEntry.java
oc_framework/src/com/owncloud/android/oc_framework/operations/RemoteOperation.java
project.properties
src/com/owncloud/android/authentication/AccountAuthenticator.java
src/com/owncloud/android/authentication/AuthenticatorActivity.java
src/com/owncloud/android/files/OwnCloudFileObserver.java
src/com/owncloud/android/files/services/FileDownloader.java
src/com/owncloud/android/files/services/FileUploader.java
src/com/owncloud/android/operations/ChunkedUploadFileOperation.java
src/com/owncloud/android/operations/RenameFileOperation.java
src/com/owncloud/android/operations/SynchronizeFileOperation.java
src/com/owncloud/android/operations/UpdateOCVersionOperation.java
src/com/owncloud/android/operations/UploadFileOperation.java
src/com/owncloud/android/syncadapter/AbstractOwnCloudSyncAdapter.java
src/com/owncloud/android/syncadapter/ContactSyncAdapter.java
src/com/owncloud/android/syncadapter/FileSyncAdapter.java
src/com/owncloud/android/ui/activity/AccountSelectActivity.java
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
src/com/owncloud/android/ui/dialog/SslValidatorDialog.java
src/com/owncloud/android/ui/fragment/FileDetailFragment.java
src/com/owncloud/android/ui/fragment/OCFileListFragment.java
src/com/owncloud/android/ui/preview/FileDownloadFragment.java
src/com/owncloud/android/ui/preview/PreviewImageFragment.java
src/com/owncloud/android/ui/preview/PreviewMediaFragment.java
src/com/owncloud/android/ui/preview/PreviewVideoActivity.java
src/com/owncloud/android/utils/FileStorageUtils.java
tests/.classpath