Merge branch 'rel/v1.4.26' into 'master'v1.4.26

Release v1.4.25

Closes #2728, #2666, and #2056

See merge request Remmina/Remmina!2408

5 files changed, 28 insertions, 4 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2b784ff90..8deaf3291 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,23 @@
+## v1.4.26
+[full changelog](https://gitlab.com/Remmina/Remmina/compare/v1.4.25...v1.4.26)
+
+* Fix trial for 2577: Closing a VNC connection makes Remmina close all other... [!2391](https://gitlab.com/Remmina/Remmina/merge_requests/2391) *@PHWR*
+* Handle after-auth connection errors in VNC properly [!2390](https://gitlab.com/Remmina/Remmina/merge_requests/2390) *@lorenz*
+* Using Remmina from command-line for kiosked servers [!2392](https://gitlab.com/Remmina/Remmina/merge_requests/2392) *@marco.fortina*
+* Manual page refactoring fixes #2056 [!2393](https://gitlab.com/Remmina/Remmina/merge_requests/2393) *@antenore*
+* Add mutex to protect RDP clipboard->srv_data. Fixes #2666 [!2395](https://gitlab.com/Remmina/Remmina/merge_requests/2395) *@giox069*
+* SSH Forward X11 [!2397](https://gitlab.com/Remmina/Remmina/merge_requests/2397) *@antenore*
+* Add '--no-tray-icon' command-line option [!2398](https://gitlab.com/Remmina/Remmina/merge_requests/2398) *@marco.fortina*
+* Python plugins [!2399](https://gitlab.com/Remmina/Remmina/merge_requests/2399) *@ToolsDevler*
+* Apply plugin api changes from Python plugin change [!2400](https://gitlab.com/Remmina/Remmina/merge_requests/2400) *@ToolsDevler*
+* Extract python plugin [!2401](https://gitlab.com/Remmina/Remmina/merge_requests/2401) *@ToolsDevler*
+* Make FreeRDPs TLS Security Level setting accessible in the advanced settings view [!2402](https://gitlab.com/Remmina/Remmina/merge_requests/2402) *@antenore*
+* Disable grabs for SSH and SFTP, #closes #2728 [!2403](https://gitlab.com/Remmina/Remmina/merge_requests/2403) *@antenore*
+* Cannot disable shared folder [!2404](https://gitlab.com/Remmina/Remmina/merge_requests/2404) *@antenore*
+* Use PyInitializeEx in order to skip signal handler registration [!2405](https://gitlab.com/Remmina/Remmina/merge_requests/2405) *@ToolsDevler*
+* Ignore add new connection button in kiosk mode [!2406](https://gitlab.com/Remmina/Remmina/merge_requests/2406) *@antenore*
+* WWW plugin refactoring [!2407](https://gitlab.com/Remmina/Remmina/merge_requests/2407) *@antenore*
+
 ## v1.4.25
 [full changelog](https://gitlab.com/Remmina/Remmina/compare/v1.4.24...v1.4.25)
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ec06950da..1989bad53 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -35,7 +35,7 @@ cmake_policy(SET CMP0048 NEW)
 
 project(
   Remmina
-  VERSION 1.4.25
+  VERSION 1.4.26
   DESCRIPTION "The Gtk Remote Desktop Client"
   LANGUAGES C CXX
 )
diff --git a/Doxyfile b/Doxyfile
index 88919ee5f..3ccad3650 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -38,7 +38,7 @@ PROJECT_NAME           = "Remmina - The GTK+ Remote Desktop Client"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = v1.4.25
+PROJECT_NUMBER         = v1.4.26
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
diff --git a/data/desktop/org.remmina.Remmina.appdata.xml b/data/desktop/org.remmina.Remmina.appdata.xml
index 514681ad4..f52d2bf43 100644
--- a/data/desktop/org.remmina.Remmina.appdata.xml
+++ b/data/desktop/org.remmina.Remmina.appdata.xml
@@ -18,7 +18,7 @@
   <summary xml:lang="hr">Klijent za upravljanje udaljenom radnom površinom</summary>
   <content_rating type="oars-1.1" />
   <releases>
-      <release version="1.4.25" date="2021-03-10"/>
+      <release version="1.4.26" date="2022-05-18"/>
   </releases>
   <description>
     <p>
diff --git a/data/ui/remmina_about.glade b/data/ui/remmina_about.glade
index 8cc849166..aff91fc5f 100644
--- a/data/ui/remmina_about.glade
+++ b/data/ui/remmina_about.glade
@@ -82,6 +82,7 @@ Giovanni panozzo &lt;giovanni@panozzo.it&gt;
 dupondje &lt;jean-louis@dupondje.be&gt;
 weberho &lt;jweberhofer@weberhofer.at&gt;
 Rene Rheaume &lt;rene.rheaume@gmail.com&gt;
+Marco Fortina &lt;marco.fortina@atlantica.it&gt;
 Luca Falavigna &lt;dktrkranz@debian.org&gt;
 Fabio Fantoni &lt;fabio.fantoni@m2r.biz&gt;
 Oguz Ersen &lt;oguzersen@protonmail.com&gt;
@@ -95,6 +96,7 @@ Heather Ellsworth &lt;hellsworth@gnome.org&gt;
 Devid Antonio Floni &lt;d.filoni@ubuntu.com&gt;
 Todd Hubers &lt;todd.hubers@gmail.com&gt;
 Marco Trevisan &lt;mail@3v1n0.net&gt;
+LitecoinZ &lt;team@litecoinz.info&gt;
 Joan Montané &lt;joan@montane.cat&gt;
 Diogo Pereira &lt;sir.suriv@gmail.com&gt;
 Bernhard Roth &lt;broth@roth-itk.de&gt;
@@ -135,6 +137,7 @@ Nathan &lt;bonnemainsnathan@gmail.com&gt;
 nanxiongchao &lt;nanxiongchao@loongson.cn&gt;
 muzena &lt;trebelnik2@gmail.com&gt;
 Matteo F. Vescovi &lt;mfvescovi+github@gmail.com&gt;
+Mathias Winterhalter &lt;2370037-ToolsDevler@users.noreply.gitlab.com&gt;
 Ken VanDine &lt;ken@vandine.org&gt;
 Jörgen Viksell &lt;jviksell@gmail.com&gt;
 Jennifer &lt;jen@elypia.org&gt;
@@ -173,6 +176,7 @@ Qian Zheng &lt;sotux82@gmail.com&gt;
 Phil Wyett &lt;philip.wyett@kathenas.org&gt;
 Philipp Trulson &lt;philipp@trulson.de&gt;
 Philipp &lt;der-eismann@users.noreply.github.com&gt;
+Philippe Waroquiers &lt;philippe@hp&gt;
 Philippe Jandot &lt;zfil@users.noreply.github.com&gt;
 Pavel Pautov &lt;37922380+p-pautov@users.noreply.github.com&gt;
 Patryk &lt;488982-kocielnik@users.noreply.gitlab.com&gt;
@@ -197,7 +201,7 @@ Matthew Petroff &lt;gitlab@mpetroff.net&gt;
 Matteo F. Vescovi &lt;mfv@debian.org&gt;
 Mathias &lt;mathias@mwws1-manjaro.toolsdevler.net&gt;
 Manuela Silva &lt;mmsrs@sky.com&gt;
-- &lt;5156411-xsmile@users.noreply.gitlab.com&gt;
+Lorenz Brun &lt;lorenz@brun.one&gt;
 Laurentiu Nicola &lt;lnicola@dend.ro&gt;
 larchunix &lt;larchunix@users.noreply.github.com&gt;
 larchunix &lt;larchunix+gitlab@gmail.com&gt;