diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml index 18459bfb1..9c2d11622 100644 --- a/Telegram/Resources/uwp/AppX/AppxManifest.xml +++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml @@ -9,7 +9,7 @@ + Version="1.1.11.0" /> Telegram Desktop Telegram Messenger LLP diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc index 8b09218d8..1b4b3c11c 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,1,10,0 - PRODUCTVERSION 1,1,10,0 + FILEVERSION 1,1,11,0 + PRODUCTVERSION 1,1,11,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.1.10.0" + VALUE "FileVersion", "1.1.11.0" VALUE "LegalCopyright", "Copyright (C) 2014-2017" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "1.1.10.0" + VALUE "ProductVersion", "1.1.11.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc index 0b8f2b728..c164822ff 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,1,10,0 - PRODUCTVERSION 1,1,10,0 + FILEVERSION 1,1,11,0 + PRODUCTVERSION 1,1,11,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.1.10.0" + VALUE "FileVersion", "1.1.11.0" VALUE "LegalCopyright", "Copyright (C) 2014-2017" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "1.1.10.0" + VALUE "ProductVersion", "1.1.11.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/SourceFiles/apiwrap.cpp b/Telegram/SourceFiles/apiwrap.cpp index 099d7c6ba..e00cf74c9 100644 --- a/Telegram/SourceFiles/apiwrap.cpp +++ b/Telegram/SourceFiles/apiwrap.cpp @@ -101,6 +101,7 @@ void ApiWrap::addLocalChangelogs(int oldAppVersion) { }; addLocalAlphaChangelog(1001008, "\xE2\x80\x94 Toggle night mode in the main menu.\n"); addLocalAlphaChangelog(1001010, "\xE2\x80\x94 Filter added to channel and supergroup event log.\n\xE2\x80\x94 Search by username in privacy exceptions editor fixed.\n\xE2\x80\x94 Adding admins in channels fixed."); + addLocalAlphaChangelog(1001011, "\xE2\x80\x94 Send **bold** and __italic__ text in your messages (in addition to already supported `monospace` and ```multiline monospace```).\n\xE2\x80\x94 Search in channel and supergroup admin event log.\n\xE2\x80\x94 Ban members from right click menu in supergroup admin event log."); } if (!addedSome) { auto text = lng_new_version_wrap(lt_version, str_const_toString(AppVersionStr), lt_changes, lang(lng_new_version_minor), lt_link, qsl("https://desktop.telegram.org/changelog")).trimmed(); diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h index 70086f7a6..cd2ed7e24 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 = 1001010; -constexpr str_const AppVersionStr = "1.1.10"; -constexpr bool AppAlphaVersion = false; +constexpr int AppVersion = 1001011; +constexpr str_const AppVersionStr = "1.1.11"; +constexpr bool AppAlphaVersion = true; constexpr uint64 AppBetaVersion = BETA_VERSION_MACRO; diff --git a/Telegram/build/version b/Telegram/build/version index 05d934fc0..89c2cb1c9 100644 --- a/Telegram/build/version +++ b/Telegram/build/version @@ -1,6 +1,6 @@ -AppVersion 1001010 +AppVersion 1001011 AppVersionStrMajor 1.1 -AppVersionStrSmall 1.1.10 -AppVersionStr 1.1.10 -AlphaChannel 0 +AppVersionStrSmall 1.1.11 +AppVersionStr 1.1.11 +AlphaChannel 1 BetaVersion 0 diff --git a/changelog.txt b/changelog.txt index 70b4ab7a7..47ec128e5 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,9 @@ +1.1.11 alpha (06.07.17) + +- Send **bold** and __italic__ text in your messages (in addition to already supported `monospace` and ```multiline monospace```). +- Search in channel and supergroup admin event log. +- Ban members from right click menu in supergroup admin event log. + 1.1.10 (04.07.17) - Add event log filter for channel or supergroup event log.