4978 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Andy Scherzinger	6d670fb678	Merge branch 'master' of https://github.com/owncloud/android into material_buttons	2015-09-07 11:16:29 +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
Andy Scherzinger	c1e73ec56f	Merge branch 'master' of https://github.com/owncloud/android into material_buttons	2015-09-06 20:49:49 +02: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
Andy Scherzinger	3f14bc1e27	updated to latest library version	2015-09-04 13:31:00 +02:00
Andy Scherzinger	e7674368e2	fix duplicate	2015-09-04 13:24:12 +02:00
Andy Scherzinger	7ac2a0d297	fix layout/uploader_layout.xml	2015-09-04 13:20:41 +02:00
Andy Scherzinger	32145d57db	Merge branch 'master' of https://github.com/owncloud/android into material_buttons ... Conflicts: res/layout/uploader_layout.xml	2015-09-04 13:16:11 +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	3b2c61a48c	Merge branch 'master' into uploadShowsFiles ... Conflicts: res/layout/uploader_layout.xml res/layout/uploader_list_item_layout.xml src/com/owncloud/android/ui/activity/Uploader.java	2015-09-02 16:45:33 +02: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
Joas Schilling	03492691fc	Strip away index.php/apps/files to allow copy pasting from the server	2015-08-28 20:21:53 +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
tobiasKaminsky	d1c18cac12	removed commented code	2015-08-25 15:57:10 +02:00
tobiasKaminsky	54a4263eeb	fix #1110: accents not sorted	2015-08-25 15:55:45 +02:00
masensio	b81de1d547	Merge branch 'master' into create_folder_button_on_action_bar_for_uploader ... Conflicts: res/layout/uploader_layout.xml	2015-08-25 14:53:42 +02:00
tobiasKaminsky	69e78694cd	to be sure ;)	2015-08-25 14:43:36 +02:00
tobiasKaminsky	6df6548ee7	try fix #1113	2015-08-25 14:40:16 +02:00
Jenkins for ownCloud	8f0a83a495	[tx-robot] updated from transifex	2015-08-25 01:13:43 -04:00
masensio	b572e4b935	Merge branch 'develop'	2015-08-24 13:07:31 +02:00
masensio	8c9270e114	Merge pull request #1082 from owncloud/ignoreHiddenFiles ... ignore hidden files also if they are images for counting	2015-08-24 13:06:36 +02:00
masensio	83442c8ded	Merge branch 'develop'	2015-08-24 13:01:12 +02:00
masensio	e836fd66e4	Merge pull request #1078 from gstraube/develop ... Check if ETag for remote folder is null, i.e. it was not received from the server	2015-08-24 12:59:43 +02:00
masensio	9849205124	Merge branch 'master' of github.com:owncloud/android	2015-08-24 12:42:25 +02:00
Jenkins for ownCloud	573b9d1727	[tx-robot] updated from transifex	2015-08-24 12:38:30 +02:00
Jenkins for ownCloud	806f258bbd	[tx-robot] updated from transifex	2015-08-24 12:38:30 +02:00
Jenkins for ownCloud	763ecd2d84	[tx-robot] updated from transifex	2015-08-24 12:38:29 +02:00