From 97d8ee75d51874fcb74a9bfadc79f835c82be54a Mon Sep 17 00:00:00 2001 From: John Preston Date: Wed, 24 Feb 2021 21:36:41 +0400 Subject: [PATCH] Version 2.6.1. - Fix time formatting in links. - Fix copy QR code in night mode. - Fix invite link sharing without a comment. - Fix crash in link editing on Linux. --- 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 | 7 +++++++ 6 files changed, 22 insertions(+), 15 deletions(-) diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml index 3816c85993..ca00d3c6f6 100644 --- a/Telegram/Resources/uwp/AppX/AppxManifest.xml +++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml @@ -9,7 +9,7 @@ + Version="2.6.1.0" /> Telegram Desktop Telegram Messenger LLP diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc index 5c6f539bbc..aa66f6a3ff 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,6,0,0 - PRODUCTVERSION 2,6,0,0 + FILEVERSION 2,6,1,0 + PRODUCTVERSION 2,6,1,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.6.0.0" + VALUE "FileVersion", "2.6.1.0" VALUE "LegalCopyright", "Copyright (C) 2014-2021" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "2.6.0.0" + VALUE "ProductVersion", "2.6.1.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc index 7f933960f7..3d8a059d05 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,6,0,0 - PRODUCTVERSION 2,6,0,0 + FILEVERSION 2,6,1,0 + PRODUCTVERSION 2,6,1,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.6.0.0" + VALUE "FileVersion", "2.6.1.0" VALUE "LegalCopyright", "Copyright (C) 2014-2021" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "2.6.0.0" + VALUE "ProductVersion", "2.6.1.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h index c244d62f81..dc501ac125 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 = 2006000; -constexpr auto AppVersionStr = "2.6"; +constexpr auto AppVersion = 2006001; +constexpr auto AppVersionStr = "2.6.1"; constexpr auto AppBetaVersion = false; constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION; diff --git a/Telegram/build/version b/Telegram/build/version index 73aab998cd..94a184b9be 100644 --- a/Telegram/build/version +++ b/Telegram/build/version @@ -1,7 +1,7 @@ -AppVersion 2006000 +AppVersion 2006001 AppVersionStrMajor 2.6 -AppVersionStrSmall 2.6 -AppVersionStr 2.6.0 +AppVersionStrSmall 2.6.1 +AppVersionStr 2.6.1 BetaChannel 0 AlphaVersion 0 -AppVersionOriginal 2.6 +AppVersionOriginal 2.6.1 diff --git a/changelog.txt b/changelog.txt index 8e0d7ba4be..f61033079a 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,10 @@ +2.6.1 (24.02.21) + +- Fix time formatting in links. +- Fix copy QR code in night mode. +- Fix invite link sharing without a comment. +- Fix crash in link editing on Linux. + 2.6 (23.02.21) - Set messages to auto-delete for everyone 24 hours or 7 days after sending.