Bugfix. Conflict resolution button not clickable. #5766
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov Report
Additional details and impacted files@@ Coverage Diff @@
## master #5766 +/- ##
==========================================
- Coverage 60.36% 60.33% -0.03%
==========================================
Files 143 143
Lines 18518 18518
==========================================
- Hits 11178 11173 -5
- Misses 7340 7345 +5 |
claucambra
approved these changes
Jun 6, 2023
mgallien
force-pushed
the
bugfix/conflict-resolution-button-in-activity-not-working
branch
from
e369109 to
b4b95a6
Compare
mgallien
requested review from
a team and
camilasan
and removed request for
a team
|
/backport to stable-3.9 |
Signed-off-by: alex-z <[email protected]>
mgallien
force-pushed
the
bugfix/conflict-resolution-button-in-activity-not-working
branch
from
b4b95a6 to
fd69e6d
Compare
|
Kudos, SonarCloud Quality Gate passed!
|
|
AppImage file: nextcloud-PR-5766-fd69e6dacab70c63f180d863d06afafecde73bfc-x86_64.AppImage |
mgallien
deleted the
bugfix/conflict-resolution-button-in-activity-not-working
branch
|
Not fixed in 3.10.0 though it claims to have been. Button is still not accessible to be clicked. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
modelproperty is not the entire activity item model,activityDatacustom property must be used