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

projects / pub / Android / ownCloud.git / commit

author	David A. Velasco <dvelasco@solidgear.es>
	Tue, 18 Dec 2012 10:20:03 +0000 (11:20 +0100)
committer	David A. Velasco <dvelasco@solidgear.es>
	Tue, 18 Dec 2012 10:20:03 +0000 (11:20 +0100)
commit	c38a3b2ef12a3f6b4b1f0dad611d31cbd0686793
tree	50617e3f0ec1326658ca0a3720f873f8013b5e62	tree \| snapshot (tar.gz tar.bz2 zip)
parent	5be4bf17e11bfae134f24bbc8501b618304467b4	commit \| diff

Merge master into oauth_login

55 files changed:

AndroidManifest.xml		diff \| blob \| blame \| history
res/layout-land/account_setup.xml		diff \| blob \| blame \| history
res/layout-v14/generic_explanation.xml	[new file with mode: 0644]	blob
res/layout/account_setup.xml		diff \| blob \| blame \| history
res/layout/edit_box_dialog.xml		diff \| blob \| blame \| history
res/layout/generic_explanation.xml	[new file with mode: 0644]	blob
res/menu/file_context_menu.xml	[new file with mode: 0644]	blob
res/values-de-rDE/strings.xml		diff \| blob \| blame \| history
res/values-de/strings.xml		diff \| blob \| blame \| history
res/values-es/strings.xml		diff \| blob \| blame \| history
res/values-large/bools.xml	[new file with mode: 0644]	blob
res/values/bools.xml	[new file with mode: 0644]	blob
res/values/strings.xml		diff \| blob \| blame \| history
res/values/urls.xml	[new file with mode: 0644]	blob
src/com/owncloud/android/Uploader.java		diff \| blob \| blame \| history
src/com/owncloud/android/authenticator/AuthenticationRunnable.java		diff \| blob \| blame \| history
src/com/owncloud/android/datamodel/DataStorageManager.java		diff \| blob \| blame \| history
src/com/owncloud/android/datamodel/FileDataStorageManager.java		diff \| blob \| blame \| history
src/com/owncloud/android/datamodel/OCFile.java		diff \| blob \| blame \| history
src/com/owncloud/android/db/DbHandler.java		diff \| blob \| blame \| history
src/com/owncloud/android/db/ProviderMeta.java		diff \| blob \| blame \| history
src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java		diff \| blob \| blame \| history
src/com/owncloud/android/files/OwnCloudFileObserver.java		diff \| blob \| blame \| history
src/com/owncloud/android/files/services/FileDownloader.java		diff \| blob \| blame \| history
src/com/owncloud/android/files/services/FileObserverService.java		diff \| blob \| blame \| history
src/com/owncloud/android/files/services/FileUploader.java		diff \| blob \| blame \| history
src/com/owncloud/android/location/LocationUpdateService.java		diff \| blob \| blame \| history
src/com/owncloud/android/operations/ChunkedUploadFileOperation.java		diff \| blob \| blame \| history
src/com/owncloud/android/operations/DownloadFileOperation.java		diff \| blob \| blame \| history
src/com/owncloud/android/operations/RemoteOperationResult.java		diff \| blob \| blame \| history
src/com/owncloud/android/operations/RemoveFileOperation.java		diff \| blob \| blame \| history
src/com/owncloud/android/operations/RenameFileOperation.java		diff \| blob \| blame \| history
src/com/owncloud/android/operations/SynchronizeFileOperation.java		diff \| blob \| blame \| history
src/com/owncloud/android/operations/SynchronizeFolderOperation.java		diff \| blob \| blame \| history
src/com/owncloud/android/operations/UpdateOCVersionOperation.java		diff \| blob \| blame \| history
src/com/owncloud/android/operations/UploadFileOperation.java		diff \| blob \| blame \| history
src/com/owncloud/android/providers/FileContentProvider.java		diff \| blob \| blame \| history
src/com/owncloud/android/syncadapter/FileSyncAdapter.java		diff \| blob \| blame \| history
src/com/owncloud/android/ui/activity/AccountSelectActivity.java		diff \| blob \| blame \| history
src/com/owncloud/android/ui/activity/AuthenticatorActivity.java		diff \| blob \| blame \| history
src/com/owncloud/android/ui/activity/ConflictsResolveActivity.java		diff \| blob \| blame \| history
src/com/owncloud/android/ui/activity/ErrorsWhileCopyingHandlerActivity.java	[new file with mode: 0644]	blob
src/com/owncloud/android/ui/activity/FileDetailActivity.java		diff \| blob \| blame \| history
src/com/owncloud/android/ui/activity/FileDisplayActivity.java		diff \| blob \| blame \| history
src/com/owncloud/android/ui/activity/GenericExplanationActivity.java	[new file with mode: 0644]	blob
src/com/owncloud/android/ui/activity/UploadFilesActivity.java		diff \| blob \| blame \| history
src/com/owncloud/android/ui/adapter/FileListListAdapter.java		diff \| blob \| blame \| history
src/com/owncloud/android/ui/dialog/ConflictsResolveDialog.java		diff \| blob \| blame \| history
src/com/owncloud/android/ui/dialog/EditNameDialog.java		diff \| blob \| blame \| history
src/com/owncloud/android/ui/dialog/IndeterminateProgressDialog.java	[new file with mode: 0644]	blob
src/com/owncloud/android/ui/fragment/ConfirmationDialogFragment.java		diff \| blob \| blame \| history
src/com/owncloud/android/ui/fragment/FileDetailFragment.java		diff \| blob \| blame \| history
src/com/owncloud/android/ui/fragment/OCFileListFragment.java		diff \| blob \| blame \| history
src/com/owncloud/android/utils/FileStorageUtils.java	[new file with mode: 0644]	blob
src/eu/alefzero/webdav/WebdavEntry.java		diff \| blob \| blame \| history

ownCloud Android App

RSS Atom