Commit graph

10183 commits

Author SHA1 Message Date
Joseph Choi
203da0d5f4 Fix typo in documentations 2018-03-24 01:00:45 -04:00
Nextcloud bot
5d4c09e450
[tx-robot] updated from transifex 2018-03-24 01:44:13 +00:00
Tobias Kaminsky
7f2c9910b7 daily dev 20180324 2018-03-24 00:34:43 +01:00
Tobias Kaminsky
74c599d378
Merge pull request #2399 from nextcloud/310rc1
3.1.0RC1
2018-03-23 13:05:47 +01:00
Tobias Kaminsky
ffd902cd72
Merge pull request #2398 from nextcloud/fixExternal
Fix column name
2018-03-23 13:00:41 +01:00
Tobias Kaminsky
f2f5b7d020
Merge pull request #2039 from nextcloud/replaceListWithRecyclerView
Replace list with recycler view
2018-03-23 13:00:29 +01:00
tobiasKaminsky
34836de79d
3.1.0RC1
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-03-23 12:24:48 +01:00
Tobias Kaminsky
17203b1ab0
Update lint-results.txt 2018-03-23 12:15:17 +01:00
tobiaskaminsky
52cbdbe24f
fx column name
Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
2018-03-23 12:06:56 +01:00
tobiasKaminsky
32e58353d2
fix due to rebase
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-03-23 11:51:20 +01:00
AndyScherzinger
08c241d670
fix after rebase 2018-03-23 11:49:26 +01:00
tobiaskaminsky
e22374e4f1
re-addf grid_image to have two view on grid (image vs item)
Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
2018-03-23 11:49:26 +01:00
tobiaskaminsky
12785028a5
fix multi selection in copy/move dialog
Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
2018-03-23 11:49:26 +01:00
tobiasKaminsky
c05243b0d3
use List as type instead of ArrayList
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-03-23 11:49:26 +01:00
nextcloud-android-bot
316a9d9efc
Drone: update Lint results to reflect reduced error/warning count [skip ci] 2018-03-23 11:49:26 +01:00
tobiasKaminsky
2cf8c4c50f
adapted during rebase
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-03-23 11:49:26 +01:00
tobiaskaminsky
a2fac73af3
fix upload list
Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
2018-03-23 11:49:02 +01:00
tobiasKaminsky
b67e606519
fix codacy
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-03-23 11:49:02 +01:00
tobiasKaminsky
15f549fc8e
cleanup
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-03-23 11:49:02 +01:00
tobiasKaminsky
6d7cc6b869
Replace ListView with RecyclerView
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-03-23 11:49:02 +01:00
Andy Scherzinger
0d63edb93e
Merge pull request #2206 from nextcloud/externalFolderIcon
Add showing icon on external folders
2018-03-23 11:46:11 +01:00
AndyScherzinger
d26c57ae24
add "Merge" as yet another approval keyword 2018-03-23 11:36:23 +01:00
AndyScherzinger
65c8f8f815
remove unneeded fillType 2018-03-23 11:36:23 +01:00
Tobias Kaminsky
c65921f15b
new line 2018-03-23 11:36:22 +01:00
tobiasKaminsky
cbb9e0cbde
add showing icon on external folders
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-03-23 11:36:22 +01:00
Andy Scherzinger
b66c5975fb
Merge pull request #2372 from nextcloud/improve-notifications
Fixes #2315 and other issues
2018-03-23 11:32:48 +01:00
tobiasKaminsky
2e98d22771
earlier assign account
also set account in activity for drawer background

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-03-23 10:56:27 +01:00
Tobias Kaminsky
e5741e04c0
Merge pull request #2370 from nextcloud/disabledE2E
If e2e app is disabled, show info
2018-03-23 07:55:08 +01:00
Nextcloud bot
1ffbe8f599
[tx-robot] updated from transifex 2018-03-23 01:41:04 +00:00
Tobias Kaminsky
f8a5c0c0e1 daily dev 20180323 2018-03-23 00:34:24 +01:00
Mario Danic
15b542c1a6 Update for CR
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2018-03-22 18:08:48 +01:00
Mario Danic
fef28eb68e CR fixes
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2018-03-22 18:06:18 +01:00
tobiaskaminsky
45b9f9f7c7
changes due to CR
Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
2018-03-22 17:30:28 +01:00
tobiaskaminsky
530b545d2e
if e2e app is disabled, show info
Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
2018-03-22 17:30:28 +01:00
Andy Scherzinger
c1c0a4b5ae
Update build.gradle 2018-03-22 14:51:39 +01:00
Andy Scherzinger
62db03668a
Update build.gradle 2018-03-22 14:49:01 +01:00
Andy Scherzinger
958257ba74
Merge pull request #2387 from nextcloud/fileNotFound
OnServiceConnnected: File not found
2018-03-22 14:11:38 +01:00
Andy Scherzinger
ab0e954d7f
Merge pull request #2348 from nextcloud/modTimestamp
Use modification date from server
2018-03-22 14:08:46 +01:00
Andy Scherzinger
7af5beb76c
Merge pull request #2383 from nextcloud/contextMightNull
context might be null, so fallback
2018-03-22 14:07:15 +01:00
Tobias Kaminsky
6156a53034
Merge pull request #2384 from nextcloud/initThumbnailCache
Init thumbnail cache: catch all exceptions
2018-03-22 12:08:45 +01:00
Tobias Kaminsky
93c270250a
Merge pull request #2369 from nextcloud/noBlockingSync
No blocking sync dialog
2018-03-22 12:07:06 +01:00
Tobias Kaminsky
93d7001fb2
Merge pull request #2385 from nextcloud/accountMightNull
Drawer: check if account is null
2018-03-22 12:05:29 +01:00
Mario Danic
e36d0c5b0a Fix year
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2018-03-22 07:47:10 +01:00
Nextcloud bot
604a8b3126
[tx-robot] updated from transifex 2018-03-22 01:42:23 +00:00
Tobias Kaminsky
36d8bfa7cc daily dev 20180322 2018-03-22 00:34:35 +01:00
tobiasKaminsky
88b4ef9ffc
add @Nullable to warn via IDE
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-03-21 14:14:01 +01:00
tobiasKaminsky
de5bec442a
file not found
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-03-21 14:11:56 +01:00
tobiasKaminsky
b826fa4d9c
check if account is null
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-03-21 13:42:55 +01:00
tobiasKaminsky
da077e0195
catch all exceptions
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-03-21 13:17:55 +01:00
tobiaskaminsky
685e30d62d
context might be null, so fallback
Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
2018-03-21 12:50:19 +01:00