Commit graph

16347 commits

Author SHA1 Message Date
tobiasKaminsky
23ca829569
update screenshots
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-10-30 10:09:44 +01:00
tobiasKaminsky
c33e805c5d
Fix wrong background on error display of PreviewImageFragment
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-10-30 10:09:44 +01:00
Tobias Kaminsky
d09b460c84
Merge pull request #7123 from nextcloud/statusFeature
Add status to sharee
2020-10-30 10:09:08 +01:00
tobiasKaminsky
3d79b79685
changes after rebase
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-10-30 10:08:36 +01:00
Andy Scherzinger
5467576c95
Merge pull request #7169 from nextcloud/dependabot/gradle/androidx.constraintlayout-constraintlayout-2.0.4
Bump constraintlayout from 2.0.3 to 2.0.4
2020-10-30 09:21:42 +01:00
tobiasKaminsky
640820826f
changes after rebase
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-10-30 09:20:03 +01:00
tobiasKaminsky
540285560a
use primarey
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-10-30 09:20:03 +01:00
tobiasKaminsky
cfb3778a9a
Use status from lib
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-10-30 09:20:02 +01:00
Tobias Kaminsky
c2e6343e79
Merge pull request #7161 from nextcloud/serverStable20
Server stable20
2020-10-30 09:19:20 +01:00
tobiasKaminsky
c48228bcb3
Fix detekt
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-10-30 08:21:08 +01:00
Andy Scherzinger
4da28f0d8b
remove magic numbers
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2020-10-30 07:27:55 +01:00
Andy Scherzinger
7db8069ff0
reformat for ktlint
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2020-10-30 07:27:55 +01:00
Andy Scherzinger
63efedff6e
replace magic number with constants
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2020-10-30 07:27:55 +01:00
tobiasKaminsky
3a76ff78df
use stable 20 for stable tests
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-10-30 07:27:39 +01:00
Nextcloud bot
eea048b1ec
[tx-robot] updated from transifex 2020-10-30 03:44:25 +00:00
dependabot-preview[bot]
160330d83a
Bump constraintlayout from 2.0.3 to 2.0.4
Bumps constraintlayout from 2.0.3 to 2.0.4.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-10-30 02:13:02 +00:00
dependabot-preview[bot]
2ec25c2c75
Bump emoji-bundled from 1.0.0 to 1.1.0
Bumps emoji-bundled from 1.0.0 to 1.1.0.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-10-30 02:12:31 +00:00
Andy Scherzinger
fb7fd8c517
Merge pull request #7149 from nextcloud/setStatus
Set status
2020-10-29 23:56:01 +01:00
Andy Scherzinger
a542bee93f
add dark screenshots
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2020-10-29 22:55:24 +01:00
tobiasKaminsky
6d1d4a732d
Spotbugs
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-10-29 20:28:48 +01:00
tobiasKaminsky
0b8cf615e6
fix lint
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-10-29 20:28:47 +01:00
tobiasKaminsky
7d7a80af34
wip
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-10-29 20:28:46 +01:00
Andy Scherzinger
8369e4c413
optimize status dialog layout, add status active visual
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2020-10-29 20:28:45 +01:00
Andy Scherzinger
fba718ad84
set texts and move to view binding
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2020-10-29 20:28:44 +01:00
tobiasKaminsky
21fbb68a2b
emoji
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-10-29 20:27:13 +01:00
tobiasKaminsky
4244a50c52
wip
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-10-29 20:27:13 +01:00
Andy Scherzinger
f802cb3122
improved layouting
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2020-10-29 20:27:12 +01:00
tobiasKaminsky
fcb0147d71
wip
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-10-29 20:27:11 +01:00
tobiasKaminsky
ad5ca22e23
wip
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-10-29 20:27:10 +01:00
tobiasKaminsky
bff08bbc17
wip
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-10-29 20:27:09 +01:00
tobiasKaminsky
0bb5ad643f
wip
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-10-29 20:27:09 +01:00
tobiasKaminsky
c09fa8c944
wip
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-10-29 20:27:08 +01:00
tobiasKaminsky
0709076e54
wip
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-10-29 20:27:07 +01:00
tobiasKaminsky
dcc246fd58
wip
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-10-29 20:27:06 +01:00
Andy Scherzinger
4fed61d3f3
proper comment formatting
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2020-10-29 20:27:05 +01:00
Andy Scherzinger
9741cf21c9
improve detekt score
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2020-10-29 20:27:05 +01:00
Andy Scherzinger
711b2334b0
remove var prefixes
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2020-10-29 20:27:04 +01:00
Andy Scherzinger
96680fdeca
proper kotlin enum naming pattern
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2020-10-29 20:27:03 +01:00
Andy Scherzinger
4d5eb127f8
user proper license header format
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2020-10-29 20:27:03 +01:00
Andy Scherzinger
d642da450f
Remove unneeded empty lines
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2020-10-29 20:27:02 +01:00
tobiasKaminsky
dbd9e6fe9b
Add status to sharee
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-10-29 20:27:01 +01:00
Andy Scherzinger
153aa77b41
Merge pull request #6572 from nextcloud/dark
Add dark screenshots
2020-10-29 20:06:57 +01:00
Andy Scherzinger
93b38db646
updated screenshots
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2020-10-29 17:46:43 +01:00
tobiasKaminsky
f246268c9c
add missing screenshots
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-10-29 17:46:42 +01:00
tobiasKaminsky
5a2f891e6e
Add missing dark screenshots
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-10-29 17:46:41 +01:00
tobiasKaminsky
bfccf4851f
Add dark screenshots
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-10-29 17:46:41 +01:00
Nextcloud bot
81f6ba471a
[tx-robot] updated from transifex 2020-10-29 10:41:31 +00:00
Tobias Kaminsky
d4d22c4a27
Merge pull request #7124 from nextcloud/loginQR
use custom SSO value for authTokenType -> to detect if account is added by SSO
2020-10-29 09:46:48 +01:00
Tobias Kaminsky
109487ff91
Merge pull request #7102 from nextcloud/conflictAutoUpload
Upload are deleted after decision was made in conflict activity
2020-10-29 09:45:50 +01:00
Andy Scherzinger
1730499609
Merge pull request #7160 from nextcloud/fixActivityFetching
Fix activity fetching
2020-10-29 09:39:46 +01:00