Skip to content

Conversation

@backportbot-nextcloud
Copy link

@backportbot-nextcloud backportbot-nextcloud bot commented Mar 16, 2023

  • ⚠️ This backport had conflicts that were resolved with the 'ours' merge strategy and is likely incomplete

backport of #3909

@cypress
Copy link

cypress bot commented Mar 16, 2023

3 flaky tests on run #9189 ↗︎

0 140 1 0 Flakiness 3

Details:

[stable26] Get mimeIconUrl for media attachments without a session
Project: Text Commit: b1e7486d39
Status: Passed Duration: 03:44 💡
Started: Mar 23, 2023 10:29 PM Ended: Mar 23, 2023 10:33 PM
Flakiness  nodes/Links.spec.js • 1 flaky test

View Output Video

Test Artifacts
test link marks > link preview > shows a link preview Output Screenshots
Flakiness  sync.spec.js • 2 flaky tests

View Output Video

Test Artifacts
Sync > saves the actual file and document state Output Screenshots
Sync > recovers from a lost connection Output Screenshots

This comment has been generated by cypress-bot as a result of this project's GitHub integration settings.

@mejo- mejo- marked this pull request as ready for review March 16, 2023 21:03
@mejo-
Copy link
Member

mejo- commented Mar 16, 2023

/compile amend

@blizzz blizzz mentioned this pull request Mar 20, 2023
@mejo- mejo- modified the milestones: Nextcloud 26, Nextcloud 26.0.1 Mar 20, 2023
@juliusknorr juliusknorr added the bug Something isn't working label Mar 21, 2023
@mejo- mejo- force-pushed the backport/3909/stable26 branch from 11dac26 to f9d5d28 Compare March 23, 2023 22:10
mejo- added 3 commits March 23, 2023 23:23
* Prop `dark` for NcModal has to be a boolean
* Custom validator for prop `images` should succeed if all images have
  basename and source set, not the other way round.

Signed-off-by: Jonas <[email protected]>
In order to have non-image attachments rendered in editors without
a session, `AttachmentResolver.resolve()` should return a candidate with
the mimeType icon as url as last resort - because all endpoints from
Text `AttachmentController` require a session.

This fixes rendering of non-image attachments in RichTextReader.

Fixes: #2919

Signed-off-by: Jonas <[email protected]>
@mejo- mejo- force-pushed the backport/3909/stable26 branch from f9d5d28 to 8840265 Compare March 23, 2023 22:23
@mejo-
Copy link
Member

mejo- commented Mar 23, 2023

/compile

Signed-off-by: nextcloud-command <[email protected]>
@mejo- mejo- merged commit 8676bc6 into stable26 Mar 23, 2023
@delete-merged-branch delete-merged-branch bot deleted the backport/3909/stable26 branch March 23, 2023 22:34
@skjnldsv skjnldsv mentioned this pull request Apr 13, 2023
8 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug Something isn't working

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants