diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml
index feb71b48c..65cd2d83d 100644
--- a/Telegram/Resources/uwp/AppX/AppxManifest.xml
+++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml
@@ -9,7 +9,7 @@
+ Version="1.2.22.0" />
Telegram Desktop
Telegram Messenger LLP
diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc
index 7931693f9..9ed371a9b 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,2,21,0
- PRODUCTVERSION 1,2,21,0
+ FILEVERSION 1,2,22,0
+ PRODUCTVERSION 1,2,22,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.2.21.0"
+ VALUE "FileVersion", "1.2.22.0"
VALUE "LegalCopyright", "Copyright (C) 2014-2018"
VALUE "ProductName", "Telegram Desktop"
- VALUE "ProductVersion", "1.2.21.0"
+ VALUE "ProductVersion", "1.2.22.0"
END
END
BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index ca702bfeb..b0a826cdf 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,2,21,0
- PRODUCTVERSION 1,2,21,0
+ FILEVERSION 1,2,22,0
+ PRODUCTVERSION 1,2,22,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.2.21.0"
+ VALUE "FileVersion", "1.2.22.0"
VALUE "LegalCopyright", "Copyright (C) 2014-2018"
VALUE "ProductName", "Telegram Desktop"
- VALUE "ProductVersion", "1.2.21.0"
+ VALUE "ProductVersion", "1.2.22.0"
END
END
BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/core/changelogs.cpp b/Telegram/SourceFiles/core/changelogs.cpp
index 024b51160..0558bf480 100644
--- a/Telegram/SourceFiles/core/changelogs.cpp
+++ b/Telegram/SourceFiles/core/changelogs.cpp
@@ -74,6 +74,19 @@ std::map AlphaLogs() {
"in Settings.\n"
"\xE2\x80\x94 Some critical bug fixes."
+ },
+ {
+ 1002022,
+ "\xE2\x80\x94 Use markdown in media captions "
+ "(**bold**, __italic__, `tag` and ```code```).\n"
+
+ "\xE2\x80\x94 Use emoji replacement in media captions, "
+ "group and channel titles and descriptions (:like: etc.)\n"
+
+ "\xE2\x80\x94 Markdown replacement now happens immediately "
+ "after typing (instead of after sending) and can be "
+ "rolled back using Backspace or Ctrl/Cmd + Z. "
+ "Replacement no longer happens when pasting text."
}
};
}
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index 7e20db771..6d653189c 100644
--- a/Telegram/SourceFiles/core/version.h
+++ b/Telegram/SourceFiles/core/version.h
@@ -11,7 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#define BETA_VERSION_MACRO (0ULL)
-constexpr int AppVersion = 1002021;
-constexpr str_const AppVersionStr = "1.2.21";
+constexpr int AppVersion = 1002022;
+constexpr str_const AppVersionStr = "1.2.22";
constexpr bool AppAlphaVersion = true;
constexpr uint64 AppBetaVersion = BETA_VERSION_MACRO;
diff --git a/Telegram/build/version b/Telegram/build/version
index b443a905c..7287d0506 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -1,6 +1,6 @@
-AppVersion 1002021
+AppVersion 1002022
AppVersionStrMajor 1.2
-AppVersionStrSmall 1.2.21
-AppVersionStr 1.2.21
+AppVersionStrSmall 1.2.22
+AppVersionStr 1.2.22
AlphaChannel 1
BetaVersion 0
diff --git a/changelog.txt b/changelog.txt
index e0783e7ce..4445cccce 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,9 @@
+1.2.22 alpha (24.05.18)
+
+- Use markdown in media captions (**bold**, __italic__, `tag` and ```code```).
+- Use emoji replacement in media captions, group and channel titles and descriptions (:like: etc.)
+- Markdown replacement now happens immediately after typing (instead of after sending) and can be rolled back using Backspace or Ctrl/Cmd + Z. Replacement no longer happens when pasting text.
+
1.2.21 alpha (18.05.18)
- Support domain names in mtproto proxy.