From 57387903fdd0eb90ea705378bf6b4c6d4e0c5d89 Mon Sep 17 00:00:00 2001 From: John Preston Date: Tue, 4 Dec 2018 19:58:33 +0400 Subject: [PATCH] Beta version 1.4.8. - Add emoji to media captions. - Switch off the 'Count unread messages' option in Settings > Notifications if you want to see the unread chats count in the badge instead. --- 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 | 8 ++++---- Telegram/build/set_version.py | 8 ++++++-- Telegram/build/version | 10 +++++----- changelog.txt | 5 +++++ 8 files changed, 37 insertions(+), 20 deletions(-) diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml index 3df96d030..28bbb3d2e 100644 --- a/Telegram/Resources/uwp/AppX/AppxManifest.xml +++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml @@ -9,7 +9,7 @@ + Version="1.4.8.0" /> Telegram Desktop Telegram Messenger LLP diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc index 7281789d9..6cbb508fe 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,4,7,6 - PRODUCTVERSION 1,4,7,6 + FILEVERSION 1,4,8,0 + PRODUCTVERSION 1,4,8,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.4.7.6" + VALUE "FileVersion", "1.4.8.0" VALUE "LegalCopyright", "Copyright (C) 2014-2018" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "1.4.7.6" + VALUE "ProductVersion", "1.4.8.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc index b176c788c..584d026c5 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,4,7,6 - PRODUCTVERSION 1,4,7,6 + FILEVERSION 1,4,8,0 + PRODUCTVERSION 1,4,8,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.4.7.6" + VALUE "FileVersion", "1.4.8.0" VALUE "LegalCopyright", "Copyright (C) 2014-2018" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "1.4.7.6" + VALUE "ProductVersion", "1.4.8.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/SourceFiles/core/changelogs.cpp b/Telegram/SourceFiles/core/changelogs.cpp index a14c9f1ca..bf7dbc97c 100644 --- a/Telegram/SourceFiles/core/changelogs.cpp +++ b/Telegram/SourceFiles/core/changelogs.cpp @@ -63,6 +63,14 @@ std::map BetaLogs() { "in Twitter and Instagram link previews.\n" "- Bug fixes and other minor improvements." + }, + { + 1004008, + "- Add emoji to media captions.\n" + + "- Switch off the 'Count unread messages' option " + "in Settings > Notifications if you want to see " + "the unread chats count in the badge instead." } }; } diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h index dc06e5de6..985205a73 100644 --- a/Telegram/SourceFiles/core/version.h +++ b/Telegram/SourceFiles/core/version.h @@ -7,7 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL */ #pragma once -#define TDESKTOP_REQUESTED_ALPHA_VERSION (1004007006ULL) +#define TDESKTOP_REQUESTED_ALPHA_VERSION (0ULL) #ifdef TDESKTOP_OFFICIAL_TARGET #define TDESKTOP_ALPHA_VERSION TDESKTOP_REQUESTED_ALPHA_VERSION @@ -15,7 +15,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #define TDESKTOP_ALPHA_VERSION (0ULL) #endif // TDESKTOP_OFFICIAL_TARGET -constexpr auto AppVersion = 1004007; -constexpr auto AppVersionStr = "1.4.7"; -constexpr auto AppBetaVersion = false; +constexpr auto AppVersion = 1004008; +constexpr auto AppVersionStr = "1.4.8"; +constexpr auto AppBetaVersion = true; constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION; diff --git a/Telegram/build/set_version.py b/Telegram/build/set_version.py index 5957e10f3..7a1039ad6 100644 --- a/Telegram/build/set_version.py +++ b/Telegram/build/set_version.py @@ -26,7 +26,7 @@ versionPatch = '' versionAlpha = '0' versionBeta = False for arg in sys.argv: - match = re.match(r'^(\d+)\.(\d+)(\.(\d+)(\.(\d+|beta))?)?', arg) + match = re.match(r'^\s*(\d+)\.(\d+)(\.(\d+)(\.(\d+|beta))?)?\s*$', arg) if match: inputVersion = arg versionMajor = match.group(1) @@ -38,8 +38,12 @@ for arg in sys.argv: else: versionAlpha = match.group(6) +if not len(versionMajor): + print("Wrong version parameter") + finish(1) + def checkVersionPart(part): - cleared = int(part) % 1000 + cleared = int(part) % 1000 if len(part) > 0 else 0 if str(cleared) != part: print("Bad version part: " + part) finish(1) diff --git a/Telegram/build/version b/Telegram/build/version index d066ced92..c14175a40 100644 --- a/Telegram/build/version +++ b/Telegram/build/version @@ -1,6 +1,6 @@ -AppVersion 1004007 +AppVersion 1004008 AppVersionStrMajor 1.4 -AppVersionStrSmall 1.4.7 -AppVersionStr 1.4.7 -BetaChannel 0 -AlphaVersion 1004007006 +AppVersionStrSmall 1.4.8 +AppVersionStr 1.4.8 +BetaChannel 1 +AlphaVersion 0 diff --git a/changelog.txt b/changelog.txt index 19bdb58b5..febe90030 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,8 @@ +1.4.8 beta (04.12.18) + +- Add emoji to media captions. +- Switch off the 'Count unread messages' option in Settings > Notifications if you want to see the unread chats count in the badge instead. + 1.4.7 beta (10.11.18) - Crash fix.