Peters Git server - pub/Android/ownCloud.git/commit

Merge branch 'develop' into oauth_login

Conflicts:
AndroidManifest.xml
res/values/strings.xml
src/com/owncloud/android/Uploader.java
src/com/owncloud/android/authentication/AccountAuthenticator.java
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/InstantUploadBroadcastReceiver.java
src/com/owncloud/android/files/services/FileDownloader.java
src/com/owncloud/android/files/services/FileOperation.java
src/com/owncloud/android/files/services/FileUploader.java
src/com/owncloud/android/network/OwnCloudClientUtils.java
src/com/owncloud/android/operations/RemoteOperationResult.java
src/com/owncloud/android/operations/UpdateOCVersionOperation.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/fragment/FileDetailFragment.java
src/eu/alefzero/webdav/WebdavClient.java

author	David A. Velasco <dvelasco@solidgear.es>
	Thu, 25 Apr 2013 17:39:22 +0000 (19:39 +0200)
committer	David A. Velasco <dvelasco@solidgear.es>
	Thu, 25 Apr 2013 17:39:22 +0000 (19:39 +0200)
commit	2946d8dd69cf8d30a3fc2447ac931675989e8eff
tree	15334d6c745800fdce4f93476d63c5f4ef4c95c4	tree \| snapshot (tar.gz tar.bz2 zip)
parent	2e5b40e357a5ab18b3a04f823b7cd27d5c94dc90	commit \| diff
parent	6ef46f264e40e1e39e9a02936beb7df306779fac	commit \| diff

