1510 commits

Author	SHA1	Message	Date
tobiasKaminsky	ff5202a5f6	Merge remote-tracking branch 'remotes/upstream/master' into avoidDuplicateFiles	2015-09-25 17:23:31 +02:00
tobiasKaminsky	19bc90bf56	default value: do nothing ... show summary for behaviour	2015-09-25 17:21:58 +02:00
tobiasKaminsky	5034e42928	extracted hard-coded string to string resource	2015-09-23 19:49:01 +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
tobiasKaminsky	4b8a5a9c92	#819, part 2: Instant uploads, depends on setting	2015-09-19 14:33:29 +02:00
Jenkins for ownCloud	0cb5cee031	[tx-robot] updated from transifex	2015-09-17 01:13:47 -04: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
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
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
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
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
Jenkins for ownCloud	7ae7cef2b3	[tx-robot] updated from transifex	2015-09-11 01:13:42 -04: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	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
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
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
Jenkins for ownCloud	f70de1736e	[tx-robot] updated from transifex	2015-09-04 01:13:40 -04: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
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
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
Jenkins for ownCloud	ef7cf6edb0	[tx-robot] updated from transifex	2015-08-31 01:13:46 -04: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
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
Jenkins for ownCloud	8f0a83a495	[tx-robot] updated from transifex	2015-08-25 01:13:43 -04: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
Jenkins for ownCloud	9448a809b1	[tx-robot] updated from transifex	2015-08-24 12:38:28 +02:00
tobiasKaminsky	8e3787909f	Merge branch 'develop' of github.com:owncloud/android into svgTransparentBackground	2015-08-21 17:48:58 +02:00
Andy Scherzinger	a544a0cfb6	correct copyright info	2015-08-20 13:08:28 +02:00
Andy Scherzinger	cbb0f8743f	Fix for long click menue for account management in preferences screen	2015-08-18 23:13:10 +02:00