Merge tag 'v4.9.3' into dev
# Conflicts: # Telegram/Resources/winrc/Telegram.rc # Telegram/Resources/winrc/Updater.rc # Telegram/SourceFiles/core/version.h # Telegram/lib_ui
2
.github/ISSUE_TEMPLATE/config.yml
vendored
|
@ -1,6 +1,6 @@
|
|||
blank_issues_enabled: false
|
||||
contact_links:
|
||||
- name: API issue
|
||||
- name: Platform-wide issue
|
||||
url: https://bugs.telegram.org
|
||||
about: Any bug report or feature request affecting more than only Telegram Desktop.
|
||||
- name: Issue of other client
|
||||
|
|
12
.github/workflows/win.yml
vendored
|
@ -61,13 +61,10 @@ jobs:
|
|||
steps:
|
||||
- name: Prepare directories.
|
||||
run: |
|
||||
mkdir %userprofile%\TBuild
|
||||
mkdir %userprofile%\TBuild\Libraries
|
||||
mklink /d %GITHUB_WORKSPACE%\TBuild %userprofile%\TBuild
|
||||
echo TBUILD=%GITHUB_WORKSPACE%\TBuild>>%GITHUB_ENV%
|
||||
|
||||
mkdir %userprofile%\TBuild Libraries
|
||||
mklink /d %userprofile%\TBuild\Libraries %GITHUB_WORKSPACE%\Libraries
|
||||
|
||||
- name: Get repository name.
|
||||
shell: bash
|
||||
run: echo "REPO_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV
|
||||
|
@ -101,7 +98,7 @@ jobs:
|
|||
id: cache-libs
|
||||
uses: actions/cache@v3.0.11
|
||||
with:
|
||||
path: Libraries
|
||||
path: ${{ env.TBUILD }}\Libraries
|
||||
key: ${{ runner.OS }}-${{ matrix.arch }}-libs-${{ env.CACHE_KEY }}
|
||||
restore-keys: ${{ runner.OS }}-${{ matrix.arch }}-libs-
|
||||
|
||||
|
@ -109,7 +106,9 @@ jobs:
|
|||
env:
|
||||
GYP_MSVS_OVERRIDE_PATH: 'C:\Program Files\Microsoft Visual Studio\2022\Enterprise\'
|
||||
GYP_MSVS_VERSION: 2022
|
||||
run: '%TBUILD%\%REPO_NAME%\Telegram\build\prepare\win.bat skip-release silent'
|
||||
run: |
|
||||
cd %TBUILD%
|
||||
%REPO_NAME%\Telegram\build\prepare\win.bat skip-release silent
|
||||
|
||||
- name: Read defines.
|
||||
shell: bash
|
||||
|
@ -133,6 +132,7 @@ jobs:
|
|||
|
||||
- name: Free up some disk space.
|
||||
run: |
|
||||
cd %TBUILD%
|
||||
del /S Libraries\*.pdb
|
||||
del /S Libraries\*.pch
|
||||
del /S Libraries\*.obj
|
||||
|
|
|
@ -19,9 +19,11 @@ include(cmake/validate_special_target.cmake)
|
|||
include(cmake/version.cmake)
|
||||
desktop_app_parse_version(Telegram/build/version)
|
||||
|
||||
set(project_langs ASM C CXX)
|
||||
set(project_langs C CXX)
|
||||
if (APPLE)
|
||||
list(APPEND project_langs OBJC OBJCXX)
|
||||
elseif (LINUX)
|
||||
list(APPEND project_langs ASM)
|
||||
endif()
|
||||
|
||||
project(Telegram
|
||||
|
@ -57,7 +59,7 @@ include(cmake/options.cmake)
|
|||
|
||||
if (NOT DESKTOP_APP_USE_PACKAGED)
|
||||
if (WIN32)
|
||||
set(qt_version 5.15.9)
|
||||
set(qt_version 5.15.10)
|
||||
elseif (APPLE)
|
||||
set(qt_version 6.3.2)
|
||||
endif()
|
||||
|
|
|
@ -211,6 +211,8 @@ PRIVATE
|
|||
api/api_user_privacy.h
|
||||
api/api_views.cpp
|
||||
api/api_views.h
|
||||
api/api_websites.cpp
|
||||
api/api_websites.h
|
||||
api/api_who_reacted.cpp
|
||||
api/api_who_reacted.h
|
||||
boxes/filters/edit_filter_box.cpp
|
||||
|
@ -1041,6 +1043,8 @@ PRIVATE
|
|||
media/stories/media_stories_sibling.h
|
||||
media/stories/media_stories_slider.cpp
|
||||
media/stories/media_stories_slider.h
|
||||
media/stories/media_stories_stealth.cpp
|
||||
media/stories/media_stories_stealth.h
|
||||
media/stories/media_stories_view.cpp
|
||||
media/stories/media_stories_view.h
|
||||
media/streaming/media_streaming_audio_track.cpp
|
||||
|
@ -1312,6 +1316,8 @@ PRIVATE
|
|||
settings/settings_scale_preview.cpp
|
||||
settings/settings_scale_preview.h
|
||||
settings/settings_type.h
|
||||
settings/settings_websites.cpp
|
||||
settings/settings_websites.h
|
||||
storage/details/storage_file_utilities.cpp
|
||||
storage/details/storage_file_utilities.h
|
||||
storage/details/storage_settings_scheme.cpp
|
||||
|
|
BIN
Telegram/Resources/icons/chat/input_like.png
Normal file
After Width: | Height: | Size: 699 B |
BIN
Telegram/Resources/icons/chat/input_like@2x.png
Normal file
After Width: | Height: | Size: 1.3 KiB |
BIN
Telegram/Resources/icons/chat/input_like@3x.png
Normal file
After Width: | Height: | Size: 2 KiB |
BIN
Telegram/Resources/icons/chat/input_liked.png
Normal file
After Width: | Height: | Size: 559 B |
BIN
Telegram/Resources/icons/chat/input_liked@2x.png
Normal file
After Width: | Height: | Size: 942 B |
BIN
Telegram/Resources/icons/chat/input_liked@3x.png
Normal file
After Width: | Height: | Size: 1.3 KiB |
BIN
Telegram/Resources/icons/emoji/emoji_skin.png
Normal file
After Width: | Height: | Size: 412 B |
BIN
Telegram/Resources/icons/emoji/emoji_skin@2x.png
Normal file
After Width: | Height: | Size: 698 B |
BIN
Telegram/Resources/icons/emoji/emoji_skin@3x.png
Normal file
After Width: | Height: | Size: 952 B |
BIN
Telegram/Resources/icons/mediaview/download_locked.png
Normal file
After Width: | Height: | Size: 508 B |
BIN
Telegram/Resources/icons/mediaview/download_locked@2x.png
Normal file
After Width: | Height: | Size: 915 B |
BIN
Telegram/Resources/icons/mediaview/download_locked@3x.png
Normal file
After Width: | Height: | Size: 1.3 KiB |
BIN
Telegram/Resources/icons/menu/antispam.png
Normal file
After Width: | Height: | Size: 761 B |
BIN
Telegram/Resources/icons/menu/antispam@2x.png
Normal file
After Width: | Height: | Size: 1.4 KiB |
BIN
Telegram/Resources/icons/menu/antispam@3x.png
Normal file
After Width: | Height: | Size: 2.1 KiB |
BIN
Telegram/Resources/icons/menu/bot_commands.png
Normal file
After Width: | Height: | Size: 538 B |
BIN
Telegram/Resources/icons/menu/bot_commands@2x.png
Normal file
After Width: | Height: | Size: 821 B |
BIN
Telegram/Resources/icons/menu/bot_commands@3x.png
Normal file
After Width: | Height: | Size: 1.1 KiB |
BIN
Telegram/Resources/icons/menu/calls_receive.png
Normal file
After Width: | Height: | Size: 773 B |
BIN
Telegram/Resources/icons/menu/calls_receive@2x.png
Normal file
After Width: | Height: | Size: 1.4 KiB |
BIN
Telegram/Resources/icons/menu/calls_receive@3x.png
Normal file
After Width: | Height: | Size: 2.1 KiB |
BIN
Telegram/Resources/icons/menu/chat_discuss.png
Normal file
After Width: | Height: | Size: 751 B |
BIN
Telegram/Resources/icons/menu/chat_discuss@2x.png
Normal file
After Width: | Height: | Size: 1.3 KiB |
BIN
Telegram/Resources/icons/menu/chat_discuss@3x.png
Normal file
After Width: | Height: | Size: 2 KiB |
BIN
Telegram/Resources/icons/menu/devices.png
Normal file
After Width: | Height: | Size: 402 B |
BIN
Telegram/Resources/icons/menu/devices@2x.png
Normal file
After Width: | Height: | Size: 595 B |
BIN
Telegram/Resources/icons/menu/devices@3x.png
Normal file
After Width: | Height: | Size: 840 B |
BIN
Telegram/Resources/icons/menu/dock_bounce.png
Normal file
After Width: | Height: | Size: 497 B |
BIN
Telegram/Resources/icons/menu/dock_bounce@2x.png
Normal file
After Width: | Height: | Size: 808 B |
BIN
Telegram/Resources/icons/menu/dock_bounce@3x.png
Normal file
After Width: | Height: | Size: 1.1 KiB |
BIN
Telegram/Resources/icons/menu/download_locked.png
Normal file
After Width: | Height: | Size: 516 B |
BIN
Telegram/Resources/icons/menu/download_locked@2x.png
Normal file
After Width: | Height: | Size: 870 B |
BIN
Telegram/Resources/icons/menu/download_locked@3x.png
Normal file
After Width: | Height: | Size: 1.2 KiB |
BIN
Telegram/Resources/icons/menu/experimental.png
Normal file
After Width: | Height: | Size: 582 B |
BIN
Telegram/Resources/icons/menu/experimental@2x.png
Normal file
After Width: | Height: | Size: 991 B |
BIN
Telegram/Resources/icons/menu/experimental@3x.png
Normal file
After Width: | Height: | Size: 1.4 KiB |
BIN
Telegram/Resources/icons/menu/faq.png
Normal file
After Width: | Height: | Size: 539 B |
BIN
Telegram/Resources/icons/menu/faq@2x.png
Normal file
After Width: | Height: | Size: 1.2 KiB |
BIN
Telegram/Resources/icons/menu/faq@3x.png
Normal file
After Width: | Height: | Size: 1.8 KiB |
BIN
Telegram/Resources/icons/menu/group_log.png
Normal file
After Width: | Height: | Size: 539 B |
BIN
Telegram/Resources/icons/menu/group_log@2x.png
Normal file
After Width: | Height: | Size: 941 B |
BIN
Telegram/Resources/icons/menu/group_log@3x.png
Normal file
After Width: | Height: | Size: 1.2 KiB |
BIN
Telegram/Resources/icons/menu/group_reactions.png
Normal file
After Width: | Height: | Size: 629 B |
BIN
Telegram/Resources/icons/menu/group_reactions@2x.png
Normal file
After Width: | Height: | Size: 1.1 KiB |
BIN
Telegram/Resources/icons/menu/group_reactions@3x.png
Normal file
After Width: | Height: | Size: 1.7 KiB |
BIN
Telegram/Resources/icons/menu/groups_create.png
Normal file
After Width: | Height: | Size: 717 B |
BIN
Telegram/Resources/icons/menu/groups_create@2x.png
Normal file
After Width: | Height: | Size: 1.3 KiB |
BIN
Telegram/Resources/icons/menu/groups_create@3x.png
Normal file
After Width: | Height: | Size: 2 KiB |
BIN
Telegram/Resources/icons/menu/hide_members.png
Normal file
After Width: | Height: | Size: 809 B |
BIN
Telegram/Resources/icons/menu/hide_members@2x.png
Normal file
After Width: | Height: | Size: 1.6 KiB |
BIN
Telegram/Resources/icons/menu/hide_members@3x.png
Normal file
After Width: | Height: | Size: 2.4 KiB |
BIN
Telegram/Resources/icons/menu/info_notifications.png
Normal file
After Width: | Height: | Size: 461 B |
BIN
Telegram/Resources/icons/menu/info_notifications@2x.png
Normal file
After Width: | Height: | Size: 853 B |
BIN
Telegram/Resources/icons/menu/info_notifications@3x.png
Normal file
After Width: | Height: | Size: 1.3 KiB |
BIN
Telegram/Resources/icons/menu/ip_address.png
Normal file
After Width: | Height: | Size: 701 B |
BIN
Telegram/Resources/icons/menu/ip_address@2x.png
Normal file
After Width: | Height: | Size: 1.2 KiB |
BIN
Telegram/Resources/icons/menu/ip_address@3x.png
Normal file
After Width: | Height: | Size: 2 KiB |
BIN
Telegram/Resources/icons/menu/links_profile.png
Normal file
After Width: | Height: | Size: 467 B |
BIN
Telegram/Resources/icons/menu/links_profile@2x.png
Normal file
After Width: | Height: | Size: 883 B |
BIN
Telegram/Resources/icons/menu/links_profile@3x.png
Normal file
After Width: | Height: | Size: 1.3 KiB |
BIN
Telegram/Resources/icons/menu/lock.png
Normal file
After Width: | Height: | Size: 555 B |
BIN
Telegram/Resources/icons/menu/lock@2x.png
Normal file
After Width: | Height: | Size: 932 B |
BIN
Telegram/Resources/icons/menu/lock@3x.png
Normal file
After Width: | Height: | Size: 1.3 KiB |
BIN
Telegram/Resources/icons/menu/network.png
Normal file
After Width: | Height: | Size: 492 B |
BIN
Telegram/Resources/icons/menu/network@2x.png
Normal file
After Width: | Height: | Size: 818 B |
BIN
Telegram/Resources/icons/menu/network@3x.png
Normal file
After Width: | Height: | Size: 1.2 KiB |
BIN
Telegram/Resources/icons/menu/payment_address.png
Normal file
After Width: | Height: | Size: 584 B |
BIN
Telegram/Resources/icons/menu/payment_address@2x.png
Normal file
After Width: | Height: | Size: 1.2 KiB |
BIN
Telegram/Resources/icons/menu/payment_address@3x.png
Normal file
After Width: | Height: | Size: 1.8 KiB |
BIN
Telegram/Resources/icons/menu/payment_email.png
Normal file
After Width: | Height: | Size: 757 B |
BIN
Telegram/Resources/icons/menu/payment_email@2x.png
Normal file
After Width: | Height: | Size: 1.4 KiB |
BIN
Telegram/Resources/icons/menu/payment_email@3x.png
Normal file
After Width: | Height: | Size: 2.2 KiB |
BIN
Telegram/Resources/icons/menu/power_usage.png
Normal file
After Width: | Height: | Size: 511 B |
BIN
Telegram/Resources/icons/menu/power_usage@2x.png
Normal file
After Width: | Height: | Size: 902 B |
BIN
Telegram/Resources/icons/menu/power_usage@3x.png
Normal file
After Width: | Height: | Size: 1.2 KiB |
BIN
Telegram/Resources/icons/menu/premium.png
Normal file
After Width: | Height: | Size: 687 B |
BIN
Telegram/Resources/icons/menu/premium@2x.png
Normal file
After Width: | Height: | Size: 1.4 KiB |
BIN
Telegram/Resources/icons/menu/premium@3x.png
Normal file
After Width: | Height: | Size: 2.1 KiB |
BIN
Telegram/Resources/icons/menu/recovery_email.png
Normal file
After Width: | Height: | Size: 508 B |
BIN
Telegram/Resources/icons/menu/recovery_email@2x.png
Normal file
After Width: | Height: | Size: 734 B |
BIN
Telegram/Resources/icons/menu/recovery_email@3x.png
Normal file
After Width: | Height: | Size: 1.2 KiB |
BIN
Telegram/Resources/icons/menu/remove.png
Normal file
After Width: | Height: | Size: 516 B |
BIN
Telegram/Resources/icons/menu/remove@2x.png
Normal file
After Width: | Height: | Size: 823 B |
BIN
Telegram/Resources/icons/menu/remove@3x.png
Normal file
After Width: | Height: | Size: 1.2 KiB |
BIN
Telegram/Resources/icons/menu/signed.png
Normal file
After Width: | Height: | Size: 578 B |
BIN
Telegram/Resources/icons/menu/signed@2x.png
Normal file
After Width: | Height: | Size: 1 KiB |
BIN
Telegram/Resources/icons/menu/signed@3x.png
Normal file
After Width: | Height: | Size: 1.5 KiB |
BIN
Telegram/Resources/icons/menu/stealth.png
Normal file
After Width: | Height: | Size: 635 B |
BIN
Telegram/Resources/icons/menu/stealth@2x.png
Normal file
After Width: | Height: | Size: 1.2 KiB |
BIN
Telegram/Resources/icons/menu/stealth@3x.png
Normal file
After Width: | Height: | Size: 1.7 KiB |
BIN
Telegram/Resources/icons/menu/stealth_locked.png
Normal file
After Width: | Height: | Size: 726 B |
BIN
Telegram/Resources/icons/menu/stealth_locked@2x.png
Normal file
After Width: | Height: | Size: 1.4 KiB |
BIN
Telegram/Resources/icons/menu/stealth_locked@3x.png
Normal file
After Width: | Height: | Size: 2.1 KiB |
Before Width: | Height: | Size: 519 B |
Before Width: | Height: | Size: 827 B |
Before Width: | Height: | Size: 1.3 KiB |