Commit graph

15381 commits

Author SHA1 Message Date
Tobias Kaminsky
c289e61b39
Merge pull request #6257 from nextcloud/fixUnitTests
Fix unit tests
2020-06-10 07:29:40 +02:00
tobiasKaminsky
5aeba5e021
enhance uploadReport script
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-06-10 07:12:36 +02:00
Nextcloud bot
740c3fe2ba
[tx-robot] updated from transifex 2020-06-10 03:29:39 +00:00
Andy Scherzinger
613b98ae1b
Merge pull request #6254 from nextcloud/replaceEdgeColors
replace edge colors
2020-06-09 20:37:29 +02:00
tobiasKaminsky
5ba2aff146
Fix unit tests
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-06-09 16:35:11 +02:00
Andy Scherzinger
29ed661cec
Merge pull request #6236 from nextcloud/dependabot/gradle/com.karumi-shot-4.3.0
Bump shot from 4.1.1 to 4.3.0
2020-06-09 14:36:39 +02:00
tobiasKaminsky
e95caf3572
centralize intent creation for
- FileUploader
- ConflictsResolveActivity

fix #5281: click on conflict notification opens conflict dialog directly

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-06-09 14:13:23 +02:00
Andy Scherzinger
5472ec40e2
Merge pull request #6221 from nextcloud/removeSortSwitch
remove action_sort
2020-06-09 14:04:38 +02:00
tobiasKaminsky
f028eefd83
replace edge colors
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-06-09 12:11:58 +02:00
dependabot-preview[bot]
2e8fd6aba1
Bump shot from 4.1.1 to 4.3.0
Bumps [shot](https://github.com/karumi/shot) from 4.1.1 to 4.3.0.
- [Release notes](https://github.com/karumi/shot/releases)
- [Changelog](https://github.com/Karumi/Shot/blob/master/release.gradle)
- [Commits](https://github.com/karumi/shot/compare/4.1.1...4.3.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-06-09 08:23:42 +02:00
Tobias Kaminsky
3965af0cfc
Merge pull request #6214 from nextcloud/fixods
Fix crash when creating client
2020-06-09 08:03:33 +02:00
tobiasKaminsky
fe8b0fba77
remove action_sort
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-06-09 08:00:55 +02:00
Nextcloud bot
6f9db5475e
[tx-robot] updated from transifex 2020-06-09 03:27:26 +00:00
Stefan Niedermann
a0bf78e7b4 Merge remote-tracking branch 'origin/view-binding' into view-binding
# Conflicts:
#	src/main/java/com/owncloud/android/ui/fragment/ShareFileFragment.java
2020-06-08 19:52:07 +02:00
Stefan Niedermann
8b1396f73a #6247 View Binding - ShareFileFragment (Remove Jetbrains annotation)
Signed-off-by: Stefan Niedermann <info@niedermann.it>
2020-06-08 19:45:24 +02:00
Stefan Niedermann
b13e828b87 #6247 View Binding - ShareFileFragment
Signed-off-by: Stefan Niedermann <info@niedermann.it>
2020-06-08 19:45:24 +02:00
Stefan Niedermann
53fcf81b75 #6247 View Binding - ShareFileFragment 2020-06-08 14:24:07 +02:00
Andy Scherzinger
3c0415e417
Merge pull request #6246 from nextcloud/accountChosenStreamline
use check arrow for chosen account
2020-06-08 11:51:53 +02:00
tobiasKaminsky
ec12ad56d4
use check arrow for chosen account
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-06-08 10:03:38 +02:00
tobiasKaminsky
8cec637c24
manually increase findbugs
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-06-08 08:43:12 +02:00
Nextcloud bot
392961dbe6
[tx-robot] updated from transifex 2020-06-08 03:26:05 +00:00
Nextcloud bot
d2f1f33ef0
[tx-robot] updated from transifex 2020-06-07 03:27:06 +00:00
Andy Scherzinger
ec5dcefc7d
Merge pull request #6226 from nextcloud/tool-hints
Added some tool hints for easier development
2020-06-06 09:19:57 +02:00
Nextcloud bot
1671ba29c8
[tx-robot] updated from transifex 2020-06-06 03:29:33 +00:00
Stefan Niedermann
d2a56f871b Fix format
Signed-off-by: Stefan Niedermann <info@niedermann.it>
2020-06-05 19:55:30 +02:00
Stefan Niedermann
94e72e9293 Added some tool hints for easier development
Signed-off-by: Stefan Niedermann <info@niedermann.it>
2020-06-05 19:55:30 +02:00
Andy Scherzinger
ddb8ee9fd1
Merge pull request #6222 from nextcloud/fix/MarkdwondPreview
set gradient via imageview for markdown previews
2020-06-05 15:52:19 +02:00
Andy Scherzinger
f07c535fba
Merge pull request #6224 from nextcloud/invertActivity
Activity stream on dark mode
2020-06-05 15:47:26 +02:00
Andy Scherzinger
94b31a0a37
set gradient via imageview for markdown previews
Fixes #6034

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2020-06-05 13:36:39 +02:00
tobiasKaminsky
b625cdaddb
invert activity icon on dark mode
removed outer white border on shared_via_ink

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-06-05 12:08:49 +02:00
Andy Scherzinger
3d5d6ea739
Merge pull request #6220 from nextcloud/dependabot/gradle/net.bytebuddy-byte-buddy-1.10.11
Bump byte-buddy from 1.10.10 to 1.10.11
2020-06-05 11:16:26 +02:00
Andy Scherzinger
cad9e59435
Merge pull request #6218 from nextcloud/moveFails
Fix move/copy to root folder
2020-06-05 08:59:35 +02:00
Tobias Kaminsky
b996cced68
Merge pull request #5927 from nextcloud/dependabot/gradle/com.karumi-shot-4.1.1
Bump shot from 3.1.0 to 4.1.1
2020-06-05 08:40:27 +02:00
tobiasKaminsky
80d83e4721
split up unit&IT tests from screenshot tests
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-06-05 08:06:42 +02:00
tobiasKaminsky
d0f3a00637
drone/ updateScreenshot update
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-06-05 08:06:42 +02:00
dependabot-preview[bot]
ee6e5311b8
Bump shot from 3.1.0 to 4.1.1
Bumps [shot](https://github.com/karumi/shot) from 3.1.0 to 4.1.1.
- [Release notes](https://github.com/karumi/shot/releases)
- [Changelog](https://github.com/Karumi/Shot/blob/master/release.gradle)
- [Commits](https://github.com/karumi/shot/compare/3.1.0...4.1.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-06-05 08:06:42 +02:00
Tobias Kaminsky
d1f17df63c
Merge pull request #6035 from nextcloud/enh/capabilities-etag
Add etag column to capabilities table
2020-06-05 07:28:06 +02:00
Nextcloud bot
409947cb10
[tx-robot] updated from transifex 2020-06-05 03:26:17 +00:00
dependabot-preview[bot]
ba6a38de64
Bump byte-buddy from 1.10.10 to 1.10.11
Bumps [byte-buddy](https://github.com/raphw/byte-buddy) from 1.10.10 to 1.10.11.
- [Release notes](https://github.com/raphw/byte-buddy/releases)
- [Changelog](https://github.com/raphw/byte-buddy/blob/master/release-notes.md)
- [Commits](https://github.com/raphw/byte-buddy/compare/byte-buddy-1.10.10...byte-buddy-1.10.11)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-06-05 01:12:18 +00:00
Andy Scherzinger
f0f700900f
Merge pull request #6216 from nextcloud/richworkspacesFirstRow
show rich workspace in grid spanned across first row
2020-06-04 21:03:25 +02:00
Andy Scherzinger
27214ae138
Merge pull request #6193 from nextcloud/receiveExternalChange
Sort/list change for ReceiveExternalFilesActivity.java
2020-06-04 19:08:32 +02:00
tobiasKaminsky
d446d9eae9
show rich workspace in grid spanned across first row
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-06-04 16:51:37 +02:00
Andy Scherzinger
352cdb6332
Merge pull request #6213 from nextcloud/fix/action-mode-crash
Fixed a bug relative to actionmode + Enhanced actionmode behaviour
2020-06-04 16:43:51 +02:00
tobiasKaminsky
20a63a6cde
fix #6137
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-06-04 16:31:44 +02:00
tobiasKaminsky
07dc18339a
Fix crash when creating client
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-06-04 15:44:03 +02:00
Kilian P
1dd3c986c4
Adjusted one comment 2020-06-04 15:35:07 +02:00
Kilian Périsset
6a6231ef5e
Fixed a bug relative to actionmode + Enhanced actionmode behaviour
Signed-off-by: Kilian Périsset <kilian.perisset@infomaniak.com>
2020-06-04 15:28:34 +02:00
tobiasKaminsky
2a3fd4287e
Fix after rebase
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2020-06-04 15:16:57 +02:00
Daniel Kesselberg
a86038ebab
Add local variable for storageManager
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2020-06-04 15:14:57 +02:00
Daniel Kesselberg
ca8a89b930
Add etag column to capabilities table
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2020-06-04 15:14:55 +02:00