Merge release-4.5 branch into development#3397
Merged
vadi2 merged 10 commits intodevelopmentfrom Mar 10, 2020
Merged
Conversation
* Add getImageSize() * Tweaks as suggested by peer review on reddit * Review feedback (cherry picked from commit 5b5a203)
* New translations mudlet.ts (Turkish) * New translations mudlet.ts (Turkish) * New translations mudlet.ts (Turkish) * New translations mudlet.ts (Turkish) * New translations mudlet.ts (Turkish) * New translations mudlet.ts (Turkish) * New translations mudlet.ts (Turkish) * New translations mudlet.ts (Turkish) * New translations mudlet.ts (Turkish) * New translations mudlet.ts (Turkish) * New translations mudlet.ts (Turkish) * New translations mudlet.ts (Russian) (cherry picked from commit acc75dd)
(cherry picked from commit ef971c5)
Found this whilst working on something else that involved multiple active profiles and one of them being closed whilst their profile preferences dialogue was open - under those circumstances the Host specific data is cleared and disabled on the dialogue but clicking on the editor tab - which should have presenting a tab with no data on it instead caused Mudlet to crash because Host::updateProxySettings(QNetworkAccessManager*) was being called... Signed-off-by: Stephen Lyons <slysven@virginmedia.com> (cherry picked from commit 506f6b0)
|
Hey there! Thanks for helping Mudlet improve. 🌟 Test versionsYou can directly test the changes here:
No need to install anything - just unzip and run. |
Member
Author
|
I've resolved the conflicts in the Turkish translation by simply deleting them, because we have newer translations in the more recent |
keneanung
approved these changes
Mar 10, 2020
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Brief overview of PR changes/additions
Merge release-4.5 branch into development
Motivation for adding to Mudlet
Part of release process, so we can delete release-4.5
Other info (issues closed, discussion etc)