diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml index 2b4684703..e980d93c5 100644 --- a/Telegram/Resources/uwp/AppX/AppxManifest.xml +++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml @@ -9,7 +9,7 @@ + Version="2.4.6.0" /> Telegram Desktop Telegram FZ-LLC diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc index d3e3016ee..742e023b9 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,5,0 - PRODUCTVERSION 2,4,5,0 + FILEVERSION 2,4,6,0 + PRODUCTVERSION 2,4,6,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.5.0" + VALUE "FileVersion", "2.4.6.0" VALUE "LegalCopyright", "Copyright (C) 2014-2020" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "2.4.5.0" + VALUE "ProductVersion", "2.4.6.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc index 14d7d441c..b3e504d3c 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,5,0 - PRODUCTVERSION 2,4,5,0 + FILEVERSION 2,4,6,0 + PRODUCTVERSION 2,4,6,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.5.0" + VALUE "FileVersion", "2.4.6.0" VALUE "LegalCopyright", "Copyright (C) 2014-2020" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "2.4.5.0" + VALUE "ProductVersion", "2.4.6.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/SourceFiles/core/changelogs.cpp b/Telegram/SourceFiles/core/changelogs.cpp index 6dc84e216..79cd1afae 100644 --- a/Telegram/SourceFiles/core/changelogs.cpp +++ b/Telegram/SourceFiles/core/changelogs.cpp @@ -21,26 +21,6 @@ namespace { std::map BetaLogs() { return { - { - 1009020, - "- Fix crash in shared links search.\n" - - "- Fix blurred thumbnails in albums with video files.\n" - - "- Fix a possible crash in animated stickers rendering." - }, - { - 1009022, - "- Organize chats into Chat Folders if you have too many chats.\n" - }, - { - 2000001, - "- Switch between folders using Ctrl+1, ..., Ctrl+8.\n" - - "- Fix crash when a pinned in folder chat was added to archive.\n" - - "- Fix font issues in Linux version." - }, { 2001008, "- Add support for full group message history export.\n" @@ -95,6 +75,16 @@ std::map BetaLogs() { "- Enjoy dark native window frame for Telegram night mode on Windows.\n" }, + { + 2004006, + "- Fix image compression option when sending files with drag-n-drop.\n" + + "- Fix caption text selection in media albums.\n" + + "- Fix drafts display in personal chats in the chats list.\n" + + "- Bug fixes and other minor improvements.\n" + }, }; }; diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h index 3acc61b90..170e5c1c5 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 = 2004005; -constexpr auto AppVersionStr = "2.4.5"; +constexpr auto AppVersion = 2004006; +constexpr auto AppVersionStr = "2.4.6"; constexpr auto AppBetaVersion = false; constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION; diff --git a/Telegram/build/version b/Telegram/build/version index 9e25ad196..12ea85af0 100644 --- a/Telegram/build/version +++ b/Telegram/build/version @@ -1,7 +1,7 @@ -AppVersion 2004005 +AppVersion 2004006 AppVersionStrMajor 2.4 -AppVersionStrSmall 2.4.5 -AppVersionStr 2.4.5 +AppVersionStrSmall 2.4.6 +AppVersionStr 2.4.6 BetaChannel 0 AlphaVersion 0 -AppVersionOriginal 2.4.5 +AppVersionOriginal 2.4.6 diff --git a/Telegram/lib_base b/Telegram/lib_base index df430bc4a..ffe7a4681 160000 --- a/Telegram/lib_base +++ b/Telegram/lib_base @@ -1 +1 @@ -Subproject commit df430bc4a27ec62b736d2f43c4b5feacc79605f4 +Subproject commit ffe7a4681ab4b11353c62c36d010db96f0f90fd8 diff --git a/changelog.txt b/changelog.txt index c23f21627..ecb7f0552 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,10 @@ +2.4.6 (02.11.20) + +- Fix image compression option when sending files with drag-n-drop. +- Fix caption text selection in media albums. +- Fix drafts display in personal chats in the chats list. +- Bug fixes and other minor improvements. + 2.4.5 (30.10.20) - Pin several messages in any chat, including one-on-one chats.