Этот коммит содержится в:
John Preston 2018-01-25 16:34:48 +03:00
родитель 099a3c4642
Коммит 6bb39451ea
6 изменённых файлов: 14 добавлений и 14 удалений

Просмотреть файл

@ -9,7 +9,7 @@
<Identity Name="TelegramMessengerLLP.TelegramDesktop" <Identity Name="TelegramMessengerLLP.TelegramDesktop"
ProcessorArchitecture="ARCHITECTURE" ProcessorArchitecture="ARCHITECTURE"
Publisher="CN=536BC709-8EE1-4478-AF22-F0F0F26FF64A" Publisher="CN=536BC709-8EE1-4478-AF22-F0F0F26FF64A"
Version="1.2.8.0" /> Version="1.2.8.1" />
<Properties> <Properties>
<DisplayName>Telegram Desktop</DisplayName> <DisplayName>Telegram Desktop</DisplayName>
<PublisherDisplayName>Telegram Messenger LLP</PublisherDisplayName> <PublisherDisplayName>Telegram Messenger LLP</PublisherDisplayName>

Просмотреть файл

@ -34,8 +34,8 @@ IDI_ICON1 ICON "..\\art\\icon256.ico"
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,2,8,0 FILEVERSION 1,2,8,1
PRODUCTVERSION 1,2,8,0 PRODUCTVERSION 1,2,8,1
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@ -52,10 +52,10 @@ BEGIN
BEGIN BEGIN
VALUE "CompanyName", "Telegram Messenger LLP" VALUE "CompanyName", "Telegram Messenger LLP"
VALUE "FileDescription", "Telegram Desktop" VALUE "FileDescription", "Telegram Desktop"
VALUE "FileVersion", "1.2.8.0" VALUE "FileVersion", "1.2.8.1"
VALUE "LegalCopyright", "Copyright (C) 2014-2018" VALUE "LegalCopyright", "Copyright (C) 2014-2018"
VALUE "ProductName", "Telegram Desktop" VALUE "ProductName", "Telegram Desktop"
VALUE "ProductVersion", "1.2.8.0" VALUE "ProductVersion", "1.2.8.1"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"

Просмотреть файл

@ -25,8 +25,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,2,8,0 FILEVERSION 1,2,8,1
PRODUCTVERSION 1,2,8,0 PRODUCTVERSION 1,2,8,1
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@ -43,10 +43,10 @@ BEGIN
BEGIN BEGIN
VALUE "CompanyName", "Telegram Messenger LLP" VALUE "CompanyName", "Telegram Messenger LLP"
VALUE "FileDescription", "Telegram Desktop Updater" VALUE "FileDescription", "Telegram Desktop Updater"
VALUE "FileVersion", "1.2.8.0" VALUE "FileVersion", "1.2.8.1"
VALUE "LegalCopyright", "Copyright (C) 2014-2018" VALUE "LegalCopyright", "Copyright (C) 2014-2018"
VALUE "ProductName", "Telegram Desktop" VALUE "ProductName", "Telegram Desktop"
VALUE "ProductVersion", "1.2.8.0" VALUE "ProductVersion", "1.2.8.1"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"

Просмотреть файл

@ -9,9 +9,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "core/utils.h" #include "core/utils.h"
#define BETA_VERSION_MACRO (0ULL) #define BETA_VERSION_MACRO (1002008001ULL)
constexpr int AppVersion = 1002008; constexpr int AppVersion = 1002008;
constexpr str_const AppVersionStr = "1.2.8"; constexpr str_const AppVersionStr = "1.2.8";
constexpr bool AppAlphaVersion = true; constexpr bool AppAlphaVersion = false;
constexpr uint64 AppBetaVersion = BETA_VERSION_MACRO; constexpr uint64 AppBetaVersion = BETA_VERSION_MACRO;

Просмотреть файл

@ -349,7 +349,7 @@ void Filler::addChatActions(not_null<ChatData*> chat) {
void Filler::addChannelActions(not_null<ChannelData*> channel) { void Filler::addChannelActions(not_null<ChannelData*> channel) {
auto isGroup = channel->isMegagroup(); auto isGroup = channel->isMegagroup();
if (!isGroup) { if (false && !isGroup) {
const auto grouped = (channel->feed() != nullptr); const auto grouped = (channel->feed() != nullptr);
_addAction( _addAction(
lang(grouped ? lng_feed_ungroup : lng_feed_group), lang(grouped ? lng_feed_ungroup : lng_feed_group),

Просмотреть файл

@ -2,5 +2,5 @@ AppVersion 1002008
AppVersionStrMajor 1.2 AppVersionStrMajor 1.2
AppVersionStrSmall 1.2.8 AppVersionStrSmall 1.2.8
AppVersionStr 1.2.8 AppVersionStr 1.2.8
AlphaChannel 1 AlphaChannel 0
BetaVersion 0 BetaVersion 1002008001