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 to v4_1_x #10615

Merged
merged 10 commits into from
May 23, 2019
Merged

Backport to v4_1_x #10615

merged 10 commits into from
May 23, 2019

Conversation

Chocobo1
Copy link
Member

@Chocobo1 Chocobo1 commented May 10, 2019 •
edited
Loading

I'll let PR accumulate a bit instead of merging right away.

PR:
#10607
#10590
#10514
#10618
#10600
#10518
#10638

@Chocobo1 Chocobo1 added this to the 4.1.7 milestone May 10, 2019
onlined and others added 4 commits May 11, 2019 12:25
@onlined @Chocobo1
Don't turn screen blank when closed to system tray
9a4dd3e 
Closes qbittorrent#9240 and possibly qbittorrent#9121, as @zeule suggested here: qbittorrent#9240 (comment).
@Mataniko @Chocobo1
Download RSS enclosure element if no proper MIME type is found
8f29b70 
In the case where an RSS feed doesn't have the "enclosure" element
with type "application/x-bittorrent", fallback to the last enclosure
element which has no "type" attribute.
@jerrymakesjelly @Chocobo1
Change the speed unit from Bytes/s to KiB/s
4fbd52c 
Updated the adding torrent dialogs in WebUI. Closes qbittorrent#10017.
@surfernsk @Chocobo1
Change "Add new torrent" dialog to horizontal layout
ef130e4
@Chocobo1 Chocobo1 mentioned this pull request May 15, 2019
Merged
@Ryrynz
Copy link

Ryrynz commented May 15, 2019

Perhaps 10504 could make it's way in here as well?

@Chocobo1
Copy link
Member Author

Perhaps 10504 could make it's way in here as well?

Too difficult to backport so it won't.

@Chocobo1
Fix assertion fail
f6d72fa 
When fileSize == 0, the second index could be smaller than the first index,
thus trigger the assert check in IndexInterval constructor.

Closes qbittorrent#10611.
sledgehammer999
sledgehammer999 approved these changes May 20, 2019
View reviewed changes
Copy link
Member

@sledgehammer999 sledgehammer999 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IMO, this should be merged so I can do a new release.
An excuse to have a better 64bit Windows build out than the current (sometimes) failing 4.1.6 x64 build.

@Chocobo1
Copy link
Member Author

IMO, this should be merged so I can do a new release.

Please merge as you see fit, there are no more pending PR for now.

@Chocobo1
Copy link
Member Author

@sledgehammer999
There is also this PR: arvidn/libtorrent#3839, issue #10605 is related.

@Chocobo1 Chocobo1 merged commit 9ba7470 into qbittorrent:v4_1_x May 23, 2019
@Chocobo1 Chocobo1 deleted the backport branch May 23, 2019 14:14
@Ryrynz
Copy link

Ryrynz commented May 29, 2019

@sledgehammer999 4.17 release soon? I was half expecting it out within a few days or so of this backport, cheers!

@LordNyriox LordNyriox mentioned this pull request Jun 16, 2019
Merged
This was referenced Aug 27, 2021
Open
Closed
Closed
@xavier2k6 xavier2k6 mentioned this pull request Sep 12, 2021
Closed
6 tasks
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

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
4.1.7
Development

Successfully merging this pull request may close these issues.
8 participants
@Chocobo1 @Ryrynz @sledgehammer999 @onlined @Mataniko @jerrymakesjelly @surfernsk @dzmat