From 383e6dec43037b313a852bb3ad7e43a6ed094668 Mon Sep 17 00:00:00 2001 From: John Preston Date: Wed, 3 Jun 2020 15:51:27 +0400 Subject: [PATCH] Beta version 2.1.8. - Add support for full group message history export. - Allow export of a single chat message history in JSON format. --- Telegram/Resources/uwp/AppX/AppxManifest.xml | 2 +- Telegram/Resources/winrc/Telegram.rc | 8 ++--- Telegram/Resources/winrc/Updater.rc | 8 ++--- Telegram/SourceFiles/core/changelogs.cpp | 31 +++++--------------- Telegram/SourceFiles/core/version.h | 8 ++--- Telegram/build/version | 12 ++++---- changelog.txt | 5 ++++ 7 files changed, 31 insertions(+), 43 deletions(-) diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml index 314e26dbc..2261e12d6 100644 --- a/Telegram/Resources/uwp/AppX/AppxManifest.xml +++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml @@ -9,7 +9,7 @@ + Version="2.1.8.0" /> Telegram Desktop Telegram FZ-LLC diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc index 7e097b1e3..31ea6cb6f 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,7,4 - PRODUCTVERSION 2,1,7,4 + FILEVERSION 2,1,8,0 + PRODUCTVERSION 2,1,8,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.7.4" + VALUE "FileVersion", "2.1.8.0" VALUE "LegalCopyright", "Copyright (C) 2014-2020" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "2.1.7.4" + VALUE "ProductVersion", "2.1.8.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc index e3c4bb9b3..aef821f64 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,7,4 - PRODUCTVERSION 2,1,7,4 + FILEVERSION 2,1,8,0 + PRODUCTVERSION 2,1,8,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.7.4" + VALUE "FileVersion", "2.1.8.0" VALUE "LegalCopyright", "Copyright (C) 2014-2020" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "2.1.7.4" + VALUE "ProductVersion", "2.1.8.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/SourceFiles/core/changelogs.cpp b/Telegram/SourceFiles/core/changelogs.cpp index 82b6dfc51..828a6efb7 100644 --- a/Telegram/SourceFiles/core/changelogs.cpp +++ b/Telegram/SourceFiles/core/changelogs.cpp @@ -18,30 +18,6 @@ namespace { std::map BetaLogs() { return { - { - 1009010, - "\xE2\x80\xA2 Switch to the Picture-in-Picture mode " - "to watch your video in a small window.\n" - - "\xE2\x80\xA2 Change video playback speed " - "in the playback controls '...' menu.\n" - - "\xE2\x80\xA2 Rotate photos and videos in the media viewer " - "using the rotate button in the bottom right corner.\n" - }, - { - 1009015, - "\xE2\x80\xA2 Mark new messages as read " - "while scrolling down through them.\n" - - "\xE2\x80\xA2 Bug fixes and other minor improvements." - }, - { - 1009017, - "\xE2\x80\xA2 Spell checker on Windows 7.\n" - - "\xE2\x80\xA2 Bug fixes and other minor improvements." - }, { 1009020, "\xE2\x80\xA2 Fix crash in shared links search.\n" @@ -63,6 +39,13 @@ std::map BetaLogs() { "was added to archive.\n" "\xE2\x80\xA2 Fix font issues in Linux version." + }, + { + 2001008, + "\xE2\x80\xA2 Add support for full group message history export.\n" + + "\xE2\x80\xA2 Allow export of a single chat message history " + "in JSON format." } }; }; diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h index 6364af5a7..8e7cfe44c 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 (2001007004ULL) +#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 = 2001007; -constexpr auto AppVersionStr = "2.1.7"; -constexpr auto AppBetaVersion = false; +constexpr auto AppVersion = 2001008; +constexpr auto AppVersionStr = "2.1.8"; +constexpr auto AppBetaVersion = true; constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION; diff --git a/Telegram/build/version b/Telegram/build/version index 143da2267..49b43a09d 100644 --- a/Telegram/build/version +++ b/Telegram/build/version @@ -1,7 +1,7 @@ -AppVersion 2001007 +AppVersion 2001008 AppVersionStrMajor 2.1 -AppVersionStrSmall 2.1.7 -AppVersionStr 2.1.7 -BetaChannel 0 -AlphaVersion 2001007004 -AppVersionOriginal 2.1.7.4 +AppVersionStrSmall 2.1.8 +AppVersionStr 2.1.8 +BetaChannel 1 +AlphaVersion 0 +AppVersionOriginal 2.1.8.beta diff --git a/changelog.txt b/changelog.txt index 6fd363d75..d24caa27b 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,8 @@ +2.1.8 beta (03.06.20) + +- Add support for full group message history export. +- Allow export of a single chat message history in JSON format. + 2.1.7 (24.05.20) - Fix the Fcitx input method plugin.