3549 commits

Author	SHA1	Message	Date
Mario Danic	b0835b981f	Significant progress on various things	2017-03-14 21:59:22 +01:00
Mario Danic	add50e3149	Use favourite	2017-03-14 21:59:22 +01:00
Mario Danic	bb3dfac2d4	Some progress on search	2017-03-14 21:59:21 +01:00
AndyScherzinger	4a14fdc33b	empty view star icon	2017-03-14 21:59:21 +01:00
AndyScherzinger	1415efe7f2	missing xxhdpi favorite icon	2017-03-14 21:59:20 +01:00
AndyScherzinger	4218c02522	xxxhdpi favorite icons	2017-03-14 21:59:20 +01:00
AndyScherzinger	3a345a5e5a	grey star icon (80% opacity)	2017-03-14 21:59:20 +01:00
Mario Danic	3fa0c5ca32	Refactor available offline	2017-03-14 21:59:19 +01:00
AndyScherzinger	2fbc7d05cf	Merge branch 'master' of https://github.com/nextcloud/android into branding	2017-03-14 21:56:31 +01:00
Mario Danic	f14d340dae	Add all required screen names	2017-03-06 12:08:51 +01:00
Mario Danic	1732f7dc73	Some work on Firebase integration	2017-03-06 09:58:50 +01:00
Mario Danic	21e8f5530b	Merge branch 'master' into branding	2017-03-06 08:10:16 +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
Mario Danic	b7e41eeff1	Fix gradle and supresswarnings issue	2017-03-05 21:20:54 +01:00
Mario Danic	db829c5e56	Remove useless files	2017-03-05 21:11:29 +01:00
Mario Danic	0ffb67c506	Merge branch 'branding' into bring-branding-to-master ... # Conflicts: # .drone.yml # build.gradle # src/main/java/com/owncloud/android/services/SyncedFolderJobService.java # src/main/java/com/owncloud/android/services/observer/SyncedFolderObserver.java # src/main/java/com/owncloud/android/utils/RecursiveFileObserver.java	2017-03-05 21:09:36 +01:00
Mario Danic	b801310ce2	Fix crashes	2017-03-05 17:46:20 +01:00
Mario Danic	657dbcd03e	Fix quota crash	2017-03-03 18:52: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
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	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	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	3b755d48d2	Clean up code	2017-03-03 11:08:03 +01:00
Mario Danic	4bf833cf4d	Chande delay slightly	2017-03-03 11:08:02 +01:00
Mario Danic	488c41d134	Fix path	2017-03-03 11:08:02 +01:00
Mario Danic	c935617898	Attempt to fix	2017-03-03 11:08:02 +01:00
Mario Danic	49c27b1464	Revert "Attempt to fix stuff" ... This reverts commit 58b640a8c85f090c9d8b9fc8de342e95a708f7a0.	2017-03-03 11:08:01 +01:00
Mario Danic	8bfdd0047c	Attempt to fix stuff	2017-03-03 11:08:01 +01:00