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
..
wallet.style
Hint at dragging the first gift onto an empty wallet card.
2026-10-20 21:32:34 +04:00
wallet_address.cpp
wallet_address.h
wallet_address_label.cpp
Single entity for address clickable area.
2026-10-20 18:01:07 +04:00
wallet_address_label.h
Single entity for address clickable area.
2026-10-20 18:01:07 +04:00
wallet_amount_field.cpp
wallet_amount_field.h
wallet_amount_painter.cpp
wallet_amount_painter.h
wallet_api.cpp
Merge upstream tdesktop a8de5f928b (v7.3.4 + 51: Update brotli to 1.2.1)
2026-11-03 16:07:40 -05:00
wallet_api.h
Merge upstream tdesktop a8de5f928b (v7.3.4 + 51: Update brotli to 1.2.1)
2026-11-03 16:07:40 -05:00
wallet_card_angle.cpp
wallet_card_angle.h
wallet_card_colors.cpp
Kept the card color toast links readable on every wallet palette.
2026-10-20 17:07:52 +04:00
wallet_card_colors.h
Новые файлы оригинала: include-пути mtproto по раскладке форка
2026-11-03 17:03:07 -05:00
wallet_card_drag.cpp
Keep overlapping wallet gifts behind legible tinted card ink
2026-10-20 17:07:52 +04:00
wallet_card_drag.h
Keep overlapping wallet gifts behind legible tinted card ink
2026-10-20 17:07:52 +04:00
wallet_card_editor.cpp
Keep overlapping wallet gifts behind legible tinted card ink
2026-10-20 17:07:52 +04:00
wallet_card_editor.h
Keep overlapping wallet gifts behind legible tinted card ink
2026-10-20 17:07:52 +04:00
wallet_card_flight.cpp
Recolored the wallet window together with its card wave.
2026-10-20 17:07:52 +04:00
wallet_card_flight.h
Recolored the wallet window together with its card wave.
2026-10-20 17:07:52 +04:00
wallet_card_float.cpp
Floated the wallet card over the scrolled collectibles grid.
2026-10-20 17:07:51 +04:00
wallet_card_float.h
Floated the wallet card over the scrolled collectibles grid.
2026-10-20 17:07:51 +04:00
wallet_card_foreground.cpp
Show the card fiat and GRAM halo only over gifts
2026-10-20 21:23:41 +04:00
wallet_card_foreground.h
Show the card fiat and GRAM halo only over gifts
2026-10-20 21:23:41 +04:00
wallet_card_gradient.cpp
Recolored the wallet window together with its card wave.
2026-10-20 17:07:52 +04:00
wallet_card_gradient.h
Recolored the wallet window together with its card wave.
2026-10-20 17:07:52 +04:00
wallet_card_look.cpp
Keep overlapping wallet gifts behind legible tinted card ink
2026-10-20 17:07:52 +04:00
wallet_card_look.h
Keep overlapping wallet gifts behind legible tinted card ink
2026-10-20 17:07:52 +04:00
wallet_card_space.cpp
Place card gifts added by an action where they overlap least
2026-10-21 21:27:44 +04:00
wallet_card_space.h
Place card gifts added by an action where they overlap least
2026-10-21 21:27:44 +04:00
wallet_card_stickers.cpp
Show the card fiat and GRAM halo only over gifts
2026-10-20 21:23:41 +04:00
wallet_card_stickers.h
Show the card fiat and GRAM halo only over gifts
2026-10-20 21:23:41 +04:00
wallet_card_tint.cpp
Show the card fiat and GRAM halo only over gifts
2026-10-20 21:23:41 +04:00
wallet_card_tint.h
Show the card fiat and GRAM halo only over gifts
2026-10-20 21:23:41 +04:00
wallet_card_transition.cpp
Keep overlapping wallet gifts behind legible tinted card ink
2026-10-20 17:07:52 +04:00
wallet_card_transition.h
Keep overlapping wallet gifts behind legible tinted card ink
2026-10-20 17:07:52 +04:00
wallet_card_view.cpp
Keep card info under moving gifts, fade it in after landing
2026-10-20 17:07:54 +04:00
wallet_card_view.h
Flew the wallet card out of the profile pill and back.
2026-10-20 17:07:53 +04:00
wallet_card_view_motion.cpp
Keep wallet card transitions continuous across changes
2026-10-20 17:07:53 +04:00
wallet_card_view_motion.h
Keep wallet card transitions continuous across changes
2026-10-20 17:07:53 +04:00
wallet_chat_show.cpp
wallet_chat_show.h
wallet_collectible_media.cpp
Kept served gifts on wallet history row chips.
2026-10-20 17:07:52 +04:00
wallet_collectible_media.h
Kept served gifts on wallet history row chips.
2026-10-20 17:07:52 +04:00
wallet_collectible_record.cpp
Showed wallet card gift stickers on the Money card.
2026-10-20 17:07:51 +04:00
wallet_collectible_record.h
Used served gifts in wallet collectibles instead of lookups.
2026-10-20 17:07:51 +04:00
wallet_collectibles.cpp
Новые файлы оригинала: include-пути mtproto по раскладке форка
2026-11-03 17:03:07 -05:00
wallet_collectibles.h
Drag Collectibles gifts onto the wallet card by touch
2026-10-21 21:27:44 +04:00
wallet_collectibles_hint.cpp
Hint at dragging the first gift onto an empty wallet card.
2026-10-20 21:32:34 +04:00
wallet_collectibles_hint.h
Hint at dragging the first gift onto an empty wallet card.
2026-10-20 21:32:34 +04:00
wallet_collectibles_viewport.cpp
Keep Money lists in place when switching their tabs.
2026-10-21 18:38:25 +04:00
wallet_collectibles_viewport.h
Keep Money lists in place when switching their tabs.
2026-10-21 18:38:25 +04:00
wallet_comment.cpp
wallet_comment.h
wallet_content.cpp
Merge upstream tdesktop a8de5f928b (v7.3.4 + 51: Update brotli to 1.2.1)
2026-11-03 16:07:40 -05:00
wallet_content.h
Fix some issues in flyout card.
2026-10-20 17:07:53 +04:00
wallet_custody.cpp
wallet_custody.h
wallet_diamond_flight.cpp
wallet_diamond_flight.h
wallet_engine.cpp
wallet_engine.h
wallet_fiat.cpp
Added a wallet balance pill to user profiles.
2026-10-20 17:07:51 +04:00
wallet_fiat.h
Added a wallet balance pill to user profiles.
2026-10-20 17:07:51 +04:00
wallet_gift_move_presentation.cpp
Forward-declare engine and stream types in wallet session
2026-11-03 14:14:36 +04:00
wallet_gift_move_presentation.h
Showed profile gift moves as Telegram wallet rows.
2026-10-20 17:07:50 +04:00
wallet_key_protection.cpp
wallet_key_protection.h
wallet_move_to_gifts.cpp
Centre gift path bearings and wrapped refusal text
2026-10-20 17:07:50 +04:00
wallet_move_to_gifts.h
Align gift move confirmations and recipient spacing
2026-10-20 17:07:50 +04:00
wallet_onramp.cpp
wallet_onramp.h
wallet_own_card.cpp
Новые файлы оригинала: include-пути mtproto по раскладке форка
2026-11-03 17:03:07 -05:00
wallet_own_card.h
Новые файлы оригинала: include-пути mtproto по раскладке форка
2026-11-03 17:03:07 -05:00
wallet_palette.cpp
Started the wallet wave at its sticker and sped up its first frame.
2026-10-20 17:07:52 +04:00
wallet_palette.h
Recolored the wallet window together with its card wave.
2026-10-20 17:07:52 +04:00
wallet_panel.cpp
Open the Money window from bare @wallet links
2026-11-02 22:56:27 +04:00
wallet_panel.h
Open the Money window from bare @wallet links
2026-11-02 22:56:27 +04:00
wallet_phrase_shares.cpp
wallet_phrase_shares.h
wallet_rates.cpp
wallet_rates.h
wallet_send_preparation.cpp
Showed profile gift moves as Telegram wallet rows.
2026-10-20 17:07:50 +04:00
wallet_send_preparation.h
Showed profile gift moves as Telegram wallet rows.
2026-10-20 17:07:50 +04:00
wallet_sending_effects.cpp
wallet_sending_effects.h
wallet_session.cpp
Merge upstream Telegram Desktop v7.3.5
2026-11-05 10:02:07 -05:00
wallet_session.h
Merge upstream Telegram Desktop v7.3.5
2026-11-05 10:02:07 -05:00
wallet_session_deposit.cpp
Merge upstream Telegram Desktop v7.3.5
2026-11-05 10:02:07 -05:00
wallet_session_deposit.h
Forward-declare engine and stream types in wallet session
2026-11-03 14:14:36 +04:00
wallet_session_gift_moves.cpp
Showed profile gift moves as Telegram wallet rows.
2026-10-20 17:07:50 +04:00
wallet_session_gift_moves.h
Showed profile gift moves as Telegram wallet rows.
2026-10-20 17:07:50 +04:00
wallet_session_waits.cpp
Used served gifts in wallet collectibles instead of lookups.
2026-10-20 17:07:51 +04:00
wallet_session_waits.h
Used served gifts in wallet collectibles instead of lookups.
2026-10-20 17:07:51 +04:00
wallet_stream.cpp
wallet_stream.h
wallet_ton_connect.cpp
Strip every bidi control character from document names.
2026-10-26 23:47:47 +04:00
wallet_ton_connect.h
Merge upstream tdesktop a8de5f928b (v7.3.4 + 51: Update brotli to 1.2.1)
2026-11-03 16:07:40 -05:00
wallet_ton_connect_box.cpp
wallet_ton_connect_box.h
wallet_ton_connect_claims.cpp
wallet_ton_connect_claims.h
wallet_ton_connect_emulation.cpp
wallet_ton_connect_emulation.h
wallet_ton_connect_link.cpp
wallet_ton_connect_link.h
wallet_ton_connect_login.cpp
Fixed wallet login box races and preloaded its wallet.
2026-10-17 11:22:02 +04:00
wallet_ton_connect_login.h
Новые файлы оригинала: include-пути mtproto по раскладке форка
2026-11-03 17:03:07 -05:00
wallet_ton_connect_request.cpp
wallet_ton_connect_request.h
wallet_ton_connect_request_box.cpp
wallet_ton_connect_request_box.h
wallet_transfer_messages.cpp
wallet_transfer_messages.h
wallet_transfer_store.cpp
Showed profile gift moves as Telegram wallet rows.
2026-10-20 17:07:50 +04:00
wallet_transfer_store.h
Showed profile gift moves as Telegram wallet rows.
2026-10-20 17:07:50 +04:00
wallet_unlock.cpp
wallet_unlock.h
wallet_user_addresses.cpp
wallet_user_addresses.h
wallet_vault.cpp
wallet_vault.h
wallet_window_transition.cpp
Fix some issues in flyout card.
2026-10-20 17:07:53 +04:00
wallet_window_transition.h
Painted the wallet wave's first frame without waiting for vsync.
2026-10-20 17:07:52 +04:00