loop-uh
33b81db99d
Merge upstream Telegram Desktop v7.3.5
...
Слияние сделал модуль upstream-sync, конфликты разобраны вручную основным
агентом 2026-11-05: фоновый Claude модуля не смог войти в аккаунт
("Not logged in"), поэтому разбор не состоялся.
Решения:
- 15 файлов, которые форк убрал из системы контроля версий (AGENTS.md,
.agents/, .claude/, .github/workflows/): остаются удалёнными, как в
коммите a00235d71e и в слиянии 7.3.4.
- версии: 7.3.5 (7003005) из оригинала; название ZaStoGram в Telegram.rc,
AppBetaVersion = false и BetaChannel 0 сохранены; changelog.txt получает
блок 7.3.5, заголовок 7.3.4 остаётся форковым.
- file_upload.cpp: наша сигнатура sendPreparedRequest с FileTransferRpcKind
плюс .part = index из оригинала.
- wallet_session.h, location_picker.*: оставлены наши пути заголовков
(mtproto/instance/sender.h, mtproto/config/mtproto_config.h).
- iv_editor_widget.cpp: оставлена наша реализация на fieldTextWithSelection();
вспомогательная CaptureCommittedFieldSelection из оригинала убрана: она
ссылалась на отсутствующий у нас Widget::richOffsetForFieldOffset и осталась
бы неиспользуемой.
Конфликты разбирал ИИ: да.
2026-11-05 10:02:07 -05:00
..
add_bot_to_chat_box.cpp
Guard bot rights request callbacks by the box controller.
2026-10-26 23:47:46 +04:00
add_bot_to_chat_box.h
Added date of admin promotional to EditAdminBox.
2024-09-09 17:20:52 +03:00
add_participants_box.cpp
Merge upstream dev through a1ea1ddd8c (7.2.9)
2026-09-23 16:21:17 +03:00
add_participants_box.h
Use contacts list for new community admin.
2026-07-27 18:30:40 +04:00
add_to_community_box.cpp
Split per-consumer blocks out of big style files.
2026-07-27 14:04:37 +03:00
add_to_community_box.h
Create new chats from Community chooser
2026-07-24 20:00:59 +04:00
channel_ownership_transfer.cpp
Update API scheme to layer 223. Owners.
2026-02-28 19:07:08 +04:00
channel_ownership_transfer.h
Update API scheme to layer 223. Owners.
2026-02-28 19:07:08 +04:00
choose_peer_box.cpp
Confirm bot rights for all chats in a multi-chat request
2026-10-28 17:50:08 +04:00
choose_peer_box.h
Improve managed bot creation.
2026-03-25 13:08:50 +07:00
community_box.cpp
Resolve menu targets without retaining removed rows
2026-10-26 23:47:50 +04:00
community_box.h
Support bots as community linked peers
2026-07-10 14:04:30 +04:00
community_pending_requests_box.cpp
Show community pending requests in a layer
2026-07-10 14:04:27 +04:00
community_pending_requests_box.h
Add pending requests box for chats to be added.
2026-07-10 14:04:26 +04:00
create_managed_bot_box.cpp
Merge upstream v7.3.1
2026-10-15 21:43:47 +03:00
create_managed_bot_box.h
Improve managed bot creation.
2026-03-25 13:08:50 +07:00
edit_contact_box.cpp
Fix delete contact callback after the box is closed.
2026-10-26 23:47:46 +04:00
edit_contact_box.h
Added ability to edit contact note with context menu.
2025-10-10 09:27:00 +04:00
edit_discussion_link_box.cpp
Removed unused style includes from sources.
2026-07-27 14:04:36 +03:00
edit_discussion_link_box.h
Rename linked-chat to discussion-link.
2025-05-07 14:58:47 +04:00
edit_forum_topic_box.cpp
Removed unused style includes from sources.
2026-07-27 14:04:36 +03:00
edit_forum_topic_box.h
Removed include directive for ui_utility from rp_widget header.
2024-08-28 14:38:33 +03:00
edit_members_visible.cpp
Removed unused style includes from sources.
2026-07-27 14:04:36 +03:00
edit_members_visible.h
Allow hiding members list in groups.
2022-12-26 14:24:06 +04:00
edit_participant_box.cpp
Add manage-welcome-messages admin right
2026-08-13 14:52:31 +04:00
edit_participant_box.h
Update API scheme to layer 226. Guard-bots.
2026-06-09 14:27:37 +04:00
edit_participants_box.cpp
Merge upstream Telegram Desktop v7.3.5
2026-11-05 10:02:07 -05:00
edit_participants_box.h
Merge upstream dev through a1ea1ddd8c (7.2.9)
2026-09-23 16:21:17 +03:00
edit_peer_color_box.cpp
Share the peer color apply and resale button labels
2026-11-03 14:14:36 +04:00
edit_peer_color_box.h
Support most settings/edit and privacy deep links.
2026-01-28 11:55:18 +04:00
edit_peer_common.h
Correct max userpic length for managed bot.
2026-03-25 21:14:38 +07:00
edit_peer_history_visibility_box.cpp
Added confirmation box on close of unsaved group history visibility box.
2026-04-23 21:09:43 +03:00
edit_peer_history_visibility_box.h
Moved EditPeerHistoryVisibilityBox to td_ui.
2022-04-25 22:35:02 +04:00
edit_peer_info_box.cpp
Merge upstream tdesktop a8de5f928b (v7.3.4 + 51: Update brotli to 1.2.1)
2026-11-03 16:07:40 -05:00
edit_peer_info_box.h
Show star in channel direct messages settings.
2025-06-05 11:33:43 +04:00
edit_peer_invite_link.cpp
Remove the disabled invite link QR box implementation.
2026-10-21 22:29:10 +04:00
edit_peer_invite_link.h
Make nice share message from miniapp.
2024-11-17 15:08:16 +04:00
edit_peer_invite_links.cpp
Update API scheme to layer 226. Guard-bots.
2026-06-09 14:27:37 +04:00
edit_peer_invite_links.h
Initial chat links edition implementation.
2024-04-01 22:44:21 +04:00
edit_peer_members.style
Split per-consumer blocks out of big style files.
2026-07-27 14:04:37 +03:00
edit_peer_permissions_box.cpp
Merge upstream dev through b033e513f4
2026-08-22 11:23:33 +03:00
edit_peer_permissions_box.h
Support all required deep links.
2026-01-28 11:55:19 +04:00
edit_peer_reactions.cpp
Use MakeWrappedEmoji which forwards nullptr-s.
2026-06-09 14:27:37 +04:00
edit_peer_reactions.h
Set custom reactions hard limit to max level.
2023-11-30 17:56:57 +04:00
edit_peer_requests_box.cpp
Merge remote-tracking branch 'upstream/dev' into dev
2026-07-14 18:46:38 +03:00
edit_peer_requests_box.h
Restructure mtproto ownership
2026-07-08 00:07:46 +03:00
edit_peer_type_box.cpp
Merge remote-tracking branch 'upstream/dev' into dev
2026-07-28 14:26:28 +03:00
edit_peer_type_box.h
Update API scheme to layer 226. Guard-bots.
2026-06-09 14:27:37 +04:00
edit_peer_usernames_list.cpp
Fixed bot username reorder losing new order.
2026-09-29 17:10:36 +03:00
edit_peer_usernames_list.h
Fixed bot username reorder losing new order.
2026-09-29 17:10:36 +03:00
edit_tag_control.cpp
Implement nice member/admin edit in groups.
2026-02-28 19:07:10 +04:00
edit_tag_control.h
Implement nice tag edit with preview.
2026-02-28 19:07:10 +04:00
manage_community_box.cpp
Added video profile photos for chats and channels.
2026-08-17 08:33:45 +03:00
manage_community_box.h
Add manage community box.
2026-07-10 14:04:26 +04:00
peer_short_info_box.cpp
Merge upstream dev through a1ea1ddd8c (7.2.9)
2026-09-23 16:21:17 +03:00
peer_short_info_box.h
Replaced plain username with link in peer short info box.
2026-04-23 21:09:43 +03:00
prepare_short_info_box.cpp
Replaced plain username with link in peer short info box.
2026-04-23 21:09:43 +03:00
prepare_short_info_box.h
Start showing gifts from stories.
2025-01-22 22:13:25 +04:00
replace_boost_box.cpp
Update API scheme to layer 226. Guard-bots.
2026-06-09 14:27:37 +04:00
replace_boost_box.h
Update API scheme to layer 226. Guard-bots.
2026-06-09 14:27:37 +04:00
tag_info_box.cpp
Added missing const to local references in some files.
2026-08-12 13:36:02 +03:00
tag_info_box.h
Nice tag badge click handler in groups.
2026-02-28 19:07:10 +04:00
toggle_topics_box.cpp
Replay wallet animation on click, show it in send confirm.
2026-10-08 22:23:58 +04:00
toggle_topics_box.h
Implement nice topic mode editing.
2025-06-04 10:00:22 +04:00
verify_peers_box.cpp
Support text links in bot verification descriptions
2026-10-08 22:23:53 +04:00
verify_peers_box.h
Return native verify icon to the right.
2024-12-31 17:18:59 +04:00