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

author	David A. Velasco <dvelasco@solidgear.es>
	Thu, 20 Aug 2015 08:44:19 +0000 (10:44 +0200)
committer	David A. Velasco <dvelasco@solidgear.es>
	Fri, 25 Sep 2015 13:13:46 +0000 (15:13 +0200)
commit	e6c1454458419ff0c47c64fac3d11ebc158cccc8
tree	018da21ebb3bbf5b1408fc16a254da249a2563fb	tree \| snapshot (tar.gz tar.bz2 zip)
parent	5f41bb14d370e0c9c0a8003e4ed122f466b0ce71	commit \| diff

Persist conflicts in local database and show with an icon in the list of files

ownCloud Android App

res/drawable/conflict_file_indicator.png	[new file with mode: 0644]	blob
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/ProviderMeta.java		diff \| blob \| blame \| history
src/com/owncloud/android/operations/RefreshFolderOperation.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/providers/FileContentProvider.java		diff \| blob \| blame \| history
src/com/owncloud/android/ui/adapter/FileListListAdapter.java		diff \| blob \| blame \| history