10131 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
tobiasKaminsky	84e9519807	changes due to CR ... Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>	2018-03-15 14:40:01 +01:00
tobiaskaminsky	191a55a825	list files can be null ... Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>	2018-03-15 14:39:59 +01:00
Andy Scherzinger	4b0b49f2af	Merge pull request #2253 from nextcloud/improve-sync ... Improve syncing code	2018-03-15 13:05:39 +01:00
Mario Danic	b443737e80	Try to fix job detection ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2018-03-15 12:37:46 +01:00
Mario Danic	28818b39e4	Fix a bug ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2018-03-15 12:37:46 +01:00
Mario Danic	65cc28e79f	Remove locks ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2018-03-15 12:37:44 +01:00
Mario Danic	0ddc264e0b	Rename a method ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2018-03-15 12:37:43 +01:00
Mario Danic	26c8966eb3	Use getters & setters ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2018-03-15 12:37:43 +01:00
Mario Danic	4f51489210	Scope ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2018-03-15 12:37:42 +01:00
Mario Danic	2a558cee2b	Not needed ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2018-03-15 12:37:42 +01:00
Mario Danic	0697f56f48	Schedule, just in case ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2018-03-15 12:37:41 +01:00
Mario Danic	b70831e939	Check if internet is walled ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2018-03-15 12:37:41 +01:00
Mario Danic	f07d5a8180	Improve syncing code ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2018-03-15 12:37:38 +01:00
Andy Scherzinger	aa1f5f8166	Merge pull request #2262 from nextcloud/naturalSorting ... Add natural sorting	2018-03-15 12:23:20 +01:00
tobiaskaminsky	ce970cf42b	fix wrong folder sorting, when OCFile.compareTo() is used ... added testcases Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>	2018-03-15 12:16:08 +01:00
tobiasKaminsky	d95e8a98a6	Natural sorting, for digits use value (01 -> 1), order by leading zeros (1 > 01) ... use AlphanumComparator also for folder comparison Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>	2018-03-15 12:16:07 +01:00
tobiasKaminsky	c5d492cee9	Natural sorting, for digits use value (01 -> 1), order by leading zeros (1 > 01) ... Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>	2018-03-15 12:16:04 +01:00
Andy Scherzinger	6b000595b1	Merge pull request #2228 from nextcloud/timSortNullCheck ... TimSort: Add correct null check	2018-03-15 11:35:20 +01:00
Mario Đanić	c0865f3548	Merge pull request #2252 from nextcloud/contentResolver ... App context is maybe null, so use getContentResolver() directly	2018-03-15 10:49:26 +01:00
Mario Đanić	9506c81379	Merge pull request #2179 from nextcloud/newDrone32 ... New drone version	2018-03-15 10:42:08 +01:00
Mario Đanić	b1cd940de7	Merge pull request #2160 from nextcloud/trimTwitter ... Make multiple whitespaces on twitter working	2018-03-15 10:40:57 +01:00
Mario Đanić	b0af6f5e61	Merge pull request #2038 from nextcloud/enhanceSyncSpeed ... Speed up sync	2018-03-15 10:35:59 +01:00
Nextcloud bot	afcf698ad9	[tx-robot] updated from transifex	2018-03-15 06:32:05 +00:00
Nextcloud bot	ce87ef2fd1	[tx-robot] updated from transifex	2018-03-15 01:41:05 +00:00
Tobias Kaminsky	2169ce413f	daily dev 20180315	2018-03-15 00:34:29 +01:00
Andy Scherzinger	a2804e74d4	Merge pull request #2251 from nextcloud/NPEifNothingReceived ... if nothing received to upload, app crashed	2018-03-14 22:05:55 +01:00
tobiaskaminsky	033b8a9c95	simplify ... Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>	2018-03-14 22:00:51 +01:00
tobiasKaminsky	c9634022d2	if nothing received to upload, app crashed ... Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>	2018-03-14 22:00:51 +01:00
Andy Scherzinger	2fe9db5146	Merge pull request #2221 from nextcloud/copyMoveStartWithCurrentFolder ... Copy/move starts within current folder	2018-03-14 22:00:04 +01:00
tobiasKaminsky	3386de1a94	copy/move starts within current folder ... Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>	2018-03-14 21:53:08 +01:00
Andy Scherzinger	bc3e1073a5	Merge pull request #2233 from nextcloud/showFilesInFolderPicker ... Show files in FolderPicker	2018-03-14 21:51:51 +01:00
tobiasKaminsky	228a69a38f	show files during copy, move, remote folder select on synced folder ... Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>	2018-03-14 21:44:20 +01:00
Andy Scherzinger	f991055656	Merge pull request #2218 from nextcloud/noMultiAccountIntro ... Show multiaccount intro only if multiaccount is enabled	2018-03-14 21:43:23 +01:00
tobiasKaminsky	099f52ce03	show multiaccount intro only if multiaccount is enabled ... Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>	2018-03-14 21:37:07 +01:00
Andy Scherzinger	b805a7182d	Merge pull request #2260 from nextcloud/npeNotificationManager ... Try to prevent NPE on notification manager	2018-03-14 21:31:35 +01:00
tobiaskaminsky	fa17f55eaf	try to prevent NPE on notification manager ... Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>	2018-03-14 21:20:22 +01:00
tobiaskaminsky	e5988fe7c7	use modification date from server ... Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>	2018-03-14 11:50:53 +01:00
Andy Scherzinger	4a903aa0a7	Merge pull request #2347 from nextcloud/directlyContentResolver ... Use contentResolver directly	2018-03-14 10:15:35 +01:00
tobiaskaminsky	48e3036e36	use contentResolver directly ... Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>	2018-03-14 09:55:46 +01:00
Andy Scherzinger	fbe1fb8d22	Merge pull request #2311 from ardevd/2269-apk ... Added the REQUEST_INSTALL_PACKAGES permission to the Android manifest.	2018-03-14 09:33:25 +01:00
eho	897a25d0fc	Added the REQUEST_INSTALL_PACKAGES permission to the Android manifest. ... With API 26 (Android O) any app that wants to install unknown apps must declare the REQUEST_INSTALL_PACKAGES permission. The user can then control what specific apps should be allowed to install unknown apps unlike the previous system where it was a system wide binary option for all apps. Without this declared permission the Nextcloud app will not be able to install apk's that the user have in their Nextcloud storage. With this permission added the user will be prompted to grant the app permission to install apps from unknown sources should they attempt to do so . This fixes #2269 and #2266	2018-03-14 09:25:16 +01:00
Andy Scherzinger	d3c8bc242b	Merge pull request #2338 from nextcloud/updateChangelog ... Update changelog	2018-03-14 09:01:40 +01:00
Nextcloud bot	bb0711e944	[tx-robot] updated from transifex	2018-03-14 01:47:48 +00:00
Tobias Kaminsky	6a4b3e7f7b	daily dev 20180314	2018-03-14 00:34:34 +01:00
Mario Danic	23f80f3e45	Use magical vectors ... Signed-off-by: Mario Danic <mario@lovelyhq.com>	2018-03-13 22:19:20 +01:00
Andy Scherzinger	6e044f0b62	Update lint-results.txt	2018-03-13 22:18:10 +01:00
Andy Scherzinger	148a509f2c	Merge pull request #2331 from nextcloud/sendIcon ... Send icons: icon size, app chooser	2018-03-13 22:08:29 +01:00
nextcloud-android-bot	910df75120	Drone: update Lint results to reflect reduced error/warning count [skip ci]	2018-03-13 20:41:27 +00:00
AndyScherzinger	d45408bae5	fix CR	2018-03-13 21:30:39 +01:00
tobiaskaminsky	a12d41c884	equal sized icon ... fix showing app chooser twice Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>	2018-03-13 21:30:38 +01:00