From da10059f45ce29fbc235899da39d20d2a08cf833 Mon Sep 17 00:00:00 2001 From: John Preston Date: Wed, 13 May 2020 17:05:25 +0400 Subject: [PATCH 1/4] Update lib_lottie, hide rlottie dependency. --- Telegram/lib_lottie | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Telegram/lib_lottie b/Telegram/lib_lottie index 0f6c9f4ac..804f05fc9 160000 --- a/Telegram/lib_lottie +++ b/Telegram/lib_lottie @@ -1 +1 @@ -Subproject commit 0f6c9f4acbdc2412a1a941b4ee96b150589b8369 +Subproject commit 804f05fc9bc47817c06f8c976771a377e59d100e From 31e38e169089719cb3428caa67f16ec8ba12e7e4 Mon Sep 17 00:00:00 2001 From: John Preston Date: Wed, 13 May 2020 18:18:51 +0400 Subject: [PATCH 2/4] Fix layout of community transfer error box. --- Telegram/SourceFiles/boxes/boxes.style | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Telegram/SourceFiles/boxes/boxes.style b/Telegram/SourceFiles/boxes/boxes.style index 9fcac5428..50b45dbf9 100644 --- a/Telegram/SourceFiles/boxes/boxes.style +++ b/Telegram/SourceFiles/boxes/boxes.style @@ -915,7 +915,7 @@ blockUserConfirmation: FlatLabel(boxLabel) { minWidth: 240px; } -transferCheckWidth: 300px; +transferCheckWidth: 320px; slowmodeLabelsMargin: margins(0px, 5px, 0px, 0px); slowmodeLabel: LabelSimple(defaultLabelSimple) { From 66a3e3602445a7b999ebfa353835891f555dc0db Mon Sep 17 00:00:00 2001 From: John Preston Date: Wed, 13 May 2020 17:04:50 +0400 Subject: [PATCH 3/4] Version 2.1.5. - Disable the taskbar icon flash or the dock icon bounce in Settings > Notifications. - View messages containing long monospace texts in wide bubbles. - Bug fixes and other minor improvements. --- 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 | 8 ++++---- changelog.txt | 6 ++++++ 6 files changed, 21 insertions(+), 15 deletions(-) diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml index 4fe6090c8..73cd299bd 100644 --- a/Telegram/Resources/uwp/AppX/AppxManifest.xml +++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml @@ -9,7 +9,7 @@ + Version="2.1.5.0" /> Telegram Desktop Telegram FZ-LLC diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc index 15fcb9845..180f0b69e 100644 --- a/Telegram/Resources/winrc/Telegram.rc +++ b/Telegram/Resources/winrc/Telegram.rc @@ -44,8 +44,8 @@ IDI_ICON1 ICON "..\\art\\icon256.ico" // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,1,4,0 - PRODUCTVERSION 2,1,4,0 + FILEVERSION 2,1,5,0 + PRODUCTVERSION 2,1,5,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -62,10 +62,10 @@ BEGIN BEGIN VALUE "CompanyName", "Telegram FZ-LLC" VALUE "FileDescription", "Telegram Desktop" - VALUE "FileVersion", "2.1.4.0" + VALUE "FileVersion", "2.1.5.0" VALUE "LegalCopyright", "Copyright (C) 2014-2020" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "2.1.4.0" + VALUE "ProductVersion", "2.1.5.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc index d9a674b2b..38b02df8d 100644 --- a/Telegram/Resources/winrc/Updater.rc +++ b/Telegram/Resources/winrc/Updater.rc @@ -35,8 +35,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,1,4,0 - PRODUCTVERSION 2,1,4,0 + FILEVERSION 2,1,5,0 + PRODUCTVERSION 2,1,5,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -53,10 +53,10 @@ BEGIN BEGIN VALUE "CompanyName", "Telegram FZ-LLC" VALUE "FileDescription", "Telegram Desktop Updater" - VALUE "FileVersion", "2.1.4.0" + VALUE "FileVersion", "2.1.5.0" VALUE "LegalCopyright", "Copyright (C) 2014-2020" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "2.1.4.0" + VALUE "ProductVersion", "2.1.5.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h index 574d6970b..ce15f8019 100644 --- a/Telegram/SourceFiles/core/version.h +++ b/Telegram/SourceFiles/core/version.h @@ -22,7 +22,7 @@ constexpr auto AppId = "{53F49750-6209-4FBF-9CA8-7A333C87D1ED}"_cs; constexpr auto AppNameOld = "Telegram Win (Unofficial)"_cs; constexpr auto AppName = "Telegram Desktop"_cs; constexpr auto AppFile = "Telegram"_cs; -constexpr auto AppVersion = 2001004; -constexpr auto AppVersionStr = "2.1.4"; +constexpr auto AppVersion = 2001005; +constexpr auto AppVersionStr = "2.1.5"; constexpr auto AppBetaVersion = false; constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION; diff --git a/Telegram/build/version b/Telegram/build/version index 777344683..b7e7851a1 100644 --- a/Telegram/build/version +++ b/Telegram/build/version @@ -1,7 +1,7 @@ -AppVersion 2001004 +AppVersion 2001005 AppVersionStrMajor 2.1 -AppVersionStrSmall 2.1.4 -AppVersionStr 2.1.4 +AppVersionStrSmall 2.1.5 +AppVersionStr 2.1.5 BetaChannel 0 AlphaVersion 0 -AppVersionOriginal 2.1.4 +AppVersionOriginal 2.1.5 diff --git a/changelog.txt b/changelog.txt index 9f00bccb4..7d6a855de 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,9 @@ +2.1.5 (13.05.20) + +- Disable the taskbar icon flash or the dock icon bounce in Settings > Notifications. +- View messages containing long monospace texts in wide bubbles. +- Bug fixes and other minor improvements. + 2.1.4 (08.05.20) - Improve bold font selection. From d679703bbffa08c936739d01644d05772966d0b1 Mon Sep 17 00:00:00 2001 From: John Preston Date: Thu, 14 May 2020 01:16:13 +0400 Subject: [PATCH 4/4] Version 2.1.6. - Fix automatic downloads on Windows by clean rebuild. --- 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 | 8 ++++---- changelog.txt | 4 ++++ 6 files changed, 19 insertions(+), 15 deletions(-) diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml index 73cd299bd..5a33266bd 100644 --- a/Telegram/Resources/uwp/AppX/AppxManifest.xml +++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml @@ -9,7 +9,7 @@ + Version="2.1.6.0" /> Telegram Desktop Telegram FZ-LLC diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc index 180f0b69e..c3e1d417f 100644 --- a/Telegram/Resources/winrc/Telegram.rc +++ b/Telegram/Resources/winrc/Telegram.rc @@ -44,8 +44,8 @@ IDI_ICON1 ICON "..\\art\\icon256.ico" // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,1,5,0 - PRODUCTVERSION 2,1,5,0 + FILEVERSION 2,1,6,0 + PRODUCTVERSION 2,1,6,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -62,10 +62,10 @@ BEGIN BEGIN VALUE "CompanyName", "Telegram FZ-LLC" VALUE "FileDescription", "Telegram Desktop" - VALUE "FileVersion", "2.1.5.0" + VALUE "FileVersion", "2.1.6.0" VALUE "LegalCopyright", "Copyright (C) 2014-2020" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "2.1.5.0" + VALUE "ProductVersion", "2.1.6.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc index 38b02df8d..0a9fdd05d 100644 --- a/Telegram/Resources/winrc/Updater.rc +++ b/Telegram/Resources/winrc/Updater.rc @@ -35,8 +35,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,1,5,0 - PRODUCTVERSION 2,1,5,0 + FILEVERSION 2,1,6,0 + PRODUCTVERSION 2,1,6,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -53,10 +53,10 @@ BEGIN BEGIN VALUE "CompanyName", "Telegram FZ-LLC" VALUE "FileDescription", "Telegram Desktop Updater" - VALUE "FileVersion", "2.1.5.0" + VALUE "FileVersion", "2.1.6.0" VALUE "LegalCopyright", "Copyright (C) 2014-2020" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "2.1.5.0" + VALUE "ProductVersion", "2.1.6.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h index ce15f8019..84afb131f 100644 --- a/Telegram/SourceFiles/core/version.h +++ b/Telegram/SourceFiles/core/version.h @@ -22,7 +22,7 @@ constexpr auto AppId = "{53F49750-6209-4FBF-9CA8-7A333C87D1ED}"_cs; constexpr auto AppNameOld = "Telegram Win (Unofficial)"_cs; constexpr auto AppName = "Telegram Desktop"_cs; constexpr auto AppFile = "Telegram"_cs; -constexpr auto AppVersion = 2001005; -constexpr auto AppVersionStr = "2.1.5"; +constexpr auto AppVersion = 2001006; +constexpr auto AppVersionStr = "2.1.6"; constexpr auto AppBetaVersion = false; constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION; diff --git a/Telegram/build/version b/Telegram/build/version index b7e7851a1..d3e7a2eaf 100644 --- a/Telegram/build/version +++ b/Telegram/build/version @@ -1,7 +1,7 @@ -AppVersion 2001005 +AppVersion 2001006 AppVersionStrMajor 2.1 -AppVersionStrSmall 2.1.5 -AppVersionStr 2.1.5 +AppVersionStrSmall 2.1.6 +AppVersionStr 2.1.6 BetaChannel 0 AlphaVersion 0 -AppVersionOriginal 2.1.5 +AppVersionOriginal 2.1.6 diff --git a/changelog.txt b/changelog.txt index 7d6a855de..6036949fe 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,7 @@ +2.1.6 (14.05.20) + +- Bug fixes and other minor improvements. + 2.1.5 (13.05.20) - Disable the taskbar icon flash or the dock icon bounce in Settings > Notifications.