5065 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Andy Scherzinger	b0a6c3fe81	Merge pull request #1277 from owncloud/1193_uploader_layout ... #1193 - optimizing the uploader layout & taking user configured sorting into account	2016-06-14 10:17:26 +02:00
Andy Scherzinger	0db0ab1fd5	layouting changes so file list, local list and uploader list look the same	2016-06-14 09:55:24 +02:00
Andy Scherzinger	8c863a642b	revert, to show app name for upload from other app	2016-06-14 09:55:23 +02:00
Andy Scherzinger	53a0da7021	revert filtering out files in the external file upload view	2016-06-14 09:55:23 +02:00
Andy Scherzinger	68849c7305	code review: fixed minor layout optimizations, set generic preference methods to private visibility	2016-06-14 09:55:22 +02:00
Andy Scherzinger	89dded113c	fix preference manager call after rebase	2016-06-14 09:55:21 +02:00
Andy Scherzinger	26ef68a02a	streamlined PrefManager API for simpler usage	2016-06-14 09:55:21 +02:00
Andy Scherzinger	5c72090ed2	removed now unused code	2016-06-14 09:55:20 +02:00
Andy Scherzinger	19c78855a0	moved the preference accessing to the oC Preference Manager	2016-06-14 09:55:19 +02:00
Andy Scherzinger	94a6bebb60	moved the preference accessing to the oC Preference Manager	2016-06-14 09:55:19 +02:00
Andy Scherzinger	1f4e9aa439	fix after rebase	2016-06-14 09:55:18 +02:00
Andy Scherzinger	8b04d61ff4	removed duplicate method call	2016-06-14 09:55:17 +02:00
Andy Scherzinger	ee7873d056	fixed menu, since grid view hasn't been part of the uploader screen	2016-06-14 09:55:17 +02:00
Andy Scherzinger	9bbd7ee103	proper padding for the choose upload folder buttons	2016-06-14 09:55:16 +02:00
Andy Scherzinger	7c8fbf1ade	Fixes after rebase	2016-06-14 09:55:16 +02:00
Andy Scherzinger	8d47b770aa	implementation of #1193 - optimizing the uploader layout and taking user configured sorting into account	2016-06-14 09:55:15 +02:00
Andy Scherzinger	ef0b5030e1	fix background color	2016-06-14 09:55:14 +02:00
Andy Scherzinger	d74f5fdc2a	implementation of #1193 - optimizing the uploader layout and taking user configured sorting into account	2016-06-14 09:55:14 +02:00
Jenkins for ownCloud	932c66d4c5	[tx-robot] updated from transifex	2016-06-14 01:13:59 -04:00
Jenkins for ownCloud	00e7c102c2	[tx-robot] updated from transifex	2016-06-12 01:13:58 -04:00
Jenkins for ownCloud	be93f8dbab	[tx-robot] updated from transifex	2016-06-10 01:13:57 -04:00
Jenkins for ownCloud	110ea08b36	[tx-robot] updated from transifex	2016-06-09 01:13:52 -04:00
David A. Velasco	b9e0c34fc3	Merge pull request #1706 from owncloud/stable ... Merge version 2.0.1 from stable to master	2016-06-08 16:58:25 +02:00
David A. Velasco	758d21b6c0	Merge branch 'master' into stable	2016-06-08 16:33:46 +02:00
David A. Velasco	7c8a60c1c3	Updated reference to version 0.9.12 of ownCloud library for Android	2016-06-08 15:42:39 +02:00
David A. Velasco	2bc528ceb2	Changelog update with 2.0.1 release	2016-06-08 15:37:27 +02:00
David A. Velasco	f453c158d7	Merge pull request #1705 from owncloud/release_2.0.1 ... Release 2.0.1	2016-06-08 10:37:48 +02:00
Juan Carlos González Cabrero	6aab804ec7	Changelog update 2.0.0 release	2016-06-08 09:56:27 +02:00
Jenkins for ownCloud	6d2747c199	[tx-robot] updated from transifex	2016-06-08 01:13:57 -04:00
David A. Velasco	a12a1060ab	Grant that 'upload permission' is not changed when other properties of public share are updated	2016-06-07 16:49:25 +02:00
Jenkins for ownCloud	49fddadd80	[tx-robot] updated from transifex	2016-06-07 01:14:21 -04:00
Juan Carlos González Cabrero	90b6f19161	Don't show local remove for available offline files/folders	2016-06-06 10:28:39 +02:00
Jenkins for ownCloud	600225c7c9	[tx-robot] updated from transifex	2016-06-06 01:13:55 -04:00
Jenkins for ownCloud	9d52814950	[tx-robot] updated from transifex	2016-06-05 01:13:34 -04:00
Jenkins for ownCloud	ca515669c2	[tx-robot] updated from transifex	2016-06-04 01:13:53 -04:00
Andy Scherzinger	03ff4adba2	Merge pull request #1582 from owncloud/reorderIssueTemplate ... reorder issue template	2016-06-03 17:19:30 +02:00
Andy Scherzinger	3c03d8df02	fixed rebase issue, readded lost descriptive text	2016-06-03 17:03:59 +02:00
tobiasKaminsky	18a5670074	reorder	2016-06-03 17:01:54 +02:00
David A. Velasco	b0f07f971b	Merge pull request #1700 from owncloud/inject_signing_config_from_env_vars ... Load release signing config from environment variables	2016-06-03 13:42:44 +02:00
David A. Velasco	7e44bbb6f5	Load release signing config from environment variables	2016-06-03 13:14:29 +02:00
David A. Velasco	9090d52c7d	Merge pull request #1699 from owncloud/allow_change_APK_names ... Allow changing APK names	2016-06-03 12:33:49 +02:00
David A. Velasco	58b7f7475a	Updated build files to fix APK name of workaround app	2016-06-03 11:18:18 +02:00
David A. Velasco	af22eae068	Updated build.gradle to modify APK names with parameters set as environment variables	2016-06-03 11:07:08 +02:00
Jenkins for ownCloud	418f240aa3	[tx-robot] updated from transifex	2016-06-03 01:13:59 -04:00
Andy Scherzinger	9ce1dbcfac	#1415 - semi transparent checkmark in checked checkbox image ... #1415 - semi transparent checkmark in checked checkbox image	2016-06-02 14:30:34 +02:00
Andy Scherzinger	2fec9e8ea0	mdpi checkmark	2016-06-02 13:39:11 +02:00
Andy Scherzinger	9e4e93a5bc	fixed checkmark color	2016-06-02 13:39:11 +02:00
Andy Scherzinger	dd8a18508e	added semi transparent checmark to checked checkbox image (see #1415)	2016-06-02 13:39:10 +02:00
Juan Carlos González Cabrero	28f20ec3ef	Check if the OCFile has a previous conflict before calling a sync operation	2016-06-02 12:40:09 +02:00
Juan Carlos González Cabrero	ee3b518f75	Upgrade version number on both android module and workaround	2016-06-02 09:11:18 +02:00