From ddf483012b2d3c19d2267ecdf20a7d80e85e6273 Mon Sep 17 00:00:00 2001 From: John Preston Date: Mon, 24 Feb 2020 19:58:34 +0400 Subject: [PATCH] Beta version 1.9.17. - Spell checker on Windows 7. - Bug fixes and other minor improvements. --- Telegram/Resources/uwp/AppX/AppxManifest.xml | 2 +- Telegram/Resources/winrc/Telegram.rc | 8 ++++---- Telegram/Resources/winrc/Updater.rc | 8 ++++---- Telegram/SourceFiles/core/changelogs.cpp | 7 +++++++ Telegram/SourceFiles/core/version.h | 4 ++-- Telegram/build/version | 8 ++++---- changelog.txt | 5 +++++ cmake | 2 +- 8 files changed, 28 insertions(+), 16 deletions(-) diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml index a52637355..d600fc7ce 100644 --- a/Telegram/Resources/uwp/AppX/AppxManifest.xml +++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml @@ -9,7 +9,7 @@ + Version="1.9.17.0" /> Telegram Desktop Telegram FZ-LLC diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc index fcf1da23d..c067af099 100644 --- a/Telegram/Resources/winrc/Telegram.rc +++ b/Telegram/Resources/winrc/Telegram.rc @@ -33,8 +33,8 @@ IDI_ICON1 ICON "..\\art\\icon256.ico" // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,9,16,0 - PRODUCTVERSION 1,9,16,0 + FILEVERSION 1,9,17,0 + PRODUCTVERSION 1,9,17,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -51,10 +51,10 @@ BEGIN BEGIN VALUE "CompanyName", "Telegram FZ-LLC" VALUE "FileDescription", "Telegram Desktop" - VALUE "FileVersion", "1.9.16.0" + VALUE "FileVersion", "1.9.17.0" VALUE "LegalCopyright", "Copyright (C) 2014-2020" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "1.9.16.0" + VALUE "ProductVersion", "1.9.17.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc index 628a74f5f..49e361f23 100644 --- a/Telegram/Resources/winrc/Updater.rc +++ b/Telegram/Resources/winrc/Updater.rc @@ -24,8 +24,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,9,16,0 - PRODUCTVERSION 1,9,16,0 + FILEVERSION 1,9,17,0 + PRODUCTVERSION 1,9,17,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -42,10 +42,10 @@ BEGIN BEGIN VALUE "CompanyName", "Telegram FZ-LLC" VALUE "FileDescription", "Telegram Desktop Updater" - VALUE "FileVersion", "1.9.16.0" + VALUE "FileVersion", "1.9.17.0" VALUE "LegalCopyright", "Copyright (C) 2014-2020" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "1.9.16.0" + VALUE "ProductVersion", "1.9.17.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/SourceFiles/core/changelogs.cpp b/Telegram/SourceFiles/core/changelogs.cpp index bd338c5a4..1ea716f18 100644 --- a/Telegram/SourceFiles/core/changelogs.cpp +++ b/Telegram/SourceFiles/core/changelogs.cpp @@ -61,6 +61,13 @@ std::map BetaLogs() { "\xE2\x80\xA2 Mark new messages as read " "while scrolling down through them.\n" + "\xE2\x80\xA2 Bug fixes and other minor improvements." + }, + + { + 1009017, + "\xE2\x80\xA2 Spell checker on Windows 7.\n" + "\xE2\x80\xA2 Bug fixes and other minor improvements." } }; diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h index f32867215..e8a2cde4f 100644 --- a/Telegram/SourceFiles/core/version.h +++ b/Telegram/SourceFiles/core/version.h @@ -22,7 +22,7 @@ constexpr auto AppId = "{53F49750-6209-4FBF-9CA8-7A333C87D1ED}"_cs; constexpr auto AppNameOld = "Telegram Win (Unofficial)"_cs; constexpr auto AppName = "Telegram Desktop"_cs; constexpr auto AppFile = "Telegram"_cs; -constexpr auto AppVersion = 1009016; -constexpr auto AppVersionStr = "1.9.16"; +constexpr auto AppVersion = 1009017; +constexpr auto AppVersionStr = "1.9.17"; constexpr auto AppBetaVersion = true; constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION; diff --git a/Telegram/build/version b/Telegram/build/version index 01132d36c..e7903d3de 100644 --- a/Telegram/build/version +++ b/Telegram/build/version @@ -1,7 +1,7 @@ -AppVersion 1009016 +AppVersion 1009017 AppVersionStrMajor 1.9 -AppVersionStrSmall 1.9.16 -AppVersionStr 1.9.16 +AppVersionStrSmall 1.9.17 +AppVersionStr 1.9.17 BetaChannel 1 AlphaVersion 0 -AppVersionOriginal 1.9.16.beta +AppVersionOriginal 1.9.17.beta diff --git a/changelog.txt b/changelog.txt index bf90681ee..fd51761a2 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,8 @@ +1.9.17 beta (24.02.20) + +- Spell checker on Windows 7. +- Bug fixes and other minor improvements. + 1.9.16 beta (23.02.20) - Bug fixes and other minor improvements. diff --git a/cmake b/cmake index 4c6923433..0c4fe1750 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 4c69234334eeb32f35da08307d0de1467fbce575 +Subproject commit 0c4fe1750f232805f604048340d64bd1a6a18a74