diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml index 4fe6090c8..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 15fcb9845..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,4,0 - PRODUCTVERSION 2,1,4,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.4.0" + VALUE "FileVersion", "2.1.6.0" VALUE "LegalCopyright", "Copyright (C) 2014-2020" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "2.1.4.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 d9a674b2b..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,4,0 - PRODUCTVERSION 2,1,4,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.4.0" + VALUE "FileVersion", "2.1.6.0" VALUE "LegalCopyright", "Copyright (C) 2014-2020" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "2.1.4.0" + VALUE "ProductVersion", "2.1.6.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/SourceFiles/boxes/boxes.style b/Telegram/SourceFiles/boxes/boxes.style index 024a40ee0..18888ef60 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) { diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h index 603680355..339b615c9 100644 --- a/Telegram/SourceFiles/core/version.h +++ b/Telegram/SourceFiles/core/version.h @@ -23,7 +23,7 @@ constexpr auto AppId = "{C4A4AE8F-B9F7-4CC7-8A6C-BF7EEE87ACA5}"_cs; constexpr auto AppNameOld = "Telegram Win (Unofficial)"_cs; constexpr auto AppName = "Kotatogram Desktop"_cs; constexpr auto AppFile = "Kotatogram"_cs; -constexpr auto AppVersion = 2001004; -constexpr auto AppVersionStr = "2.1.4"; +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 777344683..d3e7a2eaf 100644 --- a/Telegram/build/version +++ b/Telegram/build/version @@ -1,7 +1,7 @@ -AppVersion 2001004 +AppVersion 2001006 AppVersionStrMajor 2.1 -AppVersionStrSmall 2.1.4 -AppVersionStr 2.1.4 +AppVersionStrSmall 2.1.6 +AppVersionStr 2.1.6 BetaChannel 0 AlphaVersion 0 -AppVersionOriginal 2.1.4 +AppVersionOriginal 2.1.6 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 diff --git a/changelog.txt b/changelog.txt index 9f00bccb4..6036949fe 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,13 @@ +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. +- 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.