mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-27 09:39:25 +03:00
Code Issues Projects Releases Packages Wiki Activity
nextcloud-android/res
History
David A. Velasco 2b5785556e Merge branch 'master' into oauth_login 
Conflicts:
	AndroidManifest.xml
	res/values-de-rDE/strings.xml
	res/values-de/strings.xml
	res/values/strings.xml
	src/com/owncloud/android/Uploader.java
	src/com/owncloud/android/datamodel/FileDataStorageManager.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/RemoteOperationResult.java
	src/com/owncloud/android/syncadapter/FileSyncAdapter.java
	src/com/owncloud/android/ui/activity/AuthenticatorActivity.java
	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
	src/com/owncloud/android/ui/activity/UploadFilesActivity.java
	src/com/owncloud/android/ui/fragment/FileDetailFragment.java
	src/com/owncloud/android/ui/fragment/OCFileListFragment.java
2013-01-17 14:25:49 +01:00
..
anim initial commit 2011-08-19 22:37:35 +02:00
drawable Fixed: problems in handling a file that is still uploading but in the files list because a synchronization was triggered and finished; problems in UI refresh after removing or renaming a file, while in double pane mode 2012-07-27 14:29:46 +02:00
drawable-hdpi revert icon to old one 2012-07-07 19:54:46 +02:00
drawable-hdpi-v9 Fixed visibility problems of menu icons (sizes, and color in 2.3.x) 2012-06-27 17:05:00 +02:00
drawable-ldpi revert icon to old one 2012-07-07 19:54:46 +02:00
drawable-ldpi-v9 Fixed visibility problems of menu icons (sizes, and color in 2.3.x) 2012-06-27 17:05:00 +02:00
drawable-mdpi revert icon to old one 2012-07-07 19:54:46 +02:00
drawable-mdpi-v9 Fixed visibility problems of menu icons (sizes, and color in 2.3.x) 2012-06-27 17:05:00 +02:00
layout Merge master into oauth_login 2012-12-18 11:20:03 +01:00
layout-land Merge master into oauth_login 2012-12-18 11:20:03 +01:00
layout-large-land Multiple upload available from the app 2012-08-14 12:37:08 +02:00
layout-v14 Merge master into oauth_login 2012-12-18 11:20:03 +01:00
menu Merge master into oauth_login 2012-12-18 11:20:03 +01:00
values Merge branch 'master' into oauth_login 2013-01-17 14:25:49 +01:00
values-af adding translations and transifex third party tool 2012-07-21 22:10:36 +02:00
values-ar Translations update 2013-01-10 18:38:41 +01:00
values-ar-rSA correct languages mapping 2012-10-06 11:28:51 +02:00
values-bg-rBG Translations update 2013-01-10 18:38:41 +01:00
values-bn-rBD Translations update 2013-01-10 18:38:41 +01:00
values-ca Translations update 2013-01-10 18:38:41 +01:00
values-cs-rCZ Translations update 2013-01-10 18:38:41 +01:00
values-da Translations update 2013-01-10 18:38:41 +01:00
values-de Translations update 2013-01-10 18:38:41 +01:00
values-de-rDE German translation updated 2013-01-11 12:45:10 +01:00
values-el Translations update 2013-01-10 18:38:41 +01:00
values-eo Translations update 2013-01-10 18:38:41 +01:00
values-es Merge master into oauth_login 2012-12-18 11:20:03 +01:00
values-es-rAR Translations update 2013-01-10 18:38:41 +01:00
values-et-rEE Translations update 2013-01-10 18:38:41 +01:00
values-eu Translations update 2013-01-10 18:38:41 +01:00
values-eu-rES correct languages mapping 2012-10-06 11:28:51 +02:00
values-fa Translations update 2013-01-10 18:38:41 +01:00
values-fi Translations update 2013-01-10 18:38:41 +01:00
values-fi-rFI Translations update 2013-01-11 13:26:34 +01:00
values-fr Translations update 2013-01-10 18:38:41 +01:00
values-gl Translations update 2013-01-10 18:38:41 +01:00
values-he Translations update 2013-01-10 18:38:41 +01:00
values-hi Translations update 2013-01-10 18:38:41 +01:00
values-hr Translations update 2013-01-10 18:38:41 +01:00
values-hu Translations update 2013-01-10 18:38:41 +01:00
values-hu-rHU Translations update 2013-01-10 18:38:41 +01:00
values-hy Translations update 2013-01-10 18:38:41 +01:00
values-ia Translations update 2013-01-10 18:38:41 +01:00
values-id Translations update 2013-01-10 18:38:41 +01:00
values-id-rID correct languages mapping 2012-10-06 11:28:51 +02:00
values-is Translations update 2013-01-10 18:38:41 +01:00
values-it Italian strings for narrow screens; fixed version string. 2013-01-12 18:37:10 +01:00
values-ja-rJP Translations update 2013-01-10 18:38:41 +01:00
values-ka-rGE Translations update 2013-01-10 18:38:41 +01:00
values-ko Translations update 2013-01-10 18:38:41 +01:00
values-large Merge master into oauth_login 2012-12-18 11:20:03 +01:00
values-lb Translations update 2013-01-10 18:38:41 +01:00
values-lt-rLT Translations update 2013-01-10 18:38:41 +01:00
values-lv Translations update 2013-01-10 18:38:41 +01:00
values-mk Translations update 2013-01-10 18:38:41 +01:00
values-ms-rMY Translations update 2013-01-10 18:38:41 +01:00
values-nb-rNO Translations update 2013-01-10 18:38:41 +01:00
values-nl Translations update 2013-01-10 18:38:41 +01:00
values-nn-rNO Translations update 2013-01-10 18:38:41 +01:00
values-oc Translations update 2013-01-10 18:38:41 +01:00
values-pl Translations update 2013-01-10 18:38:41 +01:00
values-pl-rPL Translations update 2013-01-10 18:38:41 +01:00
values-pt-rBR Translations update 2013-01-10 18:38:41 +01:00
values-pt-rPT Translations update 2013-01-10 18:38:41 +01:00
values-ro Translations update 2013-01-10 18:38:41 +01:00
values-ru Translations update 2013-01-10 18:38:41 +01:00
values-ru-rRU Translations update 2013-01-10 18:38:41 +01:00
values-si-rLK Translations update 2013-01-10 18:38:41 +01:00
values-sk-rSK Translations update 2013-01-10 18:38:41 +01:00
values-sl Translations update 2013-01-10 18:38:41 +01:00
values-so adding translations and transifex third party tool 2012-07-21 22:10:36 +02:00
values-sq Translations update 2013-01-10 18:38:41 +01:00
values-sr Translations update 2013-01-10 18:38:41 +01:00
values-sr-rSP Translations update 2013-01-10 18:38:41 +01:00
values-sv Translations update 2013-01-10 18:38:41 +01:00
values-ta-rLK Translations update 2013-01-10 18:38:41 +01:00
values-th-rTH Translations update 2013-01-10 18:38:41 +01:00
values-tr Translations update 2013-01-10 18:38:41 +01:00
values-uk Translations update 2013-01-10 18:38:41 +01:00
values-vi Translations update 2013-01-10 18:38:41 +01:00
values-zh-rBG Translations update 2013-01-10 18:38:41 +01:00
values-zh-rCN Translations update 2013-01-10 18:38:41 +01:00
values-zh-rHK Translations update 2013-01-10 18:38:41 +01:00
values-zh-rTW Translations update 2013-01-10 18:38:41 +01:00
values-zu-rZA Translations update 2013-01-10 18:38:41 +01:00
xml add upload via wifi only option 2012-10-08 21:26:18 +02:00