Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix episode overview markdown render #5680

Conversation

Chaitanya-Shahare
Copy link
Contributor

Changes

  • used markdownIt to render the markdown in the episode's overview, as expected (and done in detail view of the episode)

Issues
Fixes #5679

Screenshots

Before

image

After

image

@Chaitanya-Shahare Chaitanya-Shahare requested a review from a team as a code owner June 7, 2024 08:40
@Shadowghost
Copy link
Contributor

Should this be PRed agains 10.9 since it's technically a bugfix?

@Chaitanya-Shahare
Copy link
Contributor Author

Should this be PRed agains 10.9 since it's technically a bugfix?

I'm new to this repository, so please excuse me if this is obvious.

Do I have to make any changes to this PR?

@dmitrylyzo
Copy link
Contributor

Do I have to make any changes to this PR?

Personally, I consider this PR as a bugfix because we use Markdown+HTML in the item details (#4393) but forgot to do the same in the episode list (this PR).
This PR also fixes possible XSS vulnerability (by sanitizing Overview).
Thus, it should target the release branch.

  1. Rebase your branch in the interactive mode on release-10.9.z branch, leaving only related commits.
  2. Verify that everything is correct (Currently there should be your 3 commits over the release branch. Actually, I would squash them in one commit). Force push your rebased branch to your repo. This PR will conflict, but don't worry.
  3. Change the target branch from master to release-10.9.z using the Edit button next to the title of PR.

@dmitrylyzo dmitrylyzo added bug Something isn't working security This PR or issue mainly concerns security ui & ux This PR or issue mainly concerns UI & UX labels Jun 8, 2024
@Chaitanya-Shahare
Copy link
Contributor Author

Do I have to make any changes to this PR?

Personally, I consider this PR as a bugfix because we use Markdown+HTML in the item details (#4393) but forgot to do the same in the episode list (this PR). This PR also fixes possible XSS vulnerability (by sanitizing Overview). Thus, it should target the release branch.

  1. Rebase your branch in the interactive mode on release-10.9.z branch, leaving only related commits.
  2. Verify that everything is correct (Currently there should be your 3 commits over the release branch. Actually, I would squash them in one commit). Force push your rebased branch to your repo. This PR will conflict, but don't worry.
  3. Change the target branch from master to release-10.9.z using the Edit button next to the title of PR.

Thank you for the instructions, I'll do this.

@Chaitanya-Shahare Chaitanya-Shahare force-pushed the chaitanya/fix-episode-overview-markdown branch from 59126c3 to a031aab Compare June 8, 2024 14:28
@jellyfin-bot jellyfin-bot added the merge conflict Conflicts prevent merging label Jun 8, 2024
@jellyfin-bot

This comment has been minimized.

@Chaitanya-Shahare Chaitanya-Shahare changed the base branch from master to release-10.9.z June 8, 2024 14:29
Copy link

sonarcloud bot commented Jun 8, 2024

Quality Gate Passed Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
No data about Coverage
0.4% Duplication on New Code

See analysis details on SonarCloud

@dmitrylyzo dmitrylyzo added this to the v10.9.7 milestone Jun 8, 2024
@dmitrylyzo dmitrylyzo added the stable backport Backport into the next stable release label Jun 8, 2024
@thornbill thornbill removed the merge conflict Conflicts prevent merging label Jun 8, 2024
@thornbill thornbill merged commit aed4ffa into jellyfin:release-10.9.z Jun 8, 2024
3 checks passed
joshuaboniface pushed a commit that referenced this pull request Jun 23, 2024
Fix episode overview markdown render

Original-merge: aed4ffa

Merged-by: thornbill <thornbill@users.noreply.github.com>

Backported-by: Joshua M. Boniface <joshua@boniface.me>
@jellyfin-bot jellyfin-bot removed the stable backport Backport into the next stable release label Jun 23, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working security This PR or issue mainly concerns security ui & ux This PR or issue mainly concerns UI & UX
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

Markdown is not displayed correctly on episode's overview preview area.
5 participants