From 6bb39451eac1a25be2bd7ef02eef858f6817c4dc Mon Sep 17 00:00:00 2001 From: John Preston Date: Thu, 25 Jan 2018 16:34:48 +0300 Subject: [PATCH] Closed beta 1.2.8.1. --- Telegram/Resources/uwp/AppX/AppxManifest.xml | 2 +- Telegram/Resources/winrc/Telegram.rc | 8 ++++---- Telegram/Resources/winrc/Updater.rc | 8 ++++---- Telegram/SourceFiles/core/version.h | 4 ++-- Telegram/SourceFiles/window/window_peer_menu.cpp | 2 +- Telegram/build/version | 4 ++-- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml index 846779aaf..9fe06caad 100644 --- a/Telegram/Resources/uwp/AppX/AppxManifest.xml +++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml @@ -9,7 +9,7 @@ + Version="1.2.8.1" /> Telegram Desktop Telegram Messenger LLP diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc index 45e6a0af6..8f51474f9 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,2,8,0 - PRODUCTVERSION 1,2,8,0 + FILEVERSION 1,2,8,1 + PRODUCTVERSION 1,2,8,1 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -52,10 +52,10 @@ BEGIN BEGIN VALUE "CompanyName", "Telegram Messenger LLP" VALUE "FileDescription", "Telegram Desktop" - VALUE "FileVersion", "1.2.8.0" + VALUE "FileVersion", "1.2.8.1" VALUE "LegalCopyright", "Copyright (C) 2014-2018" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "1.2.8.0" + VALUE "ProductVersion", "1.2.8.1" END END BLOCK "VarFileInfo" diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc index ad7221fb0..270ce950a 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,2,8,0 - PRODUCTVERSION 1,2,8,0 + FILEVERSION 1,2,8,1 + PRODUCTVERSION 1,2,8,1 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.2.8.0" + VALUE "FileVersion", "1.2.8.1" VALUE "LegalCopyright", "Copyright (C) 2014-2018" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "1.2.8.0" + VALUE "ProductVersion", "1.2.8.1" END END BLOCK "VarFileInfo" diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h index 4ed7200f9..c11efab94 100644 --- a/Telegram/SourceFiles/core/version.h +++ b/Telegram/SourceFiles/core/version.h @@ -9,9 +9,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "core/utils.h" -#define BETA_VERSION_MACRO (0ULL) +#define BETA_VERSION_MACRO (1002008001ULL) constexpr int AppVersion = 1002008; constexpr str_const AppVersionStr = "1.2.8"; -constexpr bool AppAlphaVersion = true; +constexpr bool AppAlphaVersion = false; constexpr uint64 AppBetaVersion = BETA_VERSION_MACRO; diff --git a/Telegram/SourceFiles/window/window_peer_menu.cpp b/Telegram/SourceFiles/window/window_peer_menu.cpp index a306209fe..33da830f9 100644 --- a/Telegram/SourceFiles/window/window_peer_menu.cpp +++ b/Telegram/SourceFiles/window/window_peer_menu.cpp @@ -349,7 +349,7 @@ void Filler::addChatActions(not_null chat) { void Filler::addChannelActions(not_null channel) { auto isGroup = channel->isMegagroup(); - if (!isGroup) { + if (false && !isGroup) { const auto grouped = (channel->feed() != nullptr); _addAction( lang(grouped ? lng_feed_ungroup : lng_feed_group), diff --git a/Telegram/build/version b/Telegram/build/version index b85ba4036..4944fb526 100644 --- a/Telegram/build/version +++ b/Telegram/build/version @@ -2,5 +2,5 @@ AppVersion 1002008 AppVersionStrMajor 1.2 AppVersionStrSmall 1.2.8 AppVersionStr 1.2.8 -AlphaChannel 1 -BetaVersion 0 +AlphaChannel 0 +BetaVersion 1002008001