From 26e023058cfa8f3b181f6a6e82a8e9d5794542b5 Mon Sep 17 00:00:00 2001 From: John Preston Date: Sat, 30 Dec 2017 13:13:48 +0300 Subject: [PATCH] Version 1.2.6. - Grouped Photos. Group media into an album when sharing multiple photos and videos. Choose the exact order of media you send. --- Telegram/Resources/uwp/AppX/AppxManifest.xml | 2 +- Telegram/Resources/winrc/Telegram.rc | 8 ++++---- Telegram/Resources/winrc/Updater.rc | 8 ++++---- Telegram/SourceFiles/core/version.h | 6 +++--- Telegram/build/version | 8 ++++---- changelog.txt | 4 ++++ 6 files changed, 20 insertions(+), 16 deletions(-) diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml index 81acfd695..f27007f56 100644 --- a/Telegram/Resources/uwp/AppX/AppxManifest.xml +++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml @@ -9,7 +9,7 @@ + Version="1.2.6.0" /> Telegram Desktop Telegram Messenger LLP diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc index 027276a6e..aec21cc72 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,5,0 - PRODUCTVERSION 1,2,5,0 + FILEVERSION 1,2,6,0 + PRODUCTVERSION 1,2,6,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.5.0" + VALUE "FileVersion", "1.2.6.0" VALUE "LegalCopyright", "Copyright (C) 2014-2017" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "1.2.5.0" + VALUE "ProductVersion", "1.2.6.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc index 7aff1a308..7a63bc03e 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,5,0 - PRODUCTVERSION 1,2,5,0 + FILEVERSION 1,2,6,0 + PRODUCTVERSION 1,2,6,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.5.0" + VALUE "FileVersion", "1.2.6.0" VALUE "LegalCopyright", "Copyright (C) 2014-2017" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "1.2.5.0" + VALUE "ProductVersion", "1.2.6.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h index a51f8e930..17b4941be 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 = 1002005; -constexpr str_const AppVersionStr = "1.2.5"; -constexpr bool AppAlphaVersion = true; +constexpr int AppVersion = 1002006; +constexpr str_const AppVersionStr = "1.2.6"; +constexpr bool AppAlphaVersion = false; constexpr uint64 AppBetaVersion = BETA_VERSION_MACRO; diff --git a/Telegram/build/version b/Telegram/build/version index 1bde4d64a..ea66fe48d 100644 --- a/Telegram/build/version +++ b/Telegram/build/version @@ -1,6 +1,6 @@ -AppVersion 1002005 +AppVersion 1002006 AppVersionStrMajor 1.2 -AppVersionStrSmall 1.2.5 -AppVersionStr 1.2.5 -AlphaChannel 1 +AppVersionStrSmall 1.2.6 +AppVersionStr 1.2.6 +AlphaChannel 0 BetaVersion 0 diff --git a/changelog.txt b/changelog.txt index fb1de2356..54da47267 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,7 @@ +1.2.6 (30.12.17) + +- Grouped Photos. Group media into an album when sharing multiple photos and videos. Choose the exact order of media you send. + 1.2.5 alpha (29.12.17) - When viewing a photo from an album, you'll see other pictures from the same group as thumbnails in the lower part of the screen.