Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/Remmina/Remmina.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntenore Gatta <antenore@simbiosi.org>2019-03-13 02:03:32 +0300
committerAntenore Gatta <antenore@simbiosi.org>2019-03-13 02:03:32 +0300
commit494903ec8ba33d78bfda2560c276e230b8d31b13 (patch)
treeda88e3ebbd2de5a2ee2a706eb5ac87b41ee4c397
parent5da779e6b5699e36057ddadd326edd37fe5cf764 (diff)
parent8e8036bc6f4d5e184f4957bebeaee8b0a8ce8a25 (diff)
Merge branch 'prep-rel-1.3.4' into 'master'v1.3.4
Remmina Release 1.3.4 See merge request Remmina/Remmina!1813
-rw-r--r--AUTHORS2
-rw-r--r--CHANGELOG.md13
-rw-r--r--CMakeLists.txt2
-rw-r--r--THANKS.md12
-rw-r--r--data/ui/remmina_about.glade2
5 files changed, 25 insertions, 6 deletions
diff --git a/AUTHORS b/AUTHORS
index a7ee3f7db..82642db7b 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -52,7 +52,7 @@ Authors of Remmina Project
Jose Gregorio Jimenez Sanchez <josegjimenez@gmail.com>
Julian Ospald <hasufell@posteo.de>
Justin Zobel <justin@solus-project.com>
- Ken VanDine <kvandine@gnome.org>
+ Ken VanDine <ken.vandine@canonical.com>
Kirill Müller <krlmlr@users.noreply.github.com>
Kyle Sanderson <kyle.leet@gmail.com>
larchunix <larchunix@users.noreply.github.com>
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0ac90916c..cd2b6a8b7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,14 @@
-# Changelog
+## v1.3.4
+[full changelog](https://gitlab.com/Remmina/Remmina/compare/v1.3.3...v.1.3.4)
-Current Remmina changelog, see CHANGELOG.archive.md for old releases.
+* Updated to use core18 and gnome-3-28-1804 [!1797](https://gitlab.com/Remmina/Remmina/merge_requests/1797) *@kenvandine*
+* Snap: Build snap in CI and publish to the edge channel for builds against master [!1810](https://gitlab.com/Remmina/Remmina/merge_requests/1810) *@kenvandine*
+* Resolve "SSH public key cannot be imported: Access denied for 'none'. Authentication that can continie: publickey" [!1811](https://gitlab.com/Remmina/Remmina/merge_requests/1811) *@antenore*
+* snap: Ensure the icon is installed [!1812](https://gitlab.com/Remmina/Remmina/merge_requests/1812) *@kenvandine*
-## [v1.3.3](https://gitlab.com/Remmina/Remmina/compare/v1.3.3)
+
+## v1.3.3
+[full changelog](https://gitlab.com/Remmina/Remmina/compare/v1.3.2...v1.3.3)
* Fix “Utranslated” typo + XHTML 1.0 strictness + move div CSS rule in style block [!1785](https://gitlab.com/Remmina/Remmina/merge_requests/1785) *@DevDef*
* Revert autoclosed <script> tags. It seems to be badly surported [!1786](https://gitlab.com/Remmina/Remmina/merge_requests/1786) *@DevDef*
@@ -23,6 +29,7 @@ Current Remmina changelog, see CHANGELOG.archive.md for old releases.
* Translate new strings to German [!1803](https://gitlab.com/Remmina/Remmina/merge_requests/1803) *@jweberhofer*
* Fix Yes/No inversion [!1805](https://gitlab.com/Remmina/Remmina/merge_requests/1805) *@DevDef*
* Update Danish translation [!1804](https://gitlab.com/Remmina/Remmina/merge_requests/1804) *@scootergrisen*
+* Remmina release v.1.3.3 [!1807](https://gitlab.com/Remmina/Remmina/merge_requests/1807) *@antenore*
## [v1.3.2](https://gitlab.com/Remmina/Remmina/tags/v1.3.2) (2019-01-31)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b13b0adfb..4391412d7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -211,7 +211,7 @@ endif()
set(WITH_LIBRARY_VERSIONING "ON")
set(REMMINA_VERSION_MAJOR "1")
set(REMMINA_VERSION_MINOR "3")
-set(REMMINA_VERSION_REVISION "3")
+set(REMMINA_VERSION_REVISION "4")
#set(REMMINA_VERSION_SUFFIX "1")
#set(REMMINA_VERSION "${REMMINA_VERSION_MAJOR}.${REMMINA_VERSION_MINOR}.${REMMINA_VERSION_REVISION}.${REMMINA_VERSION_SUFFIX}")
set(REMMINA_VERSION "${REMMINA_VERSION_MAJOR}.${REMMINA_VERSION_MINOR}.${REMMINA_VERSION_REVISION}")
diff --git a/THANKS.md b/THANKS.md
index 2a542c0e6..b045f7f1c 100644
--- a/THANKS.md
+++ b/THANKS.md
@@ -16,18 +16,30 @@ This special place is reserved to who have donated the hisghest amount of money
- Rafael Wolf owner of [EITS, LLC, dba Express IT Solutions](https://eitsonline.com) Kalamazoo, MI 49048 USA. ( **Donated $100** )
- [Tim Richardson - GrowthPath founder](https://www.growthpath.com.au/people/growthpath-team-2)
+## Year 2019 donors
+
+- Clayton Casciato
+- Márcio Oliveira Luiz
+- Andres Zanzani
+- Wolfgang Scherer
+- Roman Cravtov
+- Andrew Hart
+
## Year 2018 donors
- Anton Karmanov
- Antonio Quinonez-Mun
+- Clemens Anhuth
- CSI Dudek Marcin
- coder-zero @Future Systems bvba
- Debapriyo Sarkar
+- Harjit Takshak
- Marco Polano
- Michael Hipp
- Peter Link
- Praveen Bhamidipati
- Radek Loutocký
+- Richard Flathmann
- Sergey Lebfr
- Tommy Sweeney
diff --git a/data/ui/remmina_about.glade b/data/ui/remmina_about.glade
index 457fe868a..9ff33abf9 100644
--- a/data/ui/remmina_about.glade
+++ b/data/ui/remmina_about.glade
@@ -91,7 +91,7 @@ Jörgen Viksell &lt;jviksell@gmail.com&gt;
Jose Gregorio Jimenez Sanchez &lt;josegjimenez@gmail.com&gt;
Julian Ospald &lt;hasufell@posteo.de&gt;
Justin Zobel &lt;justin@solus-project.com&gt;
-Ken VanDine &lt;kvandine@gnome.org&gt;
+Ken VanDine &lt;ken.vandine@canonical.com&gt;
Kirill Müller &lt;krlmlr@users.noreply.github.com&gt;
Kyle Sanderson &lt;kyle.leet@gmail.com&gt;
larchunix &lt;larchunix@users.noreply.github.com&gt;