From f4822cf55894825b64dbdc4809ee49e0a5160c32 Mon Sep 17 00:00:00 2001 From: John Preston Date: Mon, 30 Mar 2020 16:56:15 +0400 Subject: [PATCH] Version 2.0. - Organize chats into Chat Folders if you have too many chats. - Create custom folders with flexible settings, or use default recommendations. - Pin an unlimited number of chats in each folder. - Switch between folders in the new side bar to easily access all of your chats. - Send :dice: to any chat to try your luck and get a random number from the animated dice. - Send :virus:, :face_with_thermometer:, :mask:, :face_with_head_bandage:, :sneeze:, :sick:, :soap: or :ambulance: to try out the new animated emoji. --- 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 | 9 +++++++++ cmake | 2 +- 7 files changed, 28 insertions(+), 19 deletions(-) diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml index 5db8923b4..9feaa42a4 100644 --- a/Telegram/Resources/uwp/AppX/AppxManifest.xml +++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml @@ -9,7 +9,7 @@ + Version="2.0.0.0" /> Telegram Desktop Telegram FZ-LLC diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc index 9d7cda51b..3b4fe93d0 100644 --- a/Telegram/Resources/winrc/Telegram.rc +++ b/Telegram/Resources/winrc/Telegram.rc @@ -33,8 +33,8 @@ IDI_ICON1 ICON "..\\art\\icon256.ico" // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,9,22,0 - PRODUCTVERSION 1,9,22,0 + FILEVERSION 2,0,0,0 + PRODUCTVERSION 2,0,0,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -51,10 +51,10 @@ BEGIN BEGIN VALUE "CompanyName", "Telegram FZ-LLC" VALUE "FileDescription", "Telegram Desktop" - VALUE "FileVersion", "1.9.22.0" + VALUE "FileVersion", "2.0.0.0" VALUE "LegalCopyright", "Copyright (C) 2014-2020" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "1.9.22.0" + VALUE "ProductVersion", "2.0.0.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc index 2c0f6c43c..aac9a90f2 100644 --- a/Telegram/Resources/winrc/Updater.rc +++ b/Telegram/Resources/winrc/Updater.rc @@ -24,8 +24,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,9,22,0 - PRODUCTVERSION 1,9,22,0 + FILEVERSION 2,0,0,0 + PRODUCTVERSION 2,0,0,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -42,10 +42,10 @@ BEGIN BEGIN VALUE "CompanyName", "Telegram FZ-LLC" VALUE "FileDescription", "Telegram Desktop Updater" - VALUE "FileVersion", "1.9.22.0" + VALUE "FileVersion", "2.0.0.0" VALUE "LegalCopyright", "Copyright (C) 2014-2020" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "1.9.22.0" + VALUE "ProductVersion", "2.0.0.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h index 455f6c8b7..ad8bc511f 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 = 1009022; -constexpr auto AppVersionStr = "1.9.22"; -constexpr auto AppBetaVersion = true; +constexpr auto AppVersion = 2000000; +constexpr auto AppVersionStr = "2.0"; +constexpr auto AppBetaVersion = false; constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION; diff --git a/Telegram/build/version b/Telegram/build/version index a1f24723d..b6e9151e0 100644 --- a/Telegram/build/version +++ b/Telegram/build/version @@ -1,7 +1,7 @@ -AppVersion 1009022 -AppVersionStrMajor 1.9 -AppVersionStrSmall 1.9.22 -AppVersionStr 1.9.22 -BetaChannel 1 +AppVersion 2000000 +AppVersionStrMajor 2.0 +AppVersionStrSmall 2.0 +AppVersionStr 2.0.0 +BetaChannel 0 AlphaVersion 0 -AppVersionOriginal 1.9.22.beta +AppVersionOriginal 2.0 diff --git a/changelog.txt b/changelog.txt index 258870949..5d85a0ba8 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,12 @@ +2.0 (30.03.20) + +- Organize chats into Chat Folders if you have too many chats. +- Create custom folders with flexible settings, or use default recommendations. +- Pin an unlimited number of chats in each folder. +- Switch between folders in the new side bar to easily access all of your chats. +- Send :dice: to any chat to try your luck and get a random number from the animated dice. +- Send :virus:, :face_with_thermometer:, :mask:, :face_with_head_bandage:, :sneeze:, :sick:, :soap: or :ambulance: to try out the new animated emoji. + 1.9.22 beta (27.03.20) - Organize chats into Chat Folders if you have too many chats. diff --git a/cmake b/cmake index d48723593..b4ea62dfd 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit d48723593fa05c57814c74221e6b39c4c1fb2297 +Subproject commit b4ea62dfda376354aaae1482441a21ee06348580