3345 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
tobiasKaminsky	d54345d040	Merge remote-tracking branch 'upstream/develop' into uploadNewFolder ... Conflicts: src/com/owncloud/android/ui/activity/Uploader.java	2015-01-08 22:41:41 +01:00
tobiasKaminsky	6b742de58e	- removed uneccessary improts	2015-01-08 22:33:28 +01:00
David A. Velasco	eb6ec5dcf3	Merge pull request #836 from owncloud/download_folder__fixing_recursive_cancellation ... Fix of recursive cancellation	2015-01-08 17:05:35 +01:00
David A. Velasco	1975f9e776	Aesthetic fixes	2015-01-08 16:56:21 +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
jabarros	e6fc5d13ad	Notify the download cancelation for updating the screen and remove the yellow arrow that continues being shown after the cancel	2015-01-08 15:02:42 +01:00
jabarros	737381eaad	Fix for downloads that are not cancelled	2015-01-08 14:59:27 +01:00
jabarros	46d045fd62	Merge branch 'download_folder' into download_folder__fixing_recursive_cancellation	2015-01-08 14:26:38 +01:00
jabarros	3929f1e740	Add content description tag into EditText in account_setup	2015-01-08 13:07:54 +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	14bbe5bf01	First try	2015-01-07 18:23:53 +01:00
jabarros	d05d5ffe1a	Merge branch 'develop' into download_folder	2015-01-07 14:04:46 +01:00
jabarros	f737785b4f	Change error message when trying download a folder that does not exist	2015-01-07 13:47:38 +01:00
jabarros	90e49a96e4	Added folder name to 'file not found' error message	2015-01-07 13:04:46 +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
jabarros	1db11eb586	Fix. App does not realize that the folder does not exist	2015-01-07 11:22:24 +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
tobiasKaminsky	5345fed890	- fix #667	2015-01-01 13:55:06 +01:00
tobiasKaminsky	30b332745d	- last whitespace	2015-01-01 13:07:31 +01:00
tobiasKaminsky	cb725acdf3	- removed whitespaces ... - renamed pin description	2015-01-01 13:06:25 +01: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
jabarros	61b267d309	Fix. App does not realize that the folder does not exits when traying to download a folder	2014-12-31 13:48:36 +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
tobiasKaminsky	74bd1d8d78	- clarify pin description	2014-12-30 09:35:48 +01:00
tobiasKaminsky	5def3658a9	fix double pin entry on start	2014-12-30 09:32:33 +01:00
Jenkins for ownCloud	04631b6313	[tx-robot] updated from transifex	2014-12-30 01:13:30 -05:00
tobiasKaminsky	0e061f6f06	- fix #47	2014-12-29 22:36:15 +01: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
tobiasKaminsky	cb5f0971af	- moved check to PinCheck ... - hardcoded 10s time-out	2014-12-29 09:15:51 +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
tobiasKaminsky	ed74bba5fb	temp	2014-12-27 16:48:40 +01:00
tobiasKaminsky	be4d7d14d2	- fix #76	2014-12-27 16:20:34 +01: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