5897 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Bartosz Przybylski	0ea54fa91c	Fix after rebase	2016-11-02 12:09:49 +01:00
Bartosz Przybylski	8ad388f951	Soften requirement on cleanup step failures	2016-11-02 12:09:49 +01:00
Bartosz Przybylski	6722f71be8	Stop and start logging on migration	2016-11-02 12:09:48 +01:00
Bartosz Przybylski	ebbab224b2	Code cleanups	2016-11-02 12:09:48 +01:00
Bartosz Przybylski	67bc271265	Add cleanup and rollback step when migrating. Correctly set progress during migration.	2016-11-02 12:09:48 +01:00
Bartosz Przybylski	b38b3276e2	Add more migration stuff. cleanup step is still missing	2016-11-02 12:09:48 +01:00
Andy Scherzinger	3fc8d999db	rebase	2016-11-02 12:09:48 +01:00
tobiasKaminsky	b1963aed50	Prepare preferences and project to use user defined storage path	2016-11-02 12:09:47 +01:00
Nextcloud bot	226abe2469	[tx-robot] updated from transifex	2016-11-02 01:32:46 +00:00
Andy Scherzinger	4e3d51799d	Merge pull request #326 from nextcloud/accountSwitcherOptimizations ... Account switcher optimizations	2016-11-01 23:48:43 +01:00
AndyScherzinger	b3ffb02736	use proper alert	2016-11-01 23:35:19 +01:00
AndyScherzinger	074edbdbf4	removed deprecated eu language file (es is available)	2016-11-01 23:35:19 +01:00
AndyScherzinger	ae8440b038	removed deprecated eu language file (es is available)	2016-11-01 23:35:19 +01:00
AndyScherzinger	f5d76101e0	removed deprecated ru-ru language file (ru is available)	2016-11-01 23:35:19 +01:00
AndyScherzinger	d15f244d77	removed deprecated ch language file	2016-11-01 23:35:18 +01:00
AndyScherzinger	7ef153563b	removed deprecated fi language file	2016-11-01 23:35:18 +01:00
AndyScherzinger	9352886c5a	upgrade legacy calls	2016-11-01 23:35:18 +01:00
AndyScherzinger	50cbf61872	code review changes	2016-11-01 23:35:18 +01:00
AndyScherzinger	928a1b8630	fixes after cherry pick	2016-11-01 23:35:18 +01:00
AndyScherzinger	3a8d29d79b	use latest 2.2.1 gradle/Android plugin	2016-11-01 23:35:17 +01:00
David A. Velasco	5a97d31392	Finish action mode when drawer starts to open, recover it when drawer is closed ... # Conflicts: # build.gradle # src/com/owncloud/android/ui/activity/DrawerActivity.java # src/com/owncloud/android/ui/fragment/OCFileListFragment.java	2016-11-01 23:35:17 +01:00
AndyScherzinger	175816b70e	spacing fix (dp perfect)	2016-11-01 23:35:17 +01:00
AndyScherzinger	2e4fbe0268	fixed file headers	2016-11-01 23:35:17 +01:00
AndyScherzinger	ae0db114fb	housekeeping (file_actions and AccountActionsDialog aren't in use anymore due to multi select / account manager capabilities)	2016-11-01 23:35:17 +01:00
AndyScherzinger	4b60d13d65	layout fixes II	2016-11-01 23:35:17 +01:00
AndyScherzinger	2ab59c3c95	layoutfix	2016-11-01 23:35:16 +01:00
AndyScherzinger	e89531fc1a	optimized layout adding username + account-url	2016-11-01 23:35:16 +01:00
AndyScherzinger	8c9e2206cb	name and avatr clickable (switching accounts)	2016-11-01 23:35:16 +01:00
AndyScherzinger	42c61c9ed4	highlight currently active user	2016-11-01 23:35:16 +01:00
David A. Velasco	c098aca057	Show a check mark on the current account in the account manager ... # Conflicts: # res/layout/account_item.xml # src/com/owncloud/android/ui/activity/ManageAccountsActivity.java # src/com/owncloud/android/ui/adapter/AccountListAdapter.java	2016-11-01 23:35:15 +01:00
AndyScherzinger	7bf64ef1bc	account switching via list item click	2016-11-01 23:35:15 +01:00
David A. Velasco	d504a055aa	Fix exit of the app after not creating account from 'Add account' in navigation drawer	2016-11-01 23:35:12 +01:00
Andy Scherzinger	0fe08abec2	Merge pull request #323 from nextcloud/MimeUtilsHousekeeping ... Move all file type (as in mime type) checks to MimeTypeUtil	2016-11-01 23:30:25 +01:00
AndyScherzinger	8a565f85db	fix code review	2016-11-01 22:49:37 +01:00
Nextcloud bot	2aa8b52a7a	[tx-robot] updated from transifex	2016-11-01 01:32:49 +00:00
AndyScherzinger	a5dec01990	rename 2/2	2016-10-31 12:51:40 +01:00
AndyScherzinger	d4e7728dc1	rename 1/2	2016-10-31 12:51:40 +01:00
AndyScherzinger	1a2a3e4173	Move all file type (as in mime type) checks to MimeTypeUtil	2016-10-31 12:51:40 +01:00
Nextcloud bot	633399f964	[tx-robot] updated from transifex	2016-10-31 01:32:56 +00:00
Andy Scherzinger	405f228234	Merge pull request #365 from nextcloud/strugee-patch-1 ... Improve wordings in strings.xml	2016-10-30 20:09:45 +01:00
Nextcloud bot	0d9a11881c	[tx-robot] updated from transifex	2016-10-30 00:32:53 +00:00
Alex Jordan	033cc7154f	Improve wordings in strings.xml ... This makes the wording of some strings less awkward along with fixing some minor grammar issues.	2016-10-28 18:03:05 -07:00
Nextcloud bot	b7f36b2e54	[tx-robot] updated from transifex	2016-10-27 00:33:01 +00:00
Nextcloud bot	2829550e0a	[tx-robot] updated from transifex	2016-10-26 00:33:02 +00:00
Nextcloud bot	21fa873d5a	[tx-robot] updated from transifex	2016-10-25 09:40:11 +00:00
Andy Scherzinger	d74fe507a1	Merge pull request #352 from nextcloud/enlargeIcon ... enlarged icon	2016-10-21 21:46:07 +02:00
tobiasKaminsky	95fb6c451a	enlarged icon	2016-10-20 22:01:33 +02:00
Tobias Kaminsky	c548e5adbe	Merge pull request #349 from nextcloud/codacyBadge ... added codacy badge	2016-10-19 18:06:03 +02:00
Andy Scherzinger	8ace0d0d11	Merge pull request #328 from apicellaj/master ... add preference to show hidden files	2016-10-19 17:17:06 +02:00
Andy Scherzinger	e5805358ca	added codacy badge ... added codacy badge (code review/checks)	2016-10-19 14:07:26 +02:00