4065 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
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
Andy Scherzinger	3ad6531ed6	Merge pull request #1147 from Kernald/additional-filetype-icons ... Add additional filetype icons	2015-09-10 09:18:12 +02:00
Marc Plano-Lesay	b4875c69cc	Add additional filetype icons	2015-09-09 23:30:09 +02:00
masensio	84a4a086d6	Merge pull request #1124 from Kernald/new-filetype-icons ... New filetype icons	2015-09-09 08:50:50 +02:00
Jenkins for ownCloud	fbe533c974	[tx-robot] updated from transifex	2015-09-09 01:13:45 -04:00
Jenkins for ownCloud	1d4b191fb3	[tx-robot] updated from transifex	2015-09-08 01:13:44 -04:00
Andy Scherzinger	e9f793755e	showing the filename in the long press menu on file list, see #559	2015-09-07 12:24:01 +02:00
masensio	22f0f59991	Merge pull request #1095 from owncloud/text_file_preview_pr_707_with_develop ... Text file preview pr 707 with develop	2015-09-07 10:47:05 +02:00
masensio	1586eea7cb	Merge branch 'master' into text_file_preview_pr_707_with_develop	2015-09-07 10:42:09 +02:00
David A. Velasco	1ff57e0665	HOT FIX: recovered lost strings	2015-09-07 10:07:54 +02:00
David A. Velasco	3f40da0ac9	Fixed text preview filter to take into account local knowledge about MIME types	2015-09-07 09:14:00 +02:00
Jenkins for ownCloud	244f3bd4e4	[tx-robot] updated from transifex	2015-09-07 01:13:41 -04:00
Jenkins for ownCloud	5ceecb4a82	[tx-robot] updated from transifex	2015-09-06 01:13:44 -04:00
Jenkins for ownCloud	11c0d77648	[tx-robot] updated from transifex	2015-09-05 01:13:44 -04:00
David A. Velasco	68ce6e62bf	Reverse filter for preview of text files: all text/ but those in black list	2015-09-04 15:01:25 +02:00
masensio	fc5c4d899c	Merge branch 'master' into text_file_preview_pr_707_with_develop ... Conflicts: src/com/owncloud/android/ui/activity/FileDisplayActivity.java src/com/owncloud/android/ui/fragment/OCFileListFragment.java	2015-09-04 14:31:10 +02:00
masensio	f787213cd1	Merge pull request #1102 from owncloud/copy ... Copy files	2015-09-04 11:14:42 +02:00
masensio	8f46169883	Update library reference: Copy operation	2015-09-04 11:03:31 +02:00
Jenkins for ownCloud	f70de1736e	[tx-robot] updated from transifex	2015-09-04 01:13:40 -04:00
masensio	6b84d83b35	Merge branch 'text_file_preview_pr_707_with_develop' of github.com:owncloud/android into text_file_preview_pr_707_with_develop	2015-09-02 13:29:14 +02:00
masensio	a0707428ff	Merge remote-tracking branch 'origin/master' into text_file_preview_pr_707_with_develop ... Conflicts: res/layout/file_preview.xml src/com/owncloud/android/ui/activity/FileDisplayActivity.java	2015-09-02 13:23:42 +02:00
Jenkins for ownCloud	2b001a8bf2	[tx-robot] updated from transifex	2015-09-02 07:06:14 -04:00
David A. Velasco	f626b13634	Merge pull request #1114 from owncloud/tryFix1113 ... Removed squared background for transparencies from file type icons and thumbnails (stays for images in gallery view)	2015-09-02 11:00:30 +02:00
Jenkins for ownCloud	f70817f5fb	[tx-robot] updated from transifex	2015-09-01 13:02:18 -04:00
David A. Velasco	e6be60679f	Merge branch 'master' into copy ... Conflicts FIXED: src/com/owncloud/android/ui/activity/FileDisplayActivity.java src/com/owncloud/android/ui/fragment/OCFileListFragment.java src/com/owncloud/android/ui/preview/FileDownloadFragment.java src/com/owncloud/android/ui/preview/PreviewImageFragment.java src/com/owncloud/android/ui/preview/PreviewMediaFragment.java	2015-09-01 18:35:51 +02:00
David A. Velasco	1e8c83b22e	Updated reference to library after upate copy request implementation	2015-09-01 18:15:22 +02:00
Marc Plano-Lesay	502ff0a216	Use new filetype icons	2015-08-31 19:17:05 +02:00
David A. Velasco	136db6a765	Merge pull request #1122 from owncloud/create_folder_button_on_action_bar_for_uploader ... 'Create folder' button moved to action bar in Uploader activity	2015-08-31 17:48:12 +02:00
masensio	313df93e95	Set background color as background for png with tranparency	2015-08-31 16:40:04 +02:00
Jenkins for ownCloud	ef7cf6edb0	[tx-robot] updated from transifex	2015-08-31 01:13:46 -04:00
David A. Velasco	3d6fbb7a84	Added slides for Android workshop @ oCC 2015	2015-08-30 11:42:25 +02:00
masensio	ca2892bdf1	Remove transparent background in icons	2015-08-28 18:50:43 +02:00
Jenkins for ownCloud	11fa921860	[tx-robot] updated from transifex	2015-08-28 01:13:40 -04:00
Jenkins for ownCloud	6b8a052a5e	[tx-robot] updated from transifex	2015-08-27 01:13:43 -04:00
Jenkins for ownCloud	8ecfdfe614	[tx-robot] updated from transifex	2015-08-26 01:13:41 -04:00