From cca46448fe634d96456a818429a8be6aadc041cd Mon Sep 17 00:00:00 2001 From: John Preston Date: Fri, 25 May 2018 23:39:45 +0300 Subject: [PATCH] Alpha version 1.2.23. - Apply formatting from input field context menu. - Apply formatting by hotkeys. - Bug fixes and other minor improvements. --- Telegram/Resources/uwp/AppX/AppxManifest.xml | 2 +- Telegram/Resources/winrc/Telegram.rc | 8 ++++---- Telegram/Resources/winrc/Updater.rc | 8 ++++---- Telegram/SourceFiles/core/changelogs.cpp | 8 ++++++++ Telegram/SourceFiles/core/version.h | 4 ++-- Telegram/build/version | 6 +++--- changelog.txt | 6 ++++++ 7 files changed, 28 insertions(+), 14 deletions(-) diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml index 65cd2d83d..967f69959 100644 --- a/Telegram/Resources/uwp/AppX/AppxManifest.xml +++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml @@ -9,7 +9,7 @@ + Version="1.2.23.0" /> Telegram Desktop Telegram Messenger LLP diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc index 9ed371a9b..88106806e 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,22,0 - PRODUCTVERSION 1,2,22,0 + FILEVERSION 1,2,23,0 + PRODUCTVERSION 1,2,23,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.22.0" + VALUE "FileVersion", "1.2.23.0" VALUE "LegalCopyright", "Copyright (C) 2014-2018" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "1.2.22.0" + VALUE "ProductVersion", "1.2.23.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc index b0a826cdf..b80ddc03d 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,22,0 - PRODUCTVERSION 1,2,22,0 + FILEVERSION 1,2,23,0 + PRODUCTVERSION 1,2,23,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.22.0" + VALUE "FileVersion", "1.2.23.0" VALUE "LegalCopyright", "Copyright (C) 2014-2018" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "1.2.22.0" + VALUE "ProductVersion", "1.2.23.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/SourceFiles/core/changelogs.cpp b/Telegram/SourceFiles/core/changelogs.cpp index 0558bf480..826d3481c 100644 --- a/Telegram/SourceFiles/core/changelogs.cpp +++ b/Telegram/SourceFiles/core/changelogs.cpp @@ -87,6 +87,14 @@ std::map AlphaLogs() { "after typing (instead of after sending) and can be " "rolled back using Backspace or Ctrl/Cmd + Z. " "Replacement no longer happens when pasting text." + }, + { + 1002023, + "\xE2\x80\x94 Apply formatting from input field context menu.\n" + + "\xE2\x80\x94 Apply formatting by hotkeys.\n" + + "\xE2\x80\x94 Bug fixes and other minor improvements." } }; } diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h index 6d653189c..8e32fcc10 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 = 1002022; -constexpr str_const AppVersionStr = "1.2.22"; +constexpr int AppVersion = 1002023; +constexpr str_const AppVersionStr = "1.2.23"; constexpr bool AppAlphaVersion = true; constexpr uint64 AppBetaVersion = BETA_VERSION_MACRO; diff --git a/Telegram/build/version b/Telegram/build/version index 7287d0506..06bd0eff6 100644 --- a/Telegram/build/version +++ b/Telegram/build/version @@ -1,6 +1,6 @@ -AppVersion 1002022 +AppVersion 1002023 AppVersionStrMajor 1.2 -AppVersionStrSmall 1.2.22 -AppVersionStr 1.2.22 +AppVersionStrSmall 1.2.23 +AppVersionStr 1.2.23 AlphaChannel 1 BetaVersion 0 diff --git a/changelog.txt b/changelog.txt index 4445cccce..f4c13d07c 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,9 @@ +1.2.23 alpha (25.05.18) + +- Apply formatting from input field context menu. +- Apply formatting by hotkeys. +- Bug fixes and other minor improvements. + 1.2.22 alpha (24.05.18) - Use markdown in media captions (**bold**, __italic__, `tag` and ```code```).