qBittorrent icon indicating copy to clipboard operation
qBittorrent copied to clipboard

Published 20 hours ago • verified publisher icon qbittorrent

Backport changes to v5.0 branch

Open sledgehammer999 opened this issue 1 year ago • 2 comments

Continuation of PR #20918 with the conflicts resolved.

There was only one commit that conflicted: master version: cb90b6769c1b8b0be61f817333ee62c8844c93ec v5 version: 4687b4e8e43de285ef9006b8c68d90415f078557

Files in conflict:

  • src/webui/www/package.json
  • src/webui/www/public/scripts/login.js

sledgehammer999 avatar Jun 25 '24 18:06 sledgehammer999

PR #20990 should also be backported.

Chocobo1 avatar Jun 28 '24 08:06 Chocobo1

And #20998

glassez avatar Jun 28 '24 09:06 glassez

PR #20990 should also be backported.

And https://github.com/qbittorrent/qBittorrent/pull/20998

Done.

glassez avatar Jul 07 '24 13:07 glassez

Also backports the following PRs:

  • #20252
  • #20951
  • #20990
  • #20998
  • #21006
  • #21024
  • #21026
  • #21030
  • #21041
  • #21050
  • #21053
  • #21066

Note: #21041 is fixup for #20951 so it shouldn't be included in Changelog as a separate entry.

glassez avatar Jul 07 '24 13:07 glassez

The backport of this PR? https://github.com/qbittorrent/qBittorrent/pull/20951 (after the merger)

stalkerok avatar Jul 07 '24 15:07 stalkerok

Should we merge this & open a new PR for any further backports?

xavier2k6 avatar Jul 15 '24 18:07 xavier2k6

Should we merge this & open a new PR for any further backports?

Well, let's do that.

glassez avatar Aug 02 '24 18:08 glassez