AndroidManifest.xml	diff1 \|	diff2 \|	blob \| history
res/layout-land/account_setup.xml	diff1 \|	diff2 \|	blob \| history
res/layout/account_setup.xml	diff1 \|	diff2 \|	blob \| history
res/values/strings.xml	diff1 \|	diff2 \|	blob \| history
res/values/styles.xml	diff1 \|	diff2 \|	blob \| history
src/com/owncloud/android/AccountUtils.java	diff1 \|	diff2 \|	blob \| history
src/com/owncloud/android/DisplayUtils.java	diff1 \|	diff2 \|	blob \| history
src/com/owncloud/android/Uploader.java	diff1 \|	diff2 \|	blob \| history
src/com/owncloud/android/authentication/AccountAuthenticator.java	diff1 \|	\|	blob \| history
src/com/owncloud/android/authentication/AccountAuthenticatorService.java	diff1 \|	\|	blob \| history
src/com/owncloud/android/authentication/AuthenticatorActivity.java	diff1 \|	\|	blob \| history
src/com/owncloud/android/authentication/OAuth2Constants.java	diff1 \|	\|	blob \| history
src/com/owncloud/android/datamodel/FileDataStorageManager.java	diff1 \|	diff2 \|	blob \| history
src/com/owncloud/android/db/DbHandler.java	diff1 \|	diff2 \|	blob \| history
src/com/owncloud/android/extensions/ExtensionsAvailableDialog.java	diff1 \|	diff2 \|	blob \| history
src/com/owncloud/android/extensions/ExtensionsListActivity.java	diff1 \|	diff2 \|	blob \| history
src/com/owncloud/android/files/BootupBroadcastReceiver.java	diff1 \|	diff2 \|	blob \| history
src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java	diff1 \|	diff2 \|	blob \| history
src/com/owncloud/android/files/OwnCloudFileObserver.java	diff1 \|	diff2 \|	blob \| history
src/com/owncloud/android/files/services/FileDownloader.java	diff1 \|	diff2 \|	blob \| history
src/com/owncloud/android/files/services/FileObserverService.java	diff1 \|	diff2 \|	blob \| history
src/com/owncloud/android/files/services/FileUploader.java	diff1 \|	diff2 \|	blob \| history
src/com/owncloud/android/location/LocationServiceLauncherReciever.java	diff1 \|	diff2 \|	blob \| history
src/com/owncloud/android/location/LocationUpdateService.java	diff1 \|	diff2 \|	blob \| history
src/com/owncloud/android/network/AdvancedSslSocketFactory.java	diff1 \|	diff2 \|	blob \| history
src/com/owncloud/android/network/AdvancedX509TrustManager.java	diff1 \|	diff2 \|	blob \| history
src/com/owncloud/android/network/BearerAuthScheme.java	diff1 \|	\|	blob \| history
src/com/owncloud/android/network/BearerCredentials.java	diff1 \|	\|	blob \| history
src/com/owncloud/android/network/OwnCloudClientUtils.java	diff1 \|	diff2 \|	blob \| history
src/com/owncloud/android/operations/ChunkedUploadFileOperation.java	diff1 \|	diff2 \|	blob \| history
src/com/owncloud/android/operations/CreateFolderOperation.java	diff1 \|	\|	blob \| history
src/com/owncloud/android/operations/DownloadFileOperation.java	diff1 \|	diff2 \|	blob \| history
src/com/owncloud/android/operations/ExistenceCheckOperation.java	diff1 \|	\|	blob \| history
src/com/owncloud/android/operations/OAuth2GetAccessToken.java	diff1 \|	\|	blob \| history
src/com/owncloud/android/operations/OwnCloudServerCheckOperation.java	diff1 \|	\|	blob \| history
src/com/owncloud/android/operations/RemoteOperation.java	diff1 \|	diff2 \|	blob \| history
src/com/owncloud/android/operations/RemoteOperationResult.java	diff1 \|	diff2 \|	blob \| history
src/com/owncloud/android/operations/RemoveFileOperation.java	diff1 \|	diff2 \|	blob \| history
src/com/owncloud/android/operations/RenameFileOperation.java	diff1 \|	diff2 \|	blob \| history
src/com/owncloud/android/operations/SynchronizeFileOperation.java	diff1 \|	diff2 \|	blob \| history
src/com/owncloud/android/operations/SynchronizeFolderOperation.java	diff1 \|	diff2 \|	blob \| history
src/com/owncloud/android/operations/UpdateOCVersionOperation.java	diff1 \|	diff2 \|	blob \| history
src/com/owncloud/android/providers/FileContentProvider.java	diff1 \|	diff2 \|	blob \| history
src/com/owncloud/android/syncadapter/AbstractOwnCloudSyncAdapter.java	diff1 \|	diff2 \|	blob \| history
src/com/owncloud/android/syncadapter/ContactSyncAdapter.java	diff1 \|	diff2 \|	blob \| history
src/com/owncloud/android/syncadapter/FileSyncAdapter.java	diff1 \|	diff2 \|	blob \| history
src/com/owncloud/android/ui/activity/AccountSelectActivity.java	diff1 \|	diff2 \|	blob \| history
src/com/owncloud/android/ui/activity/ErrorsWhileCopyingHandlerActivity.java	diff1 \|	diff2 \|	blob \| history
src/com/owncloud/android/ui/activity/FailedUploadActivity.java	\|	diff2 \|	blob \| history
src/com/owncloud/android/ui/activity/FileDetailActivity.java	diff1 \|	diff2 \|	blob \| history
src/com/owncloud/android/ui/activity/FileDisplayActivity.java	diff1 \|	diff2 \|	blob \| history
src/com/owncloud/android/ui/activity/InstantUploadActivity.java	\|	diff2 \|	blob \| history
src/com/owncloud/android/ui/activity/LandingActivity.java	diff1 \|	diff2 \|	blob \| history
src/com/owncloud/android/ui/activity/UploadFilesActivity.java	diff1 \|	diff2 \|	blob \| history
src/com/owncloud/android/ui/dialog/SslValidatorDialog.java	diff1 \|	diff2 \|	blob \| history
src/com/owncloud/android/ui/fragment/ConfirmationDialogFragment.java	diff1 \|	diff2 \|	blob \| history
src/com/owncloud/android/ui/fragment/FileDetailFragment.java	diff1 \|	diff2 \|	blob \| history
src/com/owncloud/android/ui/fragment/LocalFileListFragment.java	diff1 \|	diff2 \|	blob \| history
src/com/owncloud/android/ui/fragment/OCFileListFragment.java	diff1 \|	diff2 \|	blob \| history
src/com/owncloud/android/ui/preview/FileDownloadFragment.java	\|	diff2 \|	blob \| history
src/com/owncloud/android/ui/preview/PreviewImageActivity.java	\|	diff2 \|	blob \| history
src/com/owncloud/android/ui/preview/PreviewImageFragment.java	\|	diff2 \|	blob \| history
src/com/owncloud/android/ui/preview/PreviewImagePagerAdapter.java	\|	diff2 \|	blob \| history
src/com/owncloud/android/ui/preview/PreviewMediaFragment.java	\|	diff2 \|	blob \| history
src/com/owncloud/android/ui/preview/PreviewVideoActivity.java	\|	diff2 \|	blob \| history
src/com/owncloud/android/utils/FileStorageUtils.java	diff1 \|	diff2 \|	blob \| history
src/eu/alefzero/webdav/WebdavClient.java	diff1 \|	diff2 \|	blob \| history
src/eu/alefzero/webdav/WebdavEntry.java	diff1 \|	diff2 \|	blob \| history