diff --git a/.gitignore b/.gitignore index fb98a0183a..6f6bb24089 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ /Debug/ /Release/ /Deploy/ +/ThirdParty/ /Telegram/build/target /Telegram/GeneratedFiles/ /Telegram/SourceFiles/art/grid.png diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml index d2325824a9..d9f74c92c8 100644 --- a/Telegram/Resources/uwp/AppX/AppxManifest.xml +++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml @@ -9,7 +9,7 @@ + Version="1.1.3.0" /> Telegram Desktop Telegram Messenger LLP diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc index 1485409260..93a82d4ac3 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,2,0 - PRODUCTVERSION 1,1,2,0 + FILEVERSION 1,1,3,0 + PRODUCTVERSION 1,1,3,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.2.0" + VALUE "FileVersion", "1.1.3.0" VALUE "LegalCopyright", "Copyright (C) 2014-2017" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "1.1.2.0" + VALUE "ProductVersion", "1.1.3.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc index b56e9d92cf..c98bfd36bd 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,2,0 - PRODUCTVERSION 1,1,2,0 + FILEVERSION 1,1,3,0 + PRODUCTVERSION 1,1,3,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.2.0" + VALUE "FileVersion", "1.1.3.0" VALUE "LegalCopyright", "Copyright (C) 2014-2017" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "1.1.2.0" + VALUE "ProductVersion", "1.1.3.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h index e44487642b..622a4bb90b 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 = 1001002; -constexpr str_const AppVersionStr = "1.1.2"; -constexpr bool AppAlphaVersion = false; +constexpr int AppVersion = 1001003; +constexpr str_const AppVersionStr = "1.1.3"; +constexpr bool AppAlphaVersion = true; constexpr uint64 AppBetaVersion = BETA_VERSION_MACRO; diff --git a/Telegram/SourceFiles/messenger.cpp b/Telegram/SourceFiles/messenger.cpp index 65b9e21927..2e8cca15ae 100644 --- a/Telegram/SourceFiles/messenger.cpp +++ b/Telegram/SourceFiles/messenger.cpp @@ -730,8 +730,8 @@ void Messenger::checkMapVersion() { if (Local::oldMapVersion() < AppVersion) { if (Local::oldMapVersion()) { QString versionFeatures; - if ((cAlphaVersion() || cBetaVersion()) && Local::oldMapVersion() < 1000036) { - versionFeatures = QString::fromUtf8("\xE2\x80\x94 Telegram Calls are now available on desktops: secure, crystal-clear, constantly improved by artificial intelligence.\n\xE2\x80\x94 Bug fixes and other minor improvements."); + if ((cAlphaVersion() || cBetaVersion()) && Local::oldMapVersion() < 1001003) { + versionFeatures = QString::fromUtf8("\xE2\x80\x94 Improved video messages playback.\n\xE2\x80\x94 Video and audio messages now play one after another."); } else if (!(cAlphaVersion() || cBetaVersion()) && Local::oldMapVersion() < 1001000) { versionFeatures = langNewVersionText(); } else { diff --git a/Telegram/ThirdParty/libtgvoip b/Telegram/ThirdParty/libtgvoip index 2ed5a50271..2993da5aa0 160000 --- a/Telegram/ThirdParty/libtgvoip +++ b/Telegram/ThirdParty/libtgvoip @@ -1 +1 @@ -Subproject commit 2ed5a50271029bde58ba210ac81b6ba4011ec33f +Subproject commit 2993da5aa08d18b549cc6fff160fc732f4114a31 diff --git a/Telegram/build/version b/Telegram/build/version index 3dc219a962..c7c07f5162 100644 --- a/Telegram/build/version +++ b/Telegram/build/version @@ -1,6 +1,6 @@ -AppVersion 1001002 +AppVersion 1001003 AppVersionStrMajor 1.1 -AppVersionStrSmall 1.1.2 -AppVersionStr 1.1.2 -AlphaChannel 0 +AppVersionStrSmall 1.1.3 +AppVersionStr 1.1.3 +AlphaChannel 1 BetaVersion 0 diff --git a/changelog.txt b/changelog.txt index 76b1a7bb9e..a10c92f563 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,8 @@ +1.1.3 (24.05.17) + +- Improved video messages playback. +- Video and audio messages play one after another. + 1.1.2 (17.05.17) - Emoji icon tooltip about hiding the sidebar.