4686 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Jenkins for ownCloud	92c39be013	[tx-robot] updated from transifex	2015-09-22 01:13:44 -04:00
David A. Velasco	cd165b7ce6	Grant that cancellations of tasks generating thumbnails really works for reused icon views	2015-09-21 21:25:11 +02:00
tobiasKaminsky	a0b061a058	java 1.5 does not support switch with strings :/	2015-09-21 09:57:00 +02:00
tobiasKaminsky	2b6a61ddae	#819 part3: When uploading from filesystem inside the owncloud app, show question	2015-09-21 09:45:20 +02:00
tobiasKaminsky	a64308f382	wip	2015-09-21 09:03:09 +02:00
tobiasKaminsky	a1b2655d85	wip	2015-09-21 08:57:00 +02:00
Jenkins for ownCloud	664450a6bf	[tx-robot] updated from transifex	2015-09-21 01:13:34 -04:00
tobiasKaminsky	4b8a5a9c92	#819, part 2: Instant uploads, depends on setting	2015-09-19 14:33:29 +02:00
tobiasKaminsky	69bbb5c8cb	#819: sending files to owncloud from another app: only upload, no copy	2015-09-18 17:47:23 +02:00
masensio	903497906e	Merge pull request #1163 from owncloud/Fix_refreshClickException ... Fix refresh click on login screen	2015-09-18 14:18:04 +02:00
Andy Scherzinger	eb7bcfbd2e	Merge branch 'Fix_refreshClickException' of https://github.com/owncloud/android into material_buttons ... Conflicts: owncloud-android-library res/layout-land/account_setup.xml	2015-09-17 15:39:27 +02:00
Andy Scherzinger	f6b2b856cb	Fixed the jumping text on refreshed (status text), aligned the margin of the url field for landscape/portrait, fixed the refresh icon size on landscape - also fixes #192	2015-09-17 11:46:37 +02:00
Jenkins for ownCloud	0cb5cee031	[tx-robot] updated from transifex	2015-09-17 01:13:47 -04:00
Andy Scherzinger	bbbb7026b4	fix for refrsh icon in text view in landscape mode	2015-09-16 17:34:29 +02:00
Andy Scherzinger	549284e4f9	fix click listener	2015-09-16 17:31:27 +02:00
Andy Scherzinger	044c597e2b	fix for refresh bug	2015-09-16 17:21:53 +02:00
masensio	020def3243	Update versionName and versionCode for version 1.8. Also in workaround	2015-09-16 16:54:07 +02:00
Andy Scherzinger	94bc0699ac	Merge branch 'master' of https://github.com/owncloud/android into material_buttons ... fixed realignment item badges Conflicts: res/layout/list_item.xml	2015-09-16 16:27:47 +02:00
masensio	1bee51d263	Merge branch 'release-1.8' of github.com:owncloud/android into release-1.8	2015-09-16 12:55:45 +02:00
masensio	542b7c00b3	Update library reference	2015-09-16 12:55:05 +02:00
masensio	ae0b4e5759	Update library reference	2015-09-16 12:54:28 +02:00
masensio	459bd1e9d0	Merge pull request #1157 from owncloud/fix_file_list_icon_alignment ... center aligned the folder icon with the drawer icon	2015-09-16 12:34:30 +02:00
masensio	0083936d40	Merge branch 'fix_file_list_icon_alignment' of github.com:owncloud/android into fix_file_list_icon_alignment	2015-09-16 11:44:51 +02:00
Andy Scherzinger	4c0371f82b	center aligned the folder icon with the drawer icon	2015-09-16 11:41:37 +02:00
masensio	359ede5fdd	Merge pull request #1149 from owncloud/new_filetype_icons ... New icon detection in general + support for additional mimetype icons	2015-09-16 11:39:26 +02:00
Andy Scherzinger	9e15d2459d	Merge branch 'new_filetype_icons' of https://github.com/owncloud/android into material_buttons	2015-09-15 18:44:49 +02:00
Andy Scherzinger	6f5cb9aaca	Merge branch 'master' of https://github.com/owncloud/android into material_buttons	2015-09-15 18:43:48 +02:00
David A. Velasco	eaf249803c	Removed unneeded LDPI drawables	2015-09-15 18:08:00 +02:00
David A. Velasco	0290523c03	Added icons for file type TEXT	2015-09-15 18:07:59 +02:00
Andy Scherzinger	3ff4d6df0f	adapting web's way of choosing icons	2015-09-15 18:02:34 +02:00
David A. Velasco	803f672663	Merge pull request #1155 from owncloud/update_setup_guide ... Update setup, changes from the issue #1154	2015-09-15 13:55:57 +02:00
Andy Scherzinger	c6bc82d4fe	center aligned the folder icon with the drawer icon	2015-09-14 21:49:45 +02:00
David A. Velasco	2132d8a7c7	Merge pull request #1154 from owncloud/update_share_link_for_OC_8.2 ... Update share link for oc 8.2	2015-09-14 14:58:28 +02:00
masensio	8ed97d7433	Update setup, changes from the issue #1154	2015-09-14 14:07:05 +02:00
masensio	69e931f0f6	Merge branch 'update_share_link_for_OC_8.2' of github.com:owncloud/android into update_share_link_for_OC_8.2	2015-09-14 13:23:29 +02:00
masensio	a52c4ea968	Update library reference	2015-09-14 13:21:48 +02:00
masensio	26f3917848	Update library reference: get share link	2015-09-14 10:30:54 +02:00
Jenkins for ownCloud	9b8b29d98b	[tx-robot] updated from transifex	2015-09-14 01:13:43 -04:00
Jenkins for ownCloud	83eed1a8d8	[tx-robot] updated from transifex	2015-09-12 01:13:45 -04:00
masensio	b256291d4b	Update library reference: get share link	2015-09-11 15:05:41 +02:00
Andy Scherzinger	6eccdc25b3	Merge branch 'new_filetype_icons' of https://github.com/owncloud/android into material_buttons ... Conflicts: src/com/owncloud/android/utils/DisplayUtils.java	2015-09-11 13:06:14 +02:00
Andy Scherzinger	13a73dd568	Merge branch 'master' of https://github.com/owncloud/android into material_buttons	2015-09-11 12:47:01 +02:00
David A. Velasco	7182b1d2b1	Merge pull request #1141 from owncloud/559_longpress_filename ... Show file name in the contextual menu, see #559	2015-09-11 12:37:04 +02:00
Andy Scherzinger	b1aff42715	further cleanup, moving folder icon determination into util class	2015-09-11 11:15:55 +02:00
Andy Scherzinger	ed094a7df6	Add further javadoc descsribing how to maintain further mappings in the future	2015-09-11 10:57:11 +02:00
Jenkins for ownCloud	7ae7cef2b3	[tx-robot] updated from transifex	2015-09-11 01:13:42 -04:00
Andy Scherzinger	1a26995be2	remove commented out test code	2015-09-10 18:20:26 +02:00
Andy Scherzinger	97fc896fd4	added mapping for bin to be iconized with "application"	2015-09-10 18:16:35 +02:00
Andy Scherzinger	fa12c619b0	rewrite for icon determination with refactoring into its own class + fixed a typo	2015-09-10 17:55:26 +02:00
Andy Scherzinger	8c19d0fa50	shortened this prediction, since it will always be image...	2015-09-10 17:54:05 +02:00