Commit graph

9996 commits

Author SHA1 Message Date
Mario Danic
94ecf17b63 Update for generic
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2018-03-20 09:04:25 +01:00
Mario Danic
182028c631 Remove useless replace
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2018-03-19 20:04:03 +01:00
Mario Danic
5105709e0a Update scopes
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2018-03-19 14:51:47 +01:00
Mario Danic
43a471b8f6 Update ifs
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2018-03-19 14:49:19 +01:00
Mario Danic
8e778844bf Fix newlines
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2018-03-19 14:47:29 +01:00
Mario Danic
c1dc6e570f Fixes #2315 and other issues
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2018-03-19 14:35:52 +01:00
Nextcloud bot
c9a95bdae9
[tx-robot] updated from transifex 2018-03-18 01:40:40 +00:00
Nextcloud bot
3afaf2f3ee
[tx-robot] updated from transifex 2018-03-17 01:39:56 +00:00
Nextcloud bot
1450091004
[tx-robot] updated from transifex 2018-03-16 01:42:49 +00:00
Tobias Kaminsky
69f17a2dc0 daily dev 20180316 2018-03-16 00:34:42 +01:00
Andy Scherzinger
8a1d6acfad
Update lint-results.txt 2018-03-15 17:54:24 +01:00
Andy Scherzinger
2f8b93e7fe
Merge pull request #2222 from nextcloud/versionDevLib
Move lib implementation to flavors
2018-03-15 17:53:56 +01:00
tobiasKaminsky
9cf911b5c2
move lib implementation to flavors
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-03-15 16:09:43 +01:00
Andy Scherzinger
fbe1d9842f
Merge pull request #2211 from nextcloud/serverVersionNotNullable
Instead of returning null on getServerVersion(), it returns now a version
2018-03-15 15:55:10 +01:00
tobiasKaminsky
8ee0168544
changes due to CR
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-03-15 15:01:15 +01:00
tobiasKaminsky
08ff99e07d
instead of returning null on getServerVersion(), it returns now a very latest NC10 version
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-03-15 15:01:12 +01:00
Andy Scherzinger
2ebcec12c7
Merge pull request #2090 from nextcloud/listFilesNull
List files can be null
2018-03-15 14:47:15 +01:00
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