2893 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Carla Schroder	b7664364d7	Update version number	2015-01-27 16:35:45 -08:00
Daniel Molkentin	0bb94f3c29	user manual: Fix incorrect line wrapping in config file	2015-01-27 23:41:33 +01:00
Daniel Molkentin	67ea45aa9f	Add means to build user manual via make	2015-01-27 23:40:53 +01:00
Daniel Molkentin	a9d12f3b1c	manual: omit ocdoc/* during doc generation	2015-01-27 23:35:45 +01:00
Carla Schroder	7d1839ee96	add submodule to user manual	2015-01-27 12:11:26 -08:00
Carla Schroder	ead95b9d9c	Add Android app manual to develop branch, and Allow building manual in owncloud themes	2015-01-27 12:07:43 -08:00
Jenkins for ownCloud	97386bdb87	[tx-robot] updated from transifex	2015-01-26 01:13:30 -05:00
jabarros	7d21a9ec5d	Merge pull request #825 from owncloud/SettingsGreyedOut ... Instant Upload settings hide/show	2015-01-23 09:29:11 +01:00
jabarros	68eb22929d	'Fixed. 'Upload pictures via WIFI only' is hidden when going to files and come back to settings	2015-01-22 13:49:31 +01:00
Jenkins for ownCloud	9fcb1612fe	[tx-robot] updated from transifex	2015-01-21 01:13:32 -05:00
jabarros	d0cee8be85	Merge branch 'develop' into SettingsGreyedOut	2015-01-20 09:25:20 +01:00
Jenkins for ownCloud	99276bae85	[tx-robot] updated from transifex	2015-01-20 01:13:34 -05:00
David A. Velasco	b6e4f0f4ae	Merge pull request #798 from LukeOwncloud/develop ... On downgrading upload db, delete and re-create	2015-01-19 13:44:30 +01:00
David A. Velasco	e99583ef68	Updated library reference	2015-01-19 11:29:43 +01:00
jabarros	0a8469ec1b	Merge pull request #843 from owncloud/update_Android_Gradle_plug_in ... Updated Android Gradle plug-in for compatibility with Android Studio 1.0...	2015-01-19 10:44:51 +01:00
David A. Velasco	e874789382	Updated Android Gradle plug-in for compatibility with Android Studio 1.0+	2015-01-19 09:58:06 +01:00
Jenkins for ownCloud	880ffab34c	[tx-robot] updated from transifex	2015-01-19 01:13:30 -05: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
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