tobiasKaminsky
|
59fafc7b3d
|
function is private
fix modified, but will soon be removed
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
|
2018-01-15 13:24:07 +01:00 |
|
tobiasKaminsky
|
88498e4071
|
use copy & delete instead of move
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
|
2018-01-15 12:40:15 +01:00 |
|
Mario Danic
|
1c8d46f9ff
|
Revert change
Signed-off-by: Mario Danic <mario@lovelyhq.com>
|
2018-01-15 11:23:33 +01:00 |
|
Mario Danic
|
ffb33a3ed8
|
Remove double dep
Signed-off-by: Mario Danic <mario@lovelyhq.com>
|
2018-01-15 11:23:33 +01:00 |
|
Mario Danic
|
f626f58378
|
Attempt to fix moves
Signed-off-by: Mario Danic <mario@lovelyhq.com>
|
2018-01-15 11:23:33 +01:00 |
|
tobiaskaminsky
|
45f7cb1cc7
|
linebreaks
Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
|
2018-01-15 11:23:32 +01:00 |
|
Mario Danic
|
66711f215c
|
Fix code review issues
Signed-off-by: Mario Danic <mario@lovelyhq.com>
|
2018-01-15 11:23:32 +01:00 |
|
Mario Danic
|
4c6a98d8af
|
Add new line
Signed-off-by: Mario Danic <mario@lovelyhq.com>
|
2018-01-15 11:23:32 +01:00 |
|
Mario Danic
|
ee7d4ed56c
|
Implement keys migration
Signed-off-by: Mario Danic <mario@lovelyhq.com>
|
2018-01-15 11:23:32 +01:00 |
|
Mario Danic
|
d56f53bb11
|
Fix uploads
Signed-off-by: Mario Danic <mario@lovelyhq.com>
|
2018-01-15 11:23:31 +01:00 |
|
Mario Danic
|
845e85fb24
|
Most improvements
Signed-off-by: Mario Danic <mario@lovelyhq.com>
|
2018-01-15 11:23:31 +01:00 |
|
Tobias Kaminsky
|
375d66761a
|
Merge pull request #1962 from nextcloud/topOfEncryption
Detect top of encryption folders
|
2018-01-15 11:03:45 +01:00 |
|
tobiasKaminsky
|
c1fe52bbf8
|
Detect top of encryption folders
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
|
2018-01-15 10:45:43 +01:00 |
|
Tobias Kaminsky
|
de45ee75e8
|
Merge pull request #1956 from nextcloud/nc13Background
Add support for slightly modified nc13 background (bigger dots)
|
2018-01-15 10:44:22 +01:00 |
|
tobiaskaminsky
|
f54bfa1c90
|
needs gson
Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
|
2018-01-15 09:57:04 +01:00 |
|
tobiaskaminsky
|
2e4fcd3f39
|
add support for slightly modified nc13 background (bigger dots)
Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
|
2018-01-15 09:56:00 +01:00 |
|
Tobias Kaminsky
|
2f3dfd9fb8
|
Merge pull request #1930 from nextcloud/searchCrashesWhileCopy
Fix crashing search while copy/move
|
2018-01-15 09:37:10 +01:00 |
|
tobiasKaminsky
|
28d5133473
|
use library
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
|
2018-01-15 09:06:59 +01:00 |
|
tobiaskaminsky
|
12a6050867
|
add gson
Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
|
2018-01-15 09:06:55 +01:00 |
|
tobiasKaminsky
|
4ed6f1d3e1
|
temporary use lib branch
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
|
2018-01-15 09:06:44 +01:00 |
|
tobiasKaminsky
|
fab57d271e
|
search only folders when copy/move
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
|
2018-01-15 09:06:19 +01:00 |
|
tobiaskaminsky
|
157afd9d61
|
fix #1800
Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
|
2018-01-15 09:06:19 +01:00 |
|
Tobias Kaminsky
|
8d63ef5d47
|
Merge pull request #1658 from nextcloud/avatarETags
Avatar Etags
|
2018-01-15 09:04:05 +01:00 |
|
tobiaskaminsky
|
614d78ba58
|
refined annotations
added one more annotation
Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
|
2018-01-15 08:40:54 +01:00 |
|
tobiasKaminsky
|
08c33b83c4
|
annotate via custom annotation
|
2018-01-15 08:40:54 +01:00 |
|
tobiasKaminsky
|
d16ebf6e9d
|
fix missing conversion
|
2018-01-15 08:40:54 +01:00 |
|
tobiasKaminsky
|
c4cee26b1f
|
trying to first show old one, but asyncDrawable is not working
|
2018-01-15 08:40:53 +01:00 |
|
tobiasKaminsky
|
3a1c1c904b
|
Use ETag for avatars
|
2018-01-15 08:40:53 +01:00 |
|
Tobias Kaminsky
|
c650f3a341
|
Merge pull request #1944 from nextcloud/e2e_rebased
E2E
|
2018-01-15 08:40:16 +01:00 |
|
tobiasKaminsky
|
49b095db9d
|
increasing lint
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
|
2018-01-15 08:32:05 +01:00 |
|
tobiasKaminsky
|
eef69ea4ce
|
change crc32 to v28
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
|
2018-01-15 08:12:01 +01:00 |
|
tobiasKaminsky
|
f8ed3750a5
|
remove unused ressources
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
|
2018-01-15 08:12:00 +01:00 |
|
tobiasKaminsky
|
756eddb3a7
|
fix due to rebase
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
|
2018-01-15 08:12:00 +01:00 |
|
tobiasKaminsky
|
1167b82adb
|
moved methods
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
|
2018-01-15 08:12:00 +01:00 |
|
tobiasKaminsky
|
fc7b4f789c
|
enable subfolder
check if in subfolder of encrypted folder
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
|
2018-01-15 08:12:00 +01:00 |
|
tobiasKaminsky
|
a9e558160f
|
remove obsolete string
fix showing wrong string
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
|
2018-01-15 08:12:00 +01:00 |
|
tobiasKaminsky
|
23ab9bff67
|
revert versionCode/number to master
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
|
2018-01-15 08:12:00 +01:00 |
|
tobiasKaminsky
|
48f991663d
|
fix #1938
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
|
2018-01-15 08:11:59 +01:00 |
|
tobiasKaminsky
|
cfd24f306d
|
remove duplicated upgrade
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
|
2018-01-15 08:11:59 +01:00 |
|
tobiasKaminsky
|
8038791820
|
changes due to to rebase
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
|
2018-01-15 08:11:59 +01:00 |
|
tobiasKaminsky
|
b52197d8ce
|
extract RSA/AES to static string
make final
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
|
2018-01-15 08:11:59 +01:00 |
|
tobiasKaminsky
|
d5c5fb5933
|
new line
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
|
2018-01-15 08:11:59 +01:00 |
|
tobiasKaminsky
|
6043767343
|
replace printStacktrace() with Log_OC
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
|
2018-01-15 08:11:59 +01:00 |
|
tobiasKaminsky
|
3307d52dfb
|
remove printStacktrace()
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
|
2018-01-15 08:11:59 +01:00 |
|
tobiasKaminsky
|
3a8b59a0c1
|
return RemoteOperationResult on error
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
|
2018-01-15 08:11:58 +01:00 |
|
tobiasKaminsky
|
a6eae2396e
|
move public method up, add doc
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
|
2018-01-15 08:11:58 +01:00 |
|
tobiasKaminsky
|
b82cf3e167
|
new line
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
|
2018-01-15 08:11:58 +01:00 |
|
tobiasKaminsky
|
311656b0a1
|
delete stale file
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
|
2018-01-15 08:11:58 +01:00 |
|
tobiasKaminsky
|
385306e45e
|
make FolderMetadata access private and use getter/setter
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
|
2018-01-15 08:11:58 +01:00 |
|
tobiasKaminsky
|
29bcd8cd51
|
re-enable tests
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
|
2018-01-15 08:11:58 +01:00 |
|