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.

Sign up for GitHub

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

Jump to bottom

Backport changes to v5.0.x branch #21898

Merged
merged 11 commits into from
Dec 9, 2024
Merged

Backport changes to v5.0.x branch #21898

merged 11 commits into from
Dec 9, 2024

Conversation

glassez
Copy link
Member

@glassez glassez commented Nov 23, 2024 •
edited by sledgehammer999
Loading

@glassez glassez added this to the 5.0.3 milestone Nov 23, 2024
@stalkerok
Copy link
Contributor

#21853 (comment) ?

@glassez glassez mentioned this pull request Dec 7, 2024
Open
@glassez glassez requested a review from a team December 7, 2024 08:13
xavier2k6
xavier2k6 previously approved these changes Dec 7, 2024
View reviewed changes
@Chocobo1 @glassez
Don't follow symlink when creating torrents on Windows
9ac14cd 
Now on Windows, it won't follow/include .lnk files when creating torrents.
Note that libtorrent will throw errors if we force adding .lnk files.

Non-Windows OS will still follow symlinks.

Closes qbittorrent#13286.
PR qbittorrent#21944.
@glassez glassez requested a review from a team December 7, 2024 18:22
xavier2k6
xavier2k6 previously approved these changes Dec 7, 2024
View reviewed changes
@sledgehammer999
Copy link
Member

I have pushed to this PR the PR #21346
For some reason that PR was missed and wasn't backported. I hope I wasn't wrong in backporting it.
@Chocobo1 is that ok?

@sledgehammer999
Copy link
Member

@Chocobo1 should #21832 be backported too?

@Chocobo1
Copy link
Member

Chocobo1 commented Dec 8, 2024

I have pushed to this PR the PR #21346
For some reason that PR was missed and wasn't backported. I hope I wasn't wrong in backporting it.
@Chocobo1 is that ok?

It is fine. 👍

@Chocobo1 should #21832 be backported too?

It can but (more or less) I still doubt the effectiveness of the first GET request (location.replace(location)). See my investigation: #21832 (comment)
If you have no problems with it then feel free to backport.

@sledgehammer999
WebUI: Fix reloading page after login
d156a44 
Manual backport of PR  qbittorrent#21832
Original author: Evgenii Ryshkov
See commit: 1e851b3
@sledgehammer999
Copy link
Member

I manually backported #21832 and pushed it here. It didn't apply cleanly with a simple cherry-pick

@sledgehammer999
Copy link
Member

Finally pushed PR #21920

@glassez glassez merged commit 53adb7b into qbittorrent:v5_0_x Dec 9, 2024
14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sledgehammer999 sledgehammer999 sledgehammer999 approved these changes

@xavier2k6 xavier2k6 xavier2k6 left review comments

Assignees
No one assigned
Labels
Backport
Projects
None yet
Milestone
5.0.3
Development

Successfully merging this pull request may close these issues.
9 participants
@glassez @stalkerok @sledgehammer999 @Chocobo1 @xavier2k6 @Bartuzen @wavygecko @Piccirello @Giacomo411