6593 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Nextcloud bot	f91e1b3fef	[tx-robot] updated from transifex	2017-03-12 01:21:20 +00:00
Nextcloud bot	56e4bd70bf	[tx-robot] updated from transifex	2017-03-11 01:20:27 +00:00
Nextcloud bot	3047086e85	[tx-robot] updated from transifex	2017-03-09 01:19:33 +00:00
Nextcloud bot	81d97673e5	[tx-robot] updated from transifex	2017-03-08 01:18:58 +00:00
Nextcloud bot	3590e67813	[tx-robot] updated from transifex	2017-03-06 01:18:48 +00:00
Andy Scherzinger	61b7cbd5c3	Merge pull request #723 from nextcloud/more-search-fixes ... Various search fixes	2017-03-05 22:33:53 +01:00
Mario Danic	d3ec3b3c46	Remove useless import	2017-03-05 22:24:26 +01:00
Mario Danic	cfe8d3c064	Various search fixes	2017-03-05 22:15:27 +01:00
Andy Scherzinger	20bb144533	Merge pull request #718 from nextcloud/fix-search-crash ... Fix crashes	2017-03-05 18:55:24 +01:00
Mario Danic	b801310ce2	Fix crashes	2017-03-05 17:46:20 +01:00
Nextcloud bot	a7be471925	[tx-robot] updated from transifex	2017-03-05 14:47:56 +00:00
Nextcloud bot	6ac769210e	[tx-robot] updated from transifex	2017-03-05 01:18:43 +00:00
Nextcloud bot	6889487e2d	[tx-robot] updated from transifex	2017-03-04 01:18:32 +00:00
Mario Đanić	e883ac19f3	Merge pull request #713 from nextcloud/fix-quota-crash ... Fix quota crash	2017-03-03 19:04:13 +01:00
Mario Danic	657dbcd03e	Fix quota crash	2017-03-03 18:52:10 +01:00
Mario Đanić	f0bbb4b562	Merge pull request #615 from nextcloud/rewrite-auto-upload ... Rewrite auto upload	2017-03-03 16:51:12 +01:00
AndyScherzinger	c5f748dffb	use latest lib version	2017-03-03 16:18:05 +01:00
AndyScherzinger	b6118748d9	Changelog for 1.4.2	2017-03-03 14:37:10 +01:00
Mario Danic	5fee93d975	Declare string where needed	2017-03-03 11:08:13 +01:00
Mario Danic	a53e289a3e	This is useless	2017-03-03 11:08:13 +01:00
Mario Danic	c9749698fa	Fix a bug	2017-03-03 11:08:12 +01:00
Mario Danic	4f461b788e	Fix	2017-03-03 11:08:12 +01:00
AndyScherzinger	35284f93a5	made expected path a local variable since it is only used in one place	2017-03-03 11:08:12 +01:00
Mario Danic	832f2c4733	Put delete file back	2017-03-03 11:08:11 +01:00
Mario Danic	de3fe5e7df	Attempt to fix move	2017-03-03 11:08:11 +01:00
Mario Danic	bb20395e98	Revert "Revert "Try to fix changes between upload behaviour"" ... This reverts commit e7da3ede5e. # Conflicts: # src/com/owncloud/android/operations/UploadFileOperation.java	2017-03-03 11:08:11 +01:00
Mario Danic	b3e668ffa6	Remove useless import	2017-03-03 11:08:10 +01:00
AndyScherzinger	f13b1f2ef2	minor reformatting and javaDoc fixes	2017-03-03 11:08:10 +01:00
AndyScherzinger	16d81b4fa6	extract pattern to a constant	2017-03-03 11:08:10 +01:00
Mario Danic	62126daff2	Update stuff according to review	2017-03-03 11:08:09 +01:00
AndyScherzinger	b2e8cff801	change documentation	2017-03-03 11:08:09 +01:00
AndyScherzinger	5de19e2936	removed unnecessary line break	2017-03-03 11:08:09 +01:00
Mario Danic	9d45479f0f	Update android job	2017-03-03 11:08:08 +01:00
Mario Danic	01e9a3568e	Update dependency	2017-03-03 11:08:08 +01:00
AndyScherzinger	8f3c052ab5	remove unnecessary line break	2017-03-03 11:08:08 +01:00
AndyScherzinger	650a09d52c	moved legacyClean flag to app's PreferenceManager	2017-03-03 11:08:07 +01:00
AndyScherzinger	1bd5113589	cleanup MediaStore on upload behavior "delete"	2017-03-03 11:08:07 +01:00
Mario Danic	4c86922597	Revert "Use stable android-job lib" ... This reverts commit 1c28fc69bad34cd781dfe655fa051a622d7b2e62.	2017-03-03 11:08:07 +01:00
Mario Danic	0be1f75d5b	Remove unused imports	2017-03-03 11:08:06 +01:00
Mario Danic	c09f9e9ae5	Remove vars we don’t use	2017-03-03 11:08:06 +01:00
Mario Danic	aa10589e55	Show all uploads	2017-03-03 11:08:06 +01:00
AndyScherzinger	316554f5a5	added break to switch statement	2017-03-03 11:08:05 +01:00
AndyScherzinger	5e5e9b609f	remove warning, adding generic brackets	2017-03-03 11:08:05 +01:00
AndyScherzinger	bdb3a566a5	rename function to deleteSyncedFoldersNotInList	2017-03-03 11:08:05 +01:00
Mario Danic	e245b1f91d	Revert "Remove play services" ... This reverts commit d860d942ede22fb53d6d610a99d3e71ad18a7be7.	2017-03-03 11:08:04 +01:00
Mario Danic	56a9998efb	Remove play services	2017-03-03 11:08:04 +01:00
Mario Danic	065cbd9d93	Remove magic	2017-03-03 11:08:04 +01:00
Mario Danic	80de60a51f	Delete delay for delete	2017-03-03 11:08:03 +01:00
Mario Danic	96cfa5d16f	Use stable android-job lib	2017-03-03 11:08:03 +01:00
Mario Danic	3b755d48d2	Clean up code	2017-03-03 11:08:03 +01:00