2893 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
tobiasKaminsky	d4e0f3bdb1	Merge branch 'develop2' into imageGrid2 ... Conflicts: owncloud-android-library res/layout/list_fragment.xml res/values-fr/strings.xml src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java src/com/owncloud/android/ui/adapter/FileListListAdapter.java src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java src/com/owncloud/android/ui/fragment/ExtendedListFragment.java src/com/owncloud/android/ui/fragment/LocalFileListFragment.java src/com/owncloud/android/ui/fragment/OCFileListFragment.java	2015-01-19 21:02:37 +01:00
tobiasKaminsky	6d5c6f86e5	Merge branch 'develop2' into imageGrid2 ... Conflicts: owncloud-android-library res/layout/list_fragment.xml res/values-fr/strings.xml src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java src/com/owncloud/android/ui/adapter/FileListListAdapter.java src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java src/com/owncloud/android/ui/fragment/ExtendedListFragment.java src/com/owncloud/android/ui/fragment/LocalFileListFragment.java src/com/owncloud/android/ui/fragment/OCFileListFragment.java	2015-01-18 17:00:29 +01:00
Jenkins for ownCloud	bdb959f2e2	[tx-robot] updated from transifex	2015-01-18 01:13:30 -05:00
Jenkins for ownCloud	46427dad18	[tx-robot] updated from transifex	2015-01-17 01:13:31 -05:00
Jenkins for ownCloud	86f9d43e8a	[tx-robot] updated from transifex	2015-01-15 01:13:33 -05:00
David A. Velasco	9bf4e0f7b9	Merge pull request #746 from owncloud/thumbnailForUpload ... Thumbnails added to Upload activity	2015-01-14 08:25:04 +01:00
Jenkins for ownCloud	369fb6a0be	[tx-robot] updated from transifex	2015-01-14 01:13:29 -05:00
Jenkins for ownCloud	f206d8c674	[tx-robot] updated from transifex	2015-01-13 01:13:31 -05:00
jabarros	6c70154a50	Merge branch 'develop' into thumbnailForUpload	2015-01-12 14:30:06 +01:00
jabarros	b7e80e6ace	Other minor changes after CR	2015-01-12 14:17:29 +01:00
jabarros	5d228838e2	Changes after CR	2015-01-12 12:52:40 +01:00
Jenkins for ownCloud	26403abd0a	[tx-robot] updated from transifex	2015-01-12 01:13:29 -05:00
Jenkins for ownCloud	acd19c911b	[tx-robot] updated from transifex	2015-01-10 01:13:30 -05:00
jabarros	cc15321173	Fixed. In the upload view, videos does not have the correct icon	2015-01-09 09:46:43 +01:00
David A. Velasco	74d4f5302e	Fixed icon for MIME type application/javascript	2015-01-09 09:44:02 +01:00
David A. Velasco	cb5f8b3fcd	Considered MIME types for .py, .js, and fixed .xls, .ppt, and some clean-up	2015-01-08 16:43:25 +01:00
David A. Velasco	643162cac9	Consider application/xml for XML files	2015-01-08 10:55:42 +01:00
David A. Velasco	8da1926f02	Merge pull request #820 from owncloud/obeySortOrder_fixmerge ... Obey sort order in gallery of images.	2015-01-08 09:08:42 +01:00
David A. Velasco	4ae8ac19c3	Merge pull request #823 from owncloud/rename_with_special_character ... Removed spurious check of "%" character when renaming.	2015-01-07 12:51:59 +01:00
Jenkins for ownCloud	f670cfad8f	[tx-robot] updated from transifex	2015-01-07 01:13:30 -05:00
Jenkins for ownCloud	464db6b4c5	[tx-robot] updated from transifex	2015-01-06 01:13:30 -05:00
Jenkins for ownCloud	ea101df8f5	[tx-robot] updated from transifex	2015-01-05 01:13:29 -05:00
Jenkins for ownCloud	c8dc970121	[tx-robot] updated from transifex	2015-01-04 01:13:31 -05:00
Jenkins for ownCloud	57a840c92e	[tx-robot] updated from transifex	2015-01-03 01:13:28 -05:00
Jenkins for ownCloud	c03ea61704	[tx-robot] updated from transifex	2015-01-02 01:13:30 -05:00
Jenkins for ownCloud	2fb89a9238	[tx-robot] updated from transifex	2015-01-01 01:13:33 -05:00
jabarros	fa159e4891	Fix. Some icons are not correct. Showed default file icon when there is not mimetype	2014-12-31 14:25:24 +01:00
Jenkins for ownCloud	410bb307e1	[tx-robot] updated from transifex	2014-12-31 01:13:30 -05:00
jabarros	6caad2be05	Fixed. Icons which have extensions in UpperCase, in the uploads view are not correct	2014-12-30 11:55:13 +01:00
Jenkins for ownCloud	04631b6313	[tx-robot] updated from transifex	2014-12-30 01:13:30 -05:00
jabarros	cd1a150bf9	Create getThumbnailDimension and add some comments	2014-12-29 17:06:33 +01:00
jabarros	fe5c6b6542	Refactor ThumbnailsCacheManager to reduce repeated code	2014-12-29 14:54:45 +01:00
jabarros	2319a52bab	Merge branch 'develop' into thumbnailForUpload	2014-12-29 09:27:50 +01:00
jabarros	0d6320aa79	Move isImage method to BitmapUtils class	2014-12-29 09:26:44 +01:00
Jenkins for ownCloud	56459b1da2	[tx-robot] updated from transifex	2014-12-29 01:13:29 -05:00
Jenkins for ownCloud	4f2a917933	[tx-robot] updated from transifex	2014-12-28 01:13:30 -05:00
jabarros	da87634804	Merge branch 'develop' into rename_with_special_character	2014-12-26 14:27:52 +01:00
jabarros	4257aa1d9c	Merge branch 'develop' into obeySortOrder_fixmerge	2014-12-26 11:10:22 +01:00
jabarros	0b7c37671f	Merge pull request #755 from owncloud/OpenWithInContextMenu ... "open with" in ContextMenu of downloaded files	2014-12-26 09:13:58 +01:00
jabarros	f0905fbaac	Merge pull request #784 from ekeitho/develop ... subject mail populated when user shares >>file/folder<<	2014-12-26 09:04:02 +01:00
Jenkins for ownCloud	b64e5ff65b	[tx-robot] updated from transifex	2014-12-26 01:13:28 -05:00
Jenkins for ownCloud	db3c9440fb	[tx-robot] updated from transifex	2014-12-25 01:13:29 -05:00
Jenkins for ownCloud	64c3c9d53c	[tx-robot] updated from transifex	2014-12-24 01:13:31 -05:00
Keith Abdulla	150050aeb0	fix tab indent	2014-12-23 09:38:38 -08:00
Keith Abdulla	1db0d7daf2	create an extra string resource	2014-12-23 09:31:59 -08:00
Jenkins for ownCloud	a11f951ed7	[tx-robot] updated from transifex	2014-12-23 01:13:30 -05:00
Jenkins for ownCloud	29eba16031	[tx-robot] updated from transifex	2014-12-22 01:13:44 -05:00
Jenkins for ownCloud	68e8a942a1	[tx-robot] updated from transifex	2014-12-21 01:13:29 -05:00
Jenkins for ownCloud	167c86b4ac	[tx-robot] updated from transifex	2014-12-20 01:13:31 -05:00
Keith Abdulla	38d0a19307	fix string format and context method	2014-12-19 20:11:25 -08:00