From df9ec4b46620c7ddfa31f9b25ba37c05d089ca62 Mon Sep 17 00:00:00 2001 From: John Preston Date: Sun, 13 May 2018 21:25:31 +0300 Subject: [PATCH] Alpha version 1.2.20. - Emoji and text replacements are done while you type the message. - Revert emoji and text replacements by pressing backspace. - Disable emoji replacements or suggestions in Settings. - Some critical bug fixes. --- Telegram/Resources/uwp/AppX/AppxManifest.xml | 2 +- Telegram/Resources/winrc/Telegram.rc | 8 ++++---- Telegram/Resources/winrc/Updater.rc | 8 ++++---- Telegram/SourceFiles/core/changelogs.cpp | 13 +++++++++++++ Telegram/SourceFiles/core/version.h | 4 ++-- Telegram/build/version | 6 +++--- changelog.txt | 7 +++++++ 7 files changed, 34 insertions(+), 14 deletions(-) diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml index 20815900d..385b6b037 100644 --- a/Telegram/Resources/uwp/AppX/AppxManifest.xml +++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml @@ -9,7 +9,7 @@ + Version="1.2.20.0" /> Telegram Desktop Telegram Messenger LLP diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc index b2e765487..07c617a00 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,19,0 - PRODUCTVERSION 1,2,19,0 + FILEVERSION 1,2,20,0 + PRODUCTVERSION 1,2,20,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.19.0" + VALUE "FileVersion", "1.2.20.0" VALUE "LegalCopyright", "Copyright (C) 2014-2018" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "1.2.19.0" + VALUE "ProductVersion", "1.2.20.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc index 53c0ede0e..a1fc40fc3 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,19,0 - PRODUCTVERSION 1,2,19,0 + FILEVERSION 1,2,20,0 + PRODUCTVERSION 1,2,20,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.19.0" + VALUE "FileVersion", "1.2.20.0" VALUE "LegalCopyright", "Copyright (C) 2014-2018" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "1.2.19.0" + VALUE "ProductVersion", "1.2.20.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/SourceFiles/core/changelogs.cpp b/Telegram/SourceFiles/core/changelogs.cpp index b7f5a2236..024b51160 100644 --- a/Telegram/SourceFiles/core/changelogs.cpp +++ b/Telegram/SourceFiles/core/changelogs.cpp @@ -61,6 +61,19 @@ std::map AlphaLogs() { "\xE2\x80\x94 Enable proxy for calls in Settings.\n" "\xE2\x80\x94 Bug fixes and other minor improvements." + }, + { + 1002020, + "\xE2\x80\x94 Emoji and text replacements are done " + "while you type the message.\n" + + "\xE2\x80\x94 Revert emoji and text replacements " + "by pressing backspace.\n" + + "\xE2\x80\x94 Disable emoji replacements or suggestions " + "in Settings.\n" + + "\xE2\x80\x94 Some critical bug fixes." } }; } diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h index bbbcbcbba..006f16c36 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 = 1002019; -constexpr str_const AppVersionStr = "1.2.19"; +constexpr int AppVersion = 1002020; +constexpr str_const AppVersionStr = "1.2.20"; constexpr bool AppAlphaVersion = true; constexpr uint64 AppBetaVersion = BETA_VERSION_MACRO; diff --git a/Telegram/build/version b/Telegram/build/version index 6b3f3238b..e50620c24 100644 --- a/Telegram/build/version +++ b/Telegram/build/version @@ -1,6 +1,6 @@ -AppVersion 1002019 +AppVersion 1002020 AppVersionStrMajor 1.2 -AppVersionStrSmall 1.2.19 -AppVersionStr 1.2.19 +AppVersionStrSmall 1.2.20 +AppVersionStr 1.2.20 AlphaChannel 1 BetaVersion 0 diff --git a/changelog.txt b/changelog.txt index 65eed64a0..699b5fa8c 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,10 @@ +1.2.20 alpha (13.05.18) + +- Emoji and text replacements are done while you type the message. +- Revert emoji and text replacements by pressing backspace. +- Disable emoji replacements or suggestions in Settings. +- Some critical bug fixes. + 1.2.19 alpha (08.05.18) - Enable proxy for calls in Settings.