From 983d9e6eeeab12deee4bd7dd09dd7e0c90b3be08 Mon Sep 17 00:00:00 2001 From: John Preston Date: Fri, 2 Oct 2020 19:31:19 +0300 Subject: [PATCH] Version 2.4.2. - Allow block, report and delete all message from user in "user joined" service message context menu. - Fix admin badge display in groups. - Fix loading and opening of comments in channels. --- Telegram/Resources/uwp/AppX/AppxManifest.xml | 2 +- Telegram/Resources/winrc/Telegram.rc | 8 ++++---- Telegram/Resources/winrc/Updater.rc | 8 ++++---- Telegram/SourceFiles/core/version.h | 4 ++-- Telegram/build/version | 8 ++++---- changelog.txt | 6 ++++++ 6 files changed, 21 insertions(+), 15 deletions(-) diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml index 321c6a74a..f2b2f01c2 100644 --- a/Telegram/Resources/uwp/AppX/AppxManifest.xml +++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml @@ -9,7 +9,7 @@ + Version="2.4.2.0" /> Telegram Desktop Telegram FZ-LLC diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc index 0553bc77d..461b60448 100644 --- a/Telegram/Resources/winrc/Telegram.rc +++ b/Telegram/Resources/winrc/Telegram.rc @@ -44,8 +44,8 @@ IDI_ICON1 ICON "..\\art\\icon256.ico" // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,4,1,0 - PRODUCTVERSION 2,4,1,0 + FILEVERSION 2,4,2,0 + PRODUCTVERSION 2,4,2,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -62,10 +62,10 @@ BEGIN BEGIN VALUE "CompanyName", "Telegram FZ-LLC" VALUE "FileDescription", "Telegram Desktop" - VALUE "FileVersion", "2.4.1.0" + VALUE "FileVersion", "2.4.2.0" VALUE "LegalCopyright", "Copyright (C) 2014-2020" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "2.4.1.0" + VALUE "ProductVersion", "2.4.2.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc index fa55d7209..32ca8d193 100644 --- a/Telegram/Resources/winrc/Updater.rc +++ b/Telegram/Resources/winrc/Updater.rc @@ -35,8 +35,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,4,1,0 - PRODUCTVERSION 2,4,1,0 + FILEVERSION 2,4,2,0 + PRODUCTVERSION 2,4,2,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -53,10 +53,10 @@ BEGIN BEGIN VALUE "CompanyName", "Telegram FZ-LLC" VALUE "FileDescription", "Telegram Desktop Updater" - VALUE "FileVersion", "2.4.1.0" + VALUE "FileVersion", "2.4.2.0" VALUE "LegalCopyright", "Copyright (C) 2014-2020" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "2.4.1.0" + VALUE "ProductVersion", "2.4.2.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h index d307aa5dd..03b6575f6 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 = 2004001; -constexpr auto AppVersionStr = "2.4.1"; +constexpr auto AppVersion = 2004002; +constexpr auto AppVersionStr = "2.4.2"; constexpr auto AppBetaVersion = false; constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION; diff --git a/Telegram/build/version b/Telegram/build/version index 981ea3270..61773a085 100644 --- a/Telegram/build/version +++ b/Telegram/build/version @@ -1,7 +1,7 @@ -AppVersion 2004001 +AppVersion 2004002 AppVersionStrMajor 2.4 -AppVersionStrSmall 2.4.1 -AppVersionStr 2.4.1 +AppVersionStrSmall 2.4.2 +AppVersionStr 2.4.2 BetaChannel 0 AlphaVersion 0 -AppVersionOriginal 2.4.1 +AppVersionOriginal 2.4.2 diff --git a/changelog.txt b/changelog.txt index 5654ad112..9aee7bcf4 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,9 @@ +2.4.2 (02.10.20) + +- Allow block, report and delete all message from user from "user joined" service message context menu. +- Fix admin badge display in groups. +- Fix loading and opening of comments in channels. + 2.4.1 (01.10.20) - Move by PageUp and PageDown in channel comments.