diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml index f1004d5de..c477fb020 100644 --- a/Telegram/Resources/uwp/AppX/AppxManifest.xml +++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml @@ -9,7 +9,7 @@ + Version="2.4.0.0" /> Telegram Desktop Telegram FZ-LLC diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc index fb3f2f9bc..f7800f939 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,3,2,2 - PRODUCTVERSION 2,3,2,2 + FILEVERSION 2,4,0,0 + PRODUCTVERSION 2,4,0,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.3.2.2" + VALUE "FileVersion", "2.4.0.0" VALUE "LegalCopyright", "Copyright (C) 2014-2020" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "2.3.2.2" + VALUE "ProductVersion", "2.4.0.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc index 21577a43c..69c37bf42 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,3,2,2 - PRODUCTVERSION 2,3,2,2 + FILEVERSION 2,4,0,0 + PRODUCTVERSION 2,4,0,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.3.2.2" + VALUE "FileVersion", "2.4.0.0" VALUE "LegalCopyright", "Copyright (C) 2014-2020" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "2.3.2.2" + VALUE "ProductVersion", "2.4.0.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h index b33f83269..df398c12d 100644 --- a/Telegram/SourceFiles/core/version.h +++ b/Telegram/SourceFiles/core/version.h @@ -9,7 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "base/const_string.h" -#define TDESKTOP_REQUESTED_ALPHA_VERSION (2003002002ULL) +#define TDESKTOP_REQUESTED_ALPHA_VERSION (0ULL) #ifdef TDESKTOP_ALLOW_CLOSED_ALPHA #define TDESKTOP_ALPHA_VERSION TDESKTOP_REQUESTED_ALPHA_VERSION @@ -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 = 2003002; -constexpr auto AppVersionStr = "2.3.2"; +constexpr auto AppVersion = 2004000; +constexpr auto AppVersionStr = "2.4"; constexpr auto AppBetaVersion = false; constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION; diff --git a/Telegram/build/version b/Telegram/build/version index e2bad62c2..b8ce79c6c 100644 --- a/Telegram/build/version +++ b/Telegram/build/version @@ -1,7 +1,7 @@ -AppVersion 2003002 -AppVersionStrMajor 2.3 -AppVersionStrSmall 2.3.2 -AppVersionStr 2.3.2 +AppVersion 2004000 +AppVersionStrMajor 2.4 +AppVersionStrSmall 2.4 +AppVersionStr 2.4.0 BetaChannel 0 -AlphaVersion 2003002002 -AppVersionOriginal 2.3.2.2 +AlphaVersion 0 +AppVersionOriginal 2.4 diff --git a/Telegram/lib_base b/Telegram/lib_base index 4f03dbd9a..c886914f8 160000 --- a/Telegram/lib_base +++ b/Telegram/lib_base @@ -1 +1 @@ -Subproject commit 4f03dbd9a0c3dce0268fa208bf1e3ffff4c95c72 +Subproject commit c886914f8992614aac5717c858ac2a231ca86a08 diff --git a/Telegram/lib_rpl b/Telegram/lib_rpl index 86b9b80fa..e654c5ee9 160000 --- a/Telegram/lib_rpl +++ b/Telegram/lib_rpl @@ -1 +1 @@ -Subproject commit 86b9b80fae7a41e7c6ad85f14659883533ab84e8 +Subproject commit e654c5ee98199b47a426aaaf6a1f7331aca0ebcd diff --git a/Telegram/lib_spellcheck b/Telegram/lib_spellcheck index 58263c071..c650fe72d 160000 --- a/Telegram/lib_spellcheck +++ b/Telegram/lib_spellcheck @@ -1 +1 @@ -Subproject commit 58263c0715ebfbf586c71e856a2ad962301bdc05 +Subproject commit c650fe72d6c486bbee1d92f73f97b02c523dd37b diff --git a/Telegram/lib_storage b/Telegram/lib_storage index 6fc06b5f9..cbd295476 160000 --- a/Telegram/lib_storage +++ b/Telegram/lib_storage @@ -1 +1 @@ -Subproject commit 6fc06b5f9645005143f09f72e1c052a28d5f26ed +Subproject commit cbd295476b7910cc7fad7039e5da4a04edf33200 diff --git a/Telegram/lib_ui b/Telegram/lib_ui index 1916823c9..86e141272 160000 --- a/Telegram/lib_ui +++ b/Telegram/lib_ui @@ -1 +1 @@ -Subproject commit 1916823c98ce324ff9fb4031027a0ab37c395c37 +Subproject commit 86e141272a3a5b7bc15d76a9bbe8d5928babd3f8 diff --git a/Telegram/lib_webrtc b/Telegram/lib_webrtc index d7c4f1f0b..37768e47a 160000 --- a/Telegram/lib_webrtc +++ b/Telegram/lib_webrtc @@ -1 +1 @@ -Subproject commit d7c4f1f0b902158f065ea9fb6b7ec80fa0ceac45 +Subproject commit 37768e47ab0c75a44a9185435475484f6fbcbe8e diff --git a/changelog.txt b/changelog.txt index d80d5f97d..72d106fdf 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,9 @@ +2.4 (30.09.20) + +- Turn on "Remain Anonymous" in an admin's Permissions to let them post on behalf of the group and become invisible in the list of members. +- Comment on posts in channels that have a discussion group. +- Get notified about replies to your comments via the new Replies chat (if you are not a member of the discussion group). + 2.3.2 (23.08.20) - Revert custom window shadow on Linux.