Commit graph

9706 commits

Author SHA1 Message Date
tobiaskaminsky
b8e5b8c4bf
fix DB for dev version
Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
2018-01-17 08:17:16 +01:00
Nextcloud bot
43675d9880
[tx-robot] updated from transifex 2018-01-17 06:09:03 +00:00
tobiaskaminsky
e054fbcb83
replace … with &#8230; to make it clearer for translators
Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
2018-01-17 07:03:51 +01:00
Nextcloud bot
7cc57d2e45
[tx-robot] updated from transifex 2018-01-17 01:40:40 +00:00
Tobias Kaminsky
24eab27ebb daily dev 20180117 2018-01-17 01:03:38 +01:00
Tobias Kaminsky
e4b635f6e9
Merge pull request #1967 from nextcloud/removeWhatsNew200
Remove 2.0 what's new features
2018-01-16 13:16:56 +01:00
tobiasKaminsky
3753832a9a
remove 200 features from whats new
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-01-16 11:10:36 +01:00
Nextcloud bot
5522b0b82e
[tx-robot] updated from transifex 2018-01-16 01:42:35 +00:00
Tobias Kaminsky
d403609a8f daily dev 20180116 2018-01-16 01:18:26 +01:00
Tobias Kaminsky
6bd945f145
Merge pull request #1965 from nextcloud/300rc1
3.0.0 RC1 release
2018-01-15 15:04:34 +01:00
tobiasKaminsky
e28a4ab745
Version bump & changelog
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-01-15 14:13:45 +01:00
Tobias Kaminsky
43943205ca
Merge pull request #1954 from nextcloud/new-ardevd-storage
New, overhauled data storage management
2018-01-15 14:08:43 +01:00
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