diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml index 59548d219..3816c8599 100644 --- a/Telegram/Resources/uwp/AppX/AppxManifest.xml +++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml @@ -9,7 +9,7 @@ + Version="2.6.0.0" /> Telegram Desktop Telegram Messenger LLP diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc index 8b2cd0dd5..5c6f539bb 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,5,9,1 - PRODUCTVERSION 2,5,9,1 + FILEVERSION 2,6,0,0 + PRODUCTVERSION 2,6,0,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.5.9.1" + VALUE "FileVersion", "2.6.0.0" VALUE "LegalCopyright", "Copyright (C) 2014-2021" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "2.5.9.1" + VALUE "ProductVersion", "2.6.0.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc index 74007b791..7f933960f 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,5,9,1 - PRODUCTVERSION 2,5,9,1 + FILEVERSION 2,6,0,0 + PRODUCTVERSION 2,6,0,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.5.9.1" + VALUE "FileVersion", "2.6.0.0" VALUE "LegalCopyright", "Copyright (C) 2014-2021" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "2.5.9.1" + VALUE "ProductVersion", "2.6.0.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h index 16b953451..c244d62f8 100644 --- a/Telegram/SourceFiles/core/version.h +++ b/Telegram/SourceFiles/core/version.h @@ -9,7 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "base/const_string.h" -#define TDESKTOP_REQUESTED_ALPHA_VERSION (2005009001ULL) +#define TDESKTOP_REQUESTED_ALPHA_VERSION (0ULL) #ifdef TDESKTOP_ALLOW_CLOSED_ALPHA #define TDESKTOP_ALPHA_VERSION TDESKTOP_REQUESTED_ALPHA_VERSION @@ -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 = 2005009; -constexpr auto AppVersionStr = "2.5.9"; +constexpr auto AppVersion = 2006000; +constexpr auto AppVersionStr = "2.6"; constexpr auto AppBetaVersion = false; constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION; diff --git a/Telegram/build/version b/Telegram/build/version index 7d949483b..73aab998c 100644 --- a/Telegram/build/version +++ b/Telegram/build/version @@ -1,7 +1,7 @@ -AppVersion 2005009 -AppVersionStrMajor 2.5 -AppVersionStrSmall 2.5.9 -AppVersionStr 2.5.9 +AppVersion 2006000 +AppVersionStrMajor 2.6 +AppVersionStrSmall 2.6 +AppVersionStr 2.6.0 BetaChannel 0 -AlphaVersion 2005009001 -AppVersionOriginal 2.5.9.1 +AlphaVersion 0 +AppVersionOriginal 2.6 diff --git a/changelog.txt b/changelog.txt index 4122791cb..8e0d7ba4b 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,14 @@ +2.6 (23.02.21) + +- Set messages to auto-delete for everyone 24 hours or 7 days after sending. +- Control auto-delete settings in any of your chats, as well as in groups and channels where you are an admin. +- To enable auto-delete, right click on the chat in the chat list > Clear History > Enable Auto-Delete. +- Create invite links that work for a limited time or a limited number of uses. +- See which users joined using your, or your admins', invite links. +- Turn any invite link into a QR code users can scan with their phone cameras. +- To manage invite links, click ... > Manage Group/Channel > Invite Links. +- Convert groups that have reached 200,000 members into unlimited Broadcast Groups. + 2.5.9 (17.02.21) - Add 'Invite via Link' button to Add Members box.