From 678b9a8eb5b4a6c8bbf9eea6d6265e8bd9c1b96a Mon Sep 17 00:00:00 2001 From: John Preston Date: Fri, 18 May 2018 20:36:21 +0300 Subject: [PATCH] Alpha version 1.2.21. - Support domain names in mtproto proxy. - Bug fixes and other minor improvements. --- .travis/build.sh | 2 +- Telegram/Resources/uwp/AppX/AppxManifest.xml | 2 +- Telegram/Resources/winrc/Telegram.rc | 8 ++++---- Telegram/Resources/winrc/Updater.rc | 8 ++++---- Telegram/SourceFiles/core/version.h | 4 ++-- Telegram/build/version | 6 +++--- changelog.txt | 5 +++++ 7 files changed, 20 insertions(+), 15 deletions(-) diff --git a/.travis/build.sh b/.travis/build.sh index 161301b35..31ff9a4e7 100755 --- a/.travis/build.sh +++ b/.travis/build.sh @@ -585,7 +585,7 @@ buildCustomQt() { info_msg "Downloading and building patched qt" if [ -d "$EXTERNAL/qt${QT_VERSION}" ]; then - rm -rf "$EXTERNAL/qt${QT_VERSION}" + sudo rm -rf "$EXTERNAL/qt${QT_VERSION}" fi cd $QT_PATH rm -rf * diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml index 385b6b037..feb71b48c 100644 --- a/Telegram/Resources/uwp/AppX/AppxManifest.xml +++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml @@ -9,7 +9,7 @@ + Version="1.2.21.0" /> Telegram Desktop Telegram Messenger LLP diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc index 07c617a00..7931693f9 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,20,0 - PRODUCTVERSION 1,2,20,0 + FILEVERSION 1,2,21,0 + PRODUCTVERSION 1,2,21,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.20.0" + VALUE "FileVersion", "1.2.21.0" VALUE "LegalCopyright", "Copyright (C) 2014-2018" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "1.2.20.0" + VALUE "ProductVersion", "1.2.21.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc index a1fc40fc3..ca702bfeb 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,20,0 - PRODUCTVERSION 1,2,20,0 + FILEVERSION 1,2,21,0 + PRODUCTVERSION 1,2,21,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.20.0" + VALUE "FileVersion", "1.2.21.0" VALUE "LegalCopyright", "Copyright (C) 2014-2018" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "1.2.20.0" + VALUE "ProductVersion", "1.2.21.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h index 006f16c36..7e20db771 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 = 1002020; -constexpr str_const AppVersionStr = "1.2.20"; +constexpr int AppVersion = 1002021; +constexpr str_const AppVersionStr = "1.2.21"; constexpr bool AppAlphaVersion = true; constexpr uint64 AppBetaVersion = BETA_VERSION_MACRO; diff --git a/Telegram/build/version b/Telegram/build/version index e50620c24..b443a905c 100644 --- a/Telegram/build/version +++ b/Telegram/build/version @@ -1,6 +1,6 @@ -AppVersion 1002020 +AppVersion 1002021 AppVersionStrMajor 1.2 -AppVersionStrSmall 1.2.20 -AppVersionStr 1.2.20 +AppVersionStrSmall 1.2.21 +AppVersionStr 1.2.21 AlphaChannel 1 BetaVersion 0 diff --git a/changelog.txt b/changelog.txt index 699b5fa8c..e0783e7ce 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,8 @@ +1.2.21 alpha (18.05.18) + +- Support domain names in mtproto proxy. +- Bug fixes and other minor improvements. + 1.2.20 alpha (13.05.18) - Emoji and text replacements are done while you type the message.