diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml index 7c0dcd854..084fa3d8f 100644 --- a/Telegram/Resources/uwp/AppX/AppxManifest.xml +++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml @@ -9,7 +9,7 @@ + Version="1.7.11.0" /> Telegram Desktop Telegram Messenger LLP diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc index 1de44b2a2..dd174ee81 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,10,1 - PRODUCTVERSION 1,7,10,1 + FILEVERSION 1,7,11,0 + PRODUCTVERSION 1,7,11,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.10.1" + VALUE "FileVersion", "1.7.11.0" VALUE "LegalCopyright", "Copyright (C) 2014-2019" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "1.7.10.1" + VALUE "ProductVersion", "1.7.11.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc index faceb3934..3fefdf5d2 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,10,1 - PRODUCTVERSION 1,7,10,1 + FILEVERSION 1,7,11,0 + PRODUCTVERSION 1,7,11,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.10.1" + VALUE "FileVersion", "1.7.11.0" VALUE "LegalCopyright", "Copyright (C) 2014-2019" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "1.7.10.1" + VALUE "ProductVersion", "1.7.11.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/SourceFiles/core/changelogs.cpp b/Telegram/SourceFiles/core/changelogs.cpp index 2e6f7f625..b23c43860 100644 --- a/Telegram/SourceFiles/core/changelogs.cpp +++ b/Telegram/SourceFiles/core/changelogs.cpp @@ -45,9 +45,15 @@ std::map BetaLogs() { "\xE2\x80\xA2 Apply formatting to selected text parts " "from the MacBook Pro TouchBar." + }, + { + 1007011, + "\xE2\x80\xA2 Use strikethrough and underline formatting.\n" + + "\xE2\x80\xA2 Bug fixes and other minor improvements." } }; -} +}; QString FormatVersionDisplay(int version) { return QString::number(version / 1000000) diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h index a459306e6..50012e52d 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 (1007010001ULL) +#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 = 1007010; -constexpr auto AppVersionStr = "1.7.10"; -constexpr auto AppBetaVersion = false; +constexpr auto AppVersion = 1007011; +constexpr auto AppVersionStr = "1.7.11"; +constexpr auto AppBetaVersion = true; constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION; diff --git a/Telegram/build/version b/Telegram/build/version index d7149396e..c22d88495 100644 --- a/Telegram/build/version +++ b/Telegram/build/version @@ -1,6 +1,6 @@ -AppVersion 1007010 +AppVersion 1007011 AppVersionStrMajor 1.7 -AppVersionStrSmall 1.7.10 -AppVersionStr 1.7.10 -BetaChannel 0 -AlphaVersion 1007010001 +AppVersionStrSmall 1.7.11 +AppVersionStr 1.7.11 +BetaChannel 1 +AlphaVersion 0 diff --git a/changelog.txt b/changelog.txt index 5545a4a1c..6e0708a37 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,8 @@ +1.7.11 beta (04.07.19) + +- Use strikethrough and underline formatting. +- Bug fixes and other minor improvements. + 1.7.10 (24.06.19) - Bug fixes and other minor improvements.