From 08897aa83a962fb7da211d8254f89b882c0a159e Mon Sep 17 00:00:00 2001 From: John Preston Date: Sat, 26 May 2018 18:48:11 +0300 Subject: [PATCH] Alpha version 1.2.24. - Add links with custom text from context menu or by Ctrl/Cmd + K. --- Telegram/Resources/uwp/AppX/AppxManifest.xml | 2 +- Telegram/Resources/winrc/Telegram.rc | 8 ++++---- Telegram/Resources/winrc/Updater.rc | 8 ++++---- Telegram/SourceFiles/core/changelogs.cpp | 5 +++++ Telegram/SourceFiles/core/version.h | 4 ++-- Telegram/build/version | 6 +++--- changelog.txt | 4 ++++ 7 files changed, 23 insertions(+), 14 deletions(-) diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml index 967f69959..abe2288f2 100644 --- a/Telegram/Resources/uwp/AppX/AppxManifest.xml +++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml @@ -9,7 +9,7 @@ + Version="1.2.24.0" /> Telegram Desktop Telegram Messenger LLP diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc index 88106806e..9455ac1e7 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,23,0 - PRODUCTVERSION 1,2,23,0 + FILEVERSION 1,2,24,0 + PRODUCTVERSION 1,2,24,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.2.23.0" + VALUE "FileVersion", "1.2.24.0" VALUE "LegalCopyright", "Copyright (C) 2014-2018" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "1.2.23.0" + VALUE "ProductVersion", "1.2.24.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc index b80ddc03d..d8ef6adbb 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,23,0 - PRODUCTVERSION 1,2,23,0 + FILEVERSION 1,2,24,0 + PRODUCTVERSION 1,2,24,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.2.23.0" + VALUE "FileVersion", "1.2.24.0" VALUE "LegalCopyright", "Copyright (C) 2014-2018" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "1.2.23.0" + VALUE "ProductVersion", "1.2.24.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/SourceFiles/core/changelogs.cpp b/Telegram/SourceFiles/core/changelogs.cpp index 826d3481c..644438490 100644 --- a/Telegram/SourceFiles/core/changelogs.cpp +++ b/Telegram/SourceFiles/core/changelogs.cpp @@ -95,6 +95,11 @@ std::map AlphaLogs() { "\xE2\x80\x94 Apply formatting by hotkeys.\n" "\xE2\x80\x94 Bug fixes and other minor improvements." + }, + { + 1002024, + "\xE2\x80\x94 Add links with custom text from context menu " + "or by Ctrl/Cmd + K keyboard shortcut." } }; } diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h index 8e32fcc10..859653dd8 100644 --- a/Telegram/SourceFiles/core/version.h +++ b/Telegram/SourceFiles/core/version.h @@ -11,7 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #define BETA_VERSION_MACRO (0ULL) -constexpr int AppVersion = 1002023; -constexpr str_const AppVersionStr = "1.2.23"; +constexpr int AppVersion = 1002024; +constexpr str_const AppVersionStr = "1.2.24"; constexpr bool AppAlphaVersion = true; constexpr uint64 AppBetaVersion = BETA_VERSION_MACRO; diff --git a/Telegram/build/version b/Telegram/build/version index 06bd0eff6..fd5b48aec 100644 --- a/Telegram/build/version +++ b/Telegram/build/version @@ -1,6 +1,6 @@ -AppVersion 1002023 +AppVersion 1002024 AppVersionStrMajor 1.2 -AppVersionStrSmall 1.2.23 -AppVersionStr 1.2.23 +AppVersionStrSmall 1.2.24 +AppVersionStr 1.2.24 AlphaChannel 1 BetaVersion 0 diff --git a/changelog.txt b/changelog.txt index f4c13d07c..51baad6ec 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,7 @@ +1.2.24 alpha (26.05.18) + +- Add links with custom text from context menu or by Ctrl/Cmd + K keyboard shortcut. + 1.2.23 alpha (25.05.18) - Apply formatting from input field context menu.