From 8829b742fd77062a438b83a3adbe180cd5f8a944 Mon Sep 17 00:00:00 2001 From: John Preston Date: Tue, 28 May 2019 18:35:55 +0200 Subject: [PATCH] Beta version 1.7.1. - Disabled pinned messages notifications in Settings. --- Telegram/Resources/uwp/AppX/AppxManifest.xml | 2 +- Telegram/Resources/winrc/Telegram.rc | 8 ++++---- Telegram/Resources/winrc/Updater.rc | 8 ++++---- Telegram/SourceFiles/core/changelogs.cpp | 4 ++++ Telegram/SourceFiles/core/version.h | 8 ++++---- Telegram/build/version | 10 +++++----- changelog.txt | 4 ++++ 7 files changed, 26 insertions(+), 18 deletions(-) diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml index 4929fe869e..7710b5ef3f 100644 --- a/Telegram/Resources/uwp/AppX/AppxManifest.xml +++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml @@ -9,7 +9,7 @@ + Version="1.7.1.0" /> Telegram Desktop Telegram Messenger LLP diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc index 4f21183175..936aa07d9c 100644 --- a/Telegram/Resources/winrc/Telegram.rc +++ b/Telegram/Resources/winrc/Telegram.rc @@ -34,8 +34,8 @@ IDI_ICON1 ICON "..\\art\\icon256.ico" // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,7,0,1 - PRODUCTVERSION 1,7,0,1 + FILEVERSION 1,7,1,0 + PRODUCTVERSION 1,7,1,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -52,10 +52,10 @@ BEGIN BEGIN VALUE "CompanyName", "Telegram Messenger LLP" VALUE "FileDescription", "Telegram Desktop" - VALUE "FileVersion", "1.7.0.1" + VALUE "FileVersion", "1.7.1.0" VALUE "LegalCopyright", "Copyright (C) 2014-2019" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "1.7.0.1" + VALUE "ProductVersion", "1.7.1.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc index 0940b703e5..831a3b92c5 100644 --- a/Telegram/Resources/winrc/Updater.rc +++ b/Telegram/Resources/winrc/Updater.rc @@ -25,8 +25,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,7,0,1 - PRODUCTVERSION 1,7,0,1 + FILEVERSION 1,7,1,0 + PRODUCTVERSION 1,7,1,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -43,10 +43,10 @@ BEGIN BEGIN VALUE "CompanyName", "Telegram Messenger LLP" VALUE "FileDescription", "Telegram Desktop Updater" - VALUE "FileVersion", "1.7.0.1" + VALUE "FileVersion", "1.7.1.0" VALUE "LegalCopyright", "Copyright (C) 2014-2019" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "1.7.0.1" + VALUE "ProductVersion", "1.7.1.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/SourceFiles/core/changelogs.cpp b/Telegram/SourceFiles/core/changelogs.cpp index 467dcb5dc6..2c06095de1 100644 --- a/Telegram/SourceFiles/core/changelogs.cpp +++ b/Telegram/SourceFiles/core/changelogs.cpp @@ -80,6 +80,10 @@ std::map BetaLogs() { "- Help Telegram improve emoji suggestions in your language " "using this interface https://translations.telegram.org/en/emoji" + }, + { + 1007001, + "- Disable pinned messages notifications in Settings." } }; } diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h index e5b8c4394e..c12859a8a6 100644 --- a/Telegram/SourceFiles/core/version.h +++ b/Telegram/SourceFiles/core/version.h @@ -7,7 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL */ #pragma once -#define TDESKTOP_REQUESTED_ALPHA_VERSION (1007000001ULL) +#define TDESKTOP_REQUESTED_ALPHA_VERSION (0ULL) #ifdef TDESKTOP_OFFICIAL_TARGET #define TDESKTOP_ALPHA_VERSION TDESKTOP_REQUESTED_ALPHA_VERSION @@ -15,7 +15,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #define TDESKTOP_ALPHA_VERSION (0ULL) #endif // TDESKTOP_OFFICIAL_TARGET -constexpr auto AppVersion = 1007000; -constexpr auto AppVersionStr = "1.7"; -constexpr auto AppBetaVersion = false; +constexpr auto AppVersion = 1007001; +constexpr auto AppVersionStr = "1.7.1"; +constexpr auto AppBetaVersion = true; constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION; diff --git a/Telegram/build/version b/Telegram/build/version index 6bc437de67..d4a3c2397e 100644 --- a/Telegram/build/version +++ b/Telegram/build/version @@ -1,6 +1,6 @@ -AppVersion 1007000 +AppVersion 1007001 AppVersionStrMajor 1.7 -AppVersionStrSmall 1.7 -AppVersionStr 1.7.0 -BetaChannel 0 -AlphaVersion 1007000001 +AppVersionStrSmall 1.7.1 +AppVersionStr 1.7.1 +BetaChannel 1 +AlphaVersion 0 diff --git a/changelog.txt b/changelog.txt index d697530846..cf5d6b43bf 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,7 @@ +1.7.1 beta (28.05.19) + +- Disable pinned messages notifications in Settings. + 1.7 (08.05.19) Introducing Archived Chats: