Merge tag 'oc-android-1-3-22' into oauth_login
authorDavid A. Velasco <dvelasco@solidgear.es>
Mon, 18 Mar 2013 13:28:49 +0000 (14:28 +0100)
committerDavid A. Velasco <dvelasco@solidgear.es>
Mon, 18 Mar 2013 13:28:49 +0000 (14:28 +0100)
commit5665d9c306165c144fc60b9749ac184cb32369c0
treead911264484303d0b72580fa63b3d695ac353a08
parent7d84fd0c9f15227bc65a2ae00a74e1cfd8f8d33b
parentd92ccf8bd0e49dc32cbc9a948b645d97b2d25cfd
Merge tag 'oc-android-1-3-22' into oauth_login

Conflicts:
AndroidManifest.xml
src/com/owncloud/android/authenticator/AuthenticationRunnable.java
src/com/owncloud/android/authenticator/OnAuthenticationResultListener.java
src/com/owncloud/android/authenticator/OnConnectCheckListener.java
src/com/owncloud/android/files/services/FileOperation.java
src/com/owncloud/android/files/services/InstantUploadService.java
src/com/owncloud/android/ui/activity/AuthenticatorActivity.java
25 files changed:
AndroidManifest.xml
res/layout-land/account_setup.xml
res/layout/account_setup.xml
res/values/strings.xml
res/values/styles.xml
src/com/owncloud/android/AccountUtils.java
src/com/owncloud/android/Uploader.java
src/com/owncloud/android/authenticator/AccountAuthenticator.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/network/OwnCloudClientUtils.java
src/com/owncloud/android/operations/OwnCloudServerCheckOperation.java
src/com/owncloud/android/operations/RemoteOperation.java
src/com/owncloud/android/operations/RemoteOperationResult.java
src/com/owncloud/android/operations/RenameFileOperation.java
src/com/owncloud/android/syncadapter/AbstractOwnCloudSyncAdapter.java
src/com/owncloud/android/syncadapter/FileSyncAdapter.java
src/com/owncloud/android/ui/activity/AccountSelectActivity.java
src/com/owncloud/android/ui/activity/AuthenticatorActivity.java
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
src/com/owncloud/android/ui/activity/LandingActivity.java
src/com/owncloud/android/ui/fragment/FileDetailFragment.java
src/com/owncloud/android/ui/fragment/OCFileListFragment.java
src/eu/alefzero/webdav/WebdavClient.java