From b04c03a5c30963fc3993ae7f22a27f3a03643982 Mon Sep 17 00:00:00 2001 From: John Preston Date: Wed, 24 May 2017 22:58:21 +0300 Subject: [PATCH] Alpha 1.1.4. - Fix a crash in animated history scrolling. - Fix a bug with pinned chat to supergroup upgrade. --- 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 +++++ 6 files changed, 19 insertions(+), 14 deletions(-) diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml index d9f74c92c..5d6a0c3bc 100644 --- a/Telegram/Resources/uwp/AppX/AppxManifest.xml +++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml @@ -9,7 +9,7 @@ + Version="1.1.4.0" /> Telegram Desktop Telegram Messenger LLP diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc index 93a82d4ac..9047dd507 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,1,3,0 - PRODUCTVERSION 1,1,3,0 + FILEVERSION 1,1,4,0 + PRODUCTVERSION 1,1,4,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.1.3.0" + VALUE "FileVersion", "1.1.4.0" VALUE "LegalCopyright", "Copyright (C) 2014-2017" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "1.1.3.0" + VALUE "ProductVersion", "1.1.4.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc index c98bfd36b..c2e9c9efd 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,1,3,0 - PRODUCTVERSION 1,1,3,0 + FILEVERSION 1,1,4,0 + PRODUCTVERSION 1,1,4,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.1.3.0" + VALUE "FileVersion", "1.1.4.0" VALUE "LegalCopyright", "Copyright (C) 2014-2017" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "1.1.3.0" + VALUE "ProductVersion", "1.1.4.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h index 622a4bb90..4f38a1540 100644 --- a/Telegram/SourceFiles/core/version.h +++ b/Telegram/SourceFiles/core/version.h @@ -24,7 +24,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org #define BETA_VERSION_MACRO (0ULL) -constexpr int AppVersion = 1001003; -constexpr str_const AppVersionStr = "1.1.3"; +constexpr int AppVersion = 1001004; +constexpr str_const AppVersionStr = "1.1.4"; constexpr bool AppAlphaVersion = true; constexpr uint64 AppBetaVersion = BETA_VERSION_MACRO; diff --git a/Telegram/build/version b/Telegram/build/version index c7c07f516..dbd65d8f0 100644 --- a/Telegram/build/version +++ b/Telegram/build/version @@ -1,6 +1,6 @@ -AppVersion 1001003 +AppVersion 1001004 AppVersionStrMajor 1.1 -AppVersionStrSmall 1.1.3 -AppVersionStr 1.1.3 +AppVersionStrSmall 1.1.4 +AppVersionStr 1.1.4 AlphaChannel 1 BetaVersion 0 diff --git a/changelog.txt b/changelog.txt index a10c92f56..8e1cde054 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,8 @@ +1.1.4 (24.05.17) + +- Fix a crash in animated history scrolling. +- Fix a bug with pinned chat to supergroup upgrade. + 1.1.3 (24.05.17) - Improved video messages playback.