Merge release-4.0 back into development by vadi2 · Pull Request #2918 · Mudlet/Mudlet

vadi2 · 2019-08-04T09:15:42Z

Part of the release process.

* Revert "Fix no patterns being set for triggers (#2891)" This reverts commit 0913755. * Revert "Fix errors when creating new triggers (#2868)" This reverts commit 0578c61.

* Add initial tab and icon * Refactor text setting into separate methods * Comment improvement * Added a super simplistic structure for the Patreon tab * Added new HTML in * Add images * Remove PlaceholderText, fix Qt 5.7 compile * Add images in * Add missing end tag * Remove obsolete end tag * Set minimum size on about dialog to one that looks okay * Re-save with GIMP and fix libpng warnings * Draw our own images * Update names and white space * Layout * Typo * Dont create if already existing * Dont crash when closing Mudlet * Drop %3, save screen space * Don't print supporter's introduction big (cherry picked from commit 278d49f)

* Move appveyor and windows SDK to Qt 5.12.4

add-deployment-links · 2019-08-04T09:15:48Z

Hey there! Thanks for helping Mudlet improve. 🌟

Test versions

You can directly test the changes here:

linux: (download pending, check back soon!)
osx: (download pending, check back soon!)
windows: https://make.mudlet.org/snapshots/ded381/Mudlet-4.0.3-testing-PR2918-3de664bb-windows.zip

No need to install anything - just unzip and run.
Let us know if it works well, and if it doesn't, please give details.

* Use OpenSSL 1.1.1 on Windows

* mudletOlderThan fix * Logic adjustments * Combine and straighten else clauses (cherry picked from commit 42295a8)

(cherry picked from commit 5647fe9)

* New translations mudlet.ts (French) * New translations mudlet.ts (French) * New translations mudlet.ts (Chinese Simplified) * New translations mudlet.ts (Dutch) * New translations mudlet.ts (English, United Kingdom) * New translations mudlet.ts (French) * New translations mudlet.ts (German) * New translations mudlet.ts (Italian) * New translations mudlet.ts (Polish) * New translations mudlet.ts (Portuguese) * New translations mudlet.ts (Russian) * New translations mudlet.ts (Spanish) * New translations mudlet.ts (Chinese Traditional) * New translations mudlet.ts (Greek) * New translations mudlet.ts (Pirate English) * New translations mudlet.ts (Chinese Simplified) * New translations mudlet.ts (English, United Kingdom) * New translations mudlet.ts (French) * New translations mudlet.ts (German) * New translations mudlet.ts (Italian) * New translations mudlet.ts (Polish) * New translations mudlet.ts (Portuguese) * New translations mudlet.ts (Russian) * New translations mudlet.ts (Spanish) * New translations mudlet.ts (Chinese Traditional) * New translations mudlet.ts (Italian) * New translations mudlet.ts (Russian) * New translations mudlet.ts (Chinese Simplified) * New translations mudlet.ts (Chinese Simplified) * New translations mudlet.ts (Chinese Simplified) * New translations mudlet.ts (Chinese Simplified) * New translations mudlet.ts (Chinese Simplified) * New translations mudlet.ts (Chinese Simplified) * New translations mudlet.ts (Chinese Simplified) * New translations mudlet.ts (German) * New translations mudlet.ts (Chinese Simplified) * New translations mudlet.ts (German) * New translations mudlet.ts (Chinese Simplified) * New translations mudlet.ts (Chinese Simplified) * New translations mudlet.ts (French) * New translations mudlet.ts (French) * New translations mudlet.ts (French) * New translations mudlet.ts (French) * New translations mudlet.ts (French) * New translations mudlet.ts (French) * New translations mudlet.ts (French) * New translations mudlet.ts (French) * New translations mudlet.ts (French) * New translations mudlet.ts (French) * New translations mudlet.ts (French) * New translations mudlet.ts (French) * New translations mudlet.ts (French) * New translations mudlet.ts (French) * New translations mudlet.ts (French) * New translations mudlet.ts (Italian) * New translations mudlet.ts (Italian) * New translations mudlet.ts (French) * New translations mudlet.ts (French) * New translations mudlet.ts (Italian) * New translations mudlet.ts (Italian) * New translations mudlet.ts (Italian) * New translations mudlet.ts (Italian) * New translations mudlet.ts (Italian) * New translations mudlet.ts (Italian) * New translations mudlet.ts (Italian) * New translations mudlet.ts (French) * New translations mudlet.ts (French) * New translations mudlet.ts (Chinese Simplified) * New translations mudlet.ts (Dutch) * New translations mudlet.ts (English, United Kingdom) * New translations mudlet.ts (French) * New translations mudlet.ts (German) * New translations mudlet.ts (Italian) * New translations mudlet.ts (Polish) * New translations mudlet.ts (Portuguese) * New translations mudlet.ts (Russian) * New translations mudlet.ts (Spanish) * New translations mudlet.ts (Chinese Traditional) * New translations mudlet.ts (Greek) * New translations mudlet.ts (Pirate English) * New translations mudlet.ts (Chinese Simplified) * New translations mudlet.ts (French) * New translations mudlet.ts (German) * New translations mudlet.ts (Italian) * New translations mudlet.ts (Polish) * New translations mudlet.ts (Russian) * New translations mudlet.ts (Russian) * New translations mudlet.ts (Italian) * New translations mudlet.ts (Italian) * New translations mudlet.ts (Chinese Simplified) * New translations mudlet.ts (Chinese Simplified) * New translations mudlet.ts (German) * New translations mudlet.ts (German) * New translations mudlet.ts (German) * New translations mudlet.ts (German) * New translations mudlet.ts (Chinese Simplified) * New translations mudlet.ts (Chinese Simplified) * New translations mudlet.ts (Chinese Simplified) * New translations mudlet.ts (German) * New translations mudlet.ts (German) * New translations mudlet.ts (German) * New translations mudlet.ts (German) * New translations mudlet.ts (German) * New translations mudlet.ts (German) * New translations mudlet.ts (Chinese Simplified) * New translations mudlet.ts (Chinese Simplified) * New translations mudlet.ts (Chinese Simplified) * New translations mudlet.ts (Chinese Simplified) * New translations mudlet.ts (Italian) * New translations mudlet.ts (Italian) * New translations mudlet.ts (German) * New translations mudlet.ts (German) * New translations mudlet.ts (German) * New translations mudlet.ts (German) * New translations mudlet.ts (Chinese Simplified) (cherry picked from commit 96e25f5)

