From e5434ea4915a93eb90b4c75ae79cb571001f7e3b Mon Sep 17 00:00:00 2001 From: John Preston Date: Sun, 26 Jul 2020 11:21:44 +0400 Subject: [PATCH] Version 2.2. - Quickly switch between different Telegram accounts if you use multiple phone numbers. - Share and store unlimited files of any type, now up to 2'000 MB each. - Edit your scheduled messages. - Use Auto-Night Mode to make Telegram night mode match the system Dark Mode settings. - Also added an option to switch to system window frame in Windows and 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 | 6 +++--- Telegram/build/version | 12 ++++++------ changelog.txt | 8 ++++++++ cmake | 2 +- 7 files changed, 27 insertions(+), 19 deletions(-) diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml index ad054d009..33ef178c4 100644 --- a/Telegram/Resources/uwp/AppX/AppxManifest.xml +++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml @@ -9,7 +9,7 @@ + Version="2.2.0.0" /> Telegram Desktop Telegram FZ-LLC diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc index 18df445c5..5881ffe0c 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,1,22,1 - PRODUCTVERSION 2,1,22,1 + FILEVERSION 2,2,0,0 + PRODUCTVERSION 2,2,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.1.22.1" + VALUE "FileVersion", "2.2.0.0" VALUE "LegalCopyright", "Copyright (C) 2014-2020" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "2.1.22.1" + VALUE "ProductVersion", "2.2.0.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc index 456434af9..bc71aed69 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,1,22,1 - PRODUCTVERSION 2,1,22,1 + FILEVERSION 2,2,0,0 + PRODUCTVERSION 2,2,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.1.22.1" + VALUE "FileVersion", "2.2.0.0" VALUE "LegalCopyright", "Copyright (C) 2014-2020" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "2.1.22.1" + VALUE "ProductVersion", "2.2.0.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h index 56a73c6d3..a58f1f3e4 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 (2001022001ULL) +#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 = 2001022; -constexpr auto AppVersionStr = "2.1.22"; +constexpr auto AppVersion = 2002000; +constexpr auto AppVersionStr = "2.2"; constexpr auto AppBetaVersion = false; constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION; diff --git a/Telegram/build/version b/Telegram/build/version index a10be19e0..1e6dcc8b9 100644 --- a/Telegram/build/version +++ b/Telegram/build/version @@ -1,7 +1,7 @@ -AppVersion 2001022 -AppVersionStrMajor 2.1 -AppVersionStrSmall 2.1.22 -AppVersionStr 2.1.22 +AppVersion 2002000 +AppVersionStrMajor 2.2 +AppVersionStrSmall 2.2 +AppVersionStr 2.2.0 BetaChannel 0 -AlphaVersion 2001022001 -AppVersionOriginal 2.1.22.1 +AlphaVersion 0 +AppVersionOriginal 2.2 diff --git a/changelog.txt b/changelog.txt index c7f878165..e50be947f 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,11 @@ +2.2 (26.07.20) + +- Quickly switch between different Telegram accounts if you use multiple phone numbers. +- Share and store unlimited files of any type, now up to 2'000 MB each. +- Edit your scheduled messages. +- Use Auto-Night Mode to make Telegram night mode match the system Dark Mode settings. +- Also added an option to switch to system window frame in Windows and Linux. + 2.1.22 beta (24.07.20) - Fix crash in web page preview display. diff --git a/cmake b/cmake index 80835258c..3f73163b0 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 80835258c7fed0bf1de9b3c2fb094bd92ad2f825 +Subproject commit 3f73163b0692f34136b4c5fd0d748a2ac91922cd