RepoMirrors
/
tdesktop
mirror of https://github.com/telegramdesktop/tdesktop
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Beta version 1.4.8. 

- Add emoji to media captions.
- Switch off the 'Count unread messages' option
in Settings > Notifications if you want to see
the unread chats count in the badge instead.
This commit is contained in:
John Preston 2018-12-04 19:58:33 +04:00
parent 8b1ac9fa6e
commit 57387903fd
8 changed files with 37 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Telegram/Resources/uwp/AppX/AppxManifest.xml
View File

@ -9,7 +9,7 @@
<Identity Name="TelegramMessengerLLP.TelegramDesktop"
ProcessorArchitecture="ARCHITECTURE"
Publisher="CN=536BC709-8EE1-4478-AF22-F0F0F26FF64A"
Version="1.4.7.6" />
Version="1.4.8.0" />
<Properties>
<DisplayName>Telegram Desktop</DisplayName>
<PublisherDisplayName>Telegram Messenger LLP</PublisherDisplayName>

8
Telegram/Resources/winrc/Telegram.rc
View File

@ -34,8 +34,8 @@ IDI_ICON1 ICON "..\\art\\icon256.ico"
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,4,7,6
PRODUCTVERSION 1,4,7,6
FILEVERSION 1,4,8,0
PRODUCTVERSION 1,4,8,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.4.7.6"
VALUE "FileVersion", "1.4.8.0"
VALUE "LegalCopyright", "Copyright (C) 2014-2018"
VALUE "ProductName", "Telegram Desktop"
VALUE "ProductVersion", "1.4.7.6"
VALUE "ProductVersion", "1.4.8.0"
END
END
BLOCK "VarFileInfo"

8
Telegram/Resources/winrc/Updater.rc
View File

@ -25,8 +25,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,4,7,6
PRODUCTVERSION 1,4,7,6
FILEVERSION 1,4,8,0
PRODUCTVERSION 1,4,8,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.4.7.6"
VALUE "FileVersion", "1.4.8.0"
VALUE "LegalCopyright", "Copyright (C) 2014-2018"
VALUE "ProductName", "Telegram Desktop"
VALUE "ProductVersion", "1.4.7.6"
VALUE "ProductVersion", "1.4.8.0"
END
END
BLOCK "VarFileInfo"

8
Telegram/SourceFiles/core/changelogs.cpp
View File

@ -63,6 +63,14 @@ std::map<int, const char*> BetaLogs() {
"in Twitter and Instagram link previews.\n"
"- Bug fixes and other minor improvements."
},
{
1004008,
"- Add emoji to media captions.\n"
"- Switch off the 'Count unread messages' option "
"in Settings > Notifications if you want to see "
"the unread chats count in the badge instead."
}
};
}

8
Telegram/SourceFiles/core/version.h
View File

@ -7,7 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
*/
#pragma once
#define TDESKTOP_REQUESTED_ALPHA_VERSION (1004007006ULL)
#define TDESKTOP_REQUESTED_ALPHA_VERSION (0ULL)
#ifdef TDESKTOP_OFFICIAL_TARGET
#define TDESKTOP_ALPHA_VERSION TDESKTOP_REQUESTED_ALPHA_VERSION
@ -15,7 +15,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#define TDESKTOP_ALPHA_VERSION (0ULL)
#endif // TDESKTOP_OFFICIAL_TARGET
constexpr auto AppVersion = 1004007;
constexpr auto AppVersionStr = "1.4.7";
constexpr auto AppBetaVersion = false;
constexpr auto AppVersion = 1004008;
constexpr auto AppVersionStr = "1.4.8";
constexpr auto AppBetaVersion = true;
constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;

8
Telegram/build/set_version.py
View File

@ -26,7 +26,7 @@ versionPatch = ''
versionAlpha = '0'
versionBeta = False
for arg in sys.argv:
match = re.match(r'^(\d+)\.(\d+)(\.(\d+)(\.(\d+|beta))?)?', arg)
match = re.match(r'^\s*(\d+)\.(\d+)(\.(\d+)(\.(\d+|beta))?)?\s*$', arg)
if match:
inputVersion = arg
versionMajor = match.group(1)
@ -38,8 +38,12 @@ for arg in sys.argv:
else:
versionAlpha = match.group(6)
if not len(versionMajor):
print("Wrong version parameter")
finish(1)
def checkVersionPart(part):
cleared = int(part) % 1000
cleared = int(part) % 1000 if len(part) > 0 else 0
if str(cleared) != part:
print("Bad version part: " + part)
finish(1)

10
Telegram/build/version
View File

@ -1,6 +1,6 @@
AppVersion 1004007
AppVersion 1004008
AppVersionStrMajor 1.4
AppVersionStrSmall 1.4.7
AppVersionStr 1.4.7
BetaChannel 0
AlphaVersion 1004007006
AppVersionStrSmall 1.4.8
AppVersionStr 1.4.8
BetaChannel 1
AlphaVersion 0

5
changelog.txt
View File

@ -1,3 +1,8 @@
1.4.8 beta (04.12.18)
- Add emoji to media captions.
- Switch off the 'Count unread messages' option in Settings > Notifications if you want to see the unread chats count in the badge instead.
1.4.7 beta (10.11.18)
- Crash fix.