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
..
bot
Share referral page info rows and top bar setup
2026-10-30 12:28:26 +04:00
channel_statistics
Remove unused functions and their declarations
2026-10-29 21:42:58 +04:00
common_groups
Merge upstream dev through a1ea1ddd8c (7.2.9)
2026-09-23 16:21:17 +03:00
community
Fix community layer bottom edge case.
2026-07-10 14:04:31 +04:00
community_requests
Split per-consumer blocks out of big style files.
2026-07-27 14:04:37 +03:00
downloads
Share media list layout creation and delete-all action
2026-11-02 22:56:27 +04:00
global_media
Share media list layout creation and delete-all action
2026-11-02 22:56:27 +04:00
media
Merge upstream Telegram Desktop v7.3.5
2026-11-05 10:02:07 -05:00
members
Removed unused style includes from sources.
2026-07-27 14:04:36 +03:00
peer_gifts
Merge upstream Telegram Desktop v7.3.5
2026-11-05 10:02:07 -05:00
polls
Handle invalid totals when showing poll percentages.
2026-10-26 23:47:52 +04:00
profile
Merge upstream Telegram Desktop v7.3.5
2026-11-05 10:02:07 -05:00
reactions_list
Replaced qMin, qMax and qAbs with std::min, std::max and std::abs.
2026-09-14 18:03:15 +03:00
requests_list
Replaced qMin, qMax and qAbs with std::min, std::max and std::abs.
2026-09-14 18:03:15 +03:00
saved
Show profile music and balance as pills under the buttons
2026-10-29 14:42:35 +04:00
settings
Keep the local passcode section unlocked while open
2026-10-08 22:23:56 +04:00
similar_peers
Replaced qMin, qMax and qAbs with std::min, std::max and std::abs.
2026-09-14 18:03:15 +03:00
statistics
Update lib_ui to key override caches by palette identity
2026-10-19 22:20:03 +04:00
stories
Merge upstream tdesktop a8de5f928b (v7.3.4 + 51: Update brotli to 1.2.1)
2026-11-03 16:07:40 -05:00
userpic
Keep sticker selectors safe when sets change
2026-10-26 23:47:53 +04:00
info.style
Show profile music and balance as pills under the buttons
2026-10-29 14:42:35 +04:00
info_content_widget.cpp
Show profile music and balance as pills under the buttons
2026-10-29 14:42:35 +04:00
info_content_widget.h
Show profile music and balance as pills under the buttons
2026-10-29 14:42:35 +04:00
info_controller.cpp
Search photos, videos and voice messages in search tabs
2026-10-22 22:14:15 +04:00
info_controller.h
Keep the search panel open when jumping to a message from it
2026-10-21 12:21:56 +04:00
info_flexible_scroll.cpp
Show profile music and balance as pills under the buttons
2026-10-29 14:42:35 +04:00
info_flexible_scroll.h
Show profile music and balance as pills under the buttons
2026-10-29 14:42:35 +04:00
info_layer_widget.cpp
Replaced qMin, qMax and qAbs with std::min, std::max and std::abs.
2026-09-14 18:03:15 +03:00
info_layer_widget.h
Allowed closing boxes and layers with mouse back button.
2026-06-10 19:32:08 +03:00
info_memento.cpp
Keep sends and Info from outliving a discarded new topic
2026-10-29 07:11:41 +04:00
info_memento.h
Drop destroyed topics from Info back stacks and windows
2026-10-28 22:19:30 +04:00
info_section_widget.cpp
Fix community layer bottom edge case.
2026-07-10 14:04:31 +04:00
info_section_widget.h
Allowed stepping back inside info sections with mouse back button.
2026-06-10 19:32:27 +03:00
info_top_bar.cpp
Remove unused info top bar action and highlight code
2026-10-27 16:12:58 +04:00
info_top_bar.h
Remove unused info top bar action and highlight code
2026-10-27 16:12:58 +04:00
info_wrap_widget.cpp
Merge upstream tdesktop a8de5f928b (v7.3.4 + 51: Update brotli to 1.2.1)
2026-11-03 16:07:40 -05:00
info_wrap_widget.h
Drop destroyed topics from Info back stacks and windows
2026-10-28 22:19:30 +04:00