mirror of
https://github.com/AyuGram/AyuGramDesktop.git
synced 2026-07-25 06:54:43 +00:00
Merge tag 'v6.7.8' into dev
# Conflicts: # .github/workflows/mac_packaged.yml # Telegram/Resources/winrc/Telegram.rc # Telegram/Resources/winrc/Updater.rc # Telegram/SourceFiles/api/api_chat_invite.h # Telegram/SourceFiles/boxes/language_box.cpp # Telegram/SourceFiles/boxes/send_files_box.h # Telegram/SourceFiles/boxes/sticker_set_box.cpp # Telegram/SourceFiles/core/version.h # Telegram/SourceFiles/data/data_types.h # Telegram/SourceFiles/history/history_item.cpp # Telegram/SourceFiles/history/history_widget.cpp # Telegram/SourceFiles/history/view/history_view_chat_section.cpp # Telegram/SourceFiles/history/view/history_view_message.cpp # Telegram/SourceFiles/history/view/history_view_translate_bar.cpp # Telegram/SourceFiles/history/view/history_view_translate_tracker.cpp # Telegram/SourceFiles/platform/mac/main_window_mac.mm # Telegram/SourceFiles/settings/sections/settings_main.cpp # Telegram/lib_ui # snap/snapcraft.yaml
This commit is contained in:
@@ -350,6 +350,8 @@ PRIVATE
|
||||
api/api_statistics_data_deserialize.h
|
||||
api/api_statistics_sender.cpp
|
||||
api/api_statistics_sender.h
|
||||
api/api_stickers_creator.cpp
|
||||
api/api_stickers_creator.h
|
||||
api/api_suggest_post.cpp
|
||||
api/api_suggest_post.h
|
||||
api/api_text_entities.cpp
|
||||
@@ -515,6 +517,8 @@ PRIVATE
|
||||
boxes/send_gif_with_caption_box.h
|
||||
boxes/send_files_box.cpp
|
||||
boxes/send_files_box.h
|
||||
boxes/send_files_box_reply_header.cpp
|
||||
boxes/send_files_box_reply_header.h
|
||||
boxes/share_box.cpp
|
||||
boxes/share_box.h
|
||||
boxes/star_gift_auction_box.cpp
|
||||
@@ -531,6 +535,8 @@ PRIVATE
|
||||
boxes/star_gift_preview_box.h
|
||||
boxes/star_gift_resale_box.cpp
|
||||
boxes/star_gift_resale_box.h
|
||||
boxes/sticker_creator_box.cpp
|
||||
boxes/sticker_creator_box.h
|
||||
boxes/sticker_set_box.cpp
|
||||
boxes/sticker_set_box.h
|
||||
boxes/stickers_box.cpp
|
||||
@@ -626,6 +632,8 @@ PRIVATE
|
||||
chat_helpers/emoji_keywords.h
|
||||
chat_helpers/emoji_list_widget.cpp
|
||||
chat_helpers/emoji_list_widget.h
|
||||
chat_helpers/emoji_picker_overlay.cpp
|
||||
chat_helpers/emoji_picker_overlay.h
|
||||
chat_helpers/emoji_sets_manager.cpp
|
||||
chat_helpers/emoji_sets_manager.h
|
||||
chat_helpers/emoji_suggestions_widget.cpp
|
||||
@@ -662,6 +670,8 @@ PRIVATE
|
||||
chat_helpers/ttl_media_layer_widget.h
|
||||
core/application.cpp
|
||||
core/application.h
|
||||
core/proxy_rotation_manager.cpp
|
||||
core/proxy_rotation_manager.h
|
||||
core/cached_webview_availability.h
|
||||
core/bank_card_click_handler.cpp
|
||||
core/bank_card_click_handler.h
|
||||
@@ -1593,6 +1603,8 @@ PRIVATE
|
||||
mtproto/facade.h
|
||||
mtproto/mtp_instance.cpp
|
||||
mtproto/mtp_instance.h
|
||||
mtproto/proxy_check.cpp
|
||||
mtproto/proxy_check.h
|
||||
mtproto/sender.h
|
||||
mtproto/session.cpp
|
||||
mtproto/session.h
|
||||
@@ -1656,6 +1668,8 @@ PRIVATE
|
||||
platform/linux/webauthn_linux.cpp
|
||||
platform/mac/file_utilities_mac.mm
|
||||
platform/mac/file_utilities_mac.h
|
||||
platform/mac/global_menu_mac.h
|
||||
platform/mac/global_menu_mac.mm
|
||||
platform/mac/launcher_mac.mm
|
||||
platform/mac/launcher_mac.h
|
||||
platform/mac/integration_mac.mm
|
||||
@@ -1813,6 +1827,8 @@ PRIVATE
|
||||
settings/sections/settings_local_passcode.h
|
||||
settings/sections/settings_main.cpp
|
||||
settings/sections/settings_main.h
|
||||
settings/settings_recent_searches.cpp
|
||||
settings/settings_recent_searches.h
|
||||
settings/settings_search.cpp
|
||||
settings/settings_search.h
|
||||
settings/settings_faq_suggestions.cpp
|
||||
@@ -2004,6 +2020,7 @@ PRIVATE
|
||||
window/window_section_common.h
|
||||
window/window_separate_id.cpp
|
||||
window/window_separate_id.h
|
||||
window/session/window_session_media.cpp
|
||||
window/window_session_controller.cpp
|
||||
window/window_session_controller.h
|
||||
window/window_session_controller_link_info.h
|
||||
|
||||
Reference in New Issue
Block a user