This reverts commit 4127624.

# Conflicts: # .appveyor.yml # CI/appveyor.set-environment.ps1 # CI/qt-silent-install.qs # src/icons/Patreon_Mark_Primary.png # src/icons/frame_plaque.png # src/mudlet.qrc

keneanung · 2019-08-07T19:37:38Z

CMakeLists.txt

  set(APP_BUILD $ENV{MUDLET_VERSION_BUILD})
 else()
-  set(APP_BUILD "-dev")
+  set(APP_BUILD "")


Pretty sure this shouldn't be changes. Same for the pro

Could you fix it up? I'm on mobile

So am I at the moment. Maybe tomorrow.

vadi2 and others added 12 commits July 30, 2019 12:00

Remove left over debug statement for command line (#2885)

e7e28eb

Fix permGroup for aliases and timers (#2887)

2ca4572

Remove text unnecessary for proxy translation (#2892)

52f1fd8

Update autocomplete list for 4.0 (#2896)

910bf8f

Fix no patterns being set for triggers (#2891)

0913755

Default-initialise the repeating boolean (#2899)

2791f20

Revert trigger editor changes (#2898)

7a698e7

* Revert "Fix no patterns being set for triggers (#2891)" This reverts commit 0913755. * Revert "Fix errors when creating new triggers (#2868)" This reverts commit 0578c61.

Update Windows Qt - 4.0 edition (#2911)

1565029

* Move appveyor and windows SDK to Qt 5.12.4

Fix macOS crash when saving settings (#2915)

95e3d79

4.0.0 release

07712fb

Re-set dev

0a9aac9

vadi2 requested a review from a team as a code owner August 4, 2019 09:15

vadi2 requested review from a team August 4, 2019 09:15

keneanung and others added 13 commits August 4, 2019 17:22

Use OpenSSL 1.1.1 on Windows (#2923)

4127624

* Use OpenSSL 1.1.1 on Windows

Set release build

f523107

Reset -dev

da368cd

Fix dblsqd auto attachment

23e47c3

Fix mudletOlderThan() for 4.0 (#2925) (#2928)

48bb417

* mudletOlderThan fix * Logic adjustments * Combine and straighten else clauses (cherry picked from commit 42295a8)

Fix Patreon link in Supporters tab to open browser (#2927) (#2930)

53b3bb4

(cherry picked from commit 5647fe9)

4.0.2 hotfix release

272c082

Use Qt 5.12.3 for Windows Mudlet (#2932)

69e849c

Properly initialise ssl and proxy settings (#2931)

52a54c0

Actual 4.0.2 hotfix release

57a2020

Re-set dev

d9c8686

Revert "Use OpenSSL 1.1.1 on Windows (#2923)" (#2934)

f311527

This reverts commit 4127624.

vadi2 added 2 commits August 5, 2019 19:57

4.0.3 hotfix release (re-enable TLS/SSL in Windows)

3247bad

Merge branch 'development' into release-4.0

ffc260b

# Conflicts: # .appveyor.yml # CI/appveyor.set-environment.ps1 # CI/qt-silent-install.qs # src/icons/Patreon_Mark_Primary.png # src/icons/frame_plaque.png # src/mudlet.qrc

Kebap approved these changes Aug 7, 2019

View reviewed changes

keneanung requested changes Aug 7, 2019

View reviewed changes

Re-set dev

2a3800f

keneanung approved these changes Aug 7, 2019

View reviewed changes

vadi2 merged commit 19de141 into development Aug 8, 2019

vadi2 deleted the release-4.0 branch August 8, 2019 04:09

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Merge release-4.0 back into development#2918

Merge release-4.0 back into development#2918
vadi2 merged 28 commits intodevelopmentfrom
release-4.0

vadi2 commented Aug 4, 2019

Uh oh!

add-deployment-links bot commented Aug 4, 2019 •

edited

Loading

Uh oh!

keneanung Aug 7, 2019

Uh oh!

vadi2 Aug 7, 2019

Uh oh!

keneanung Aug 7, 2019

Uh oh!

vadi2 Aug 7, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Uh oh!

Conversation

vadi2 commented Aug 4, 2019

Uh oh!

add-deployment-links bot commented Aug 4, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Test versions

Uh oh!

keneanung Aug 7, 2019

Choose a reason for hiding this comment

Uh oh!

vadi2 Aug 7, 2019

Choose a reason for hiding this comment

Uh oh!

keneanung Aug 7, 2019

Choose a reason for hiding this comment

Uh oh!

vadi2 Aug 7, 2019

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

add-deployment-links bot commented Aug 4, 2019 •

edited

Loading