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
..
iv_editor_article_style.cpp
Resolve upstream integration contracts
2026-08-22 12:27:18 +03:00
iv_editor_article_style.h
[iv-editor] Moved article style and metrics to iv_editor_article_style.
2026-08-17 08:33:43 +03:00
iv_editor_auto_pair.cpp
Added auto closing of typed brackets in article editor.
2026-08-21 14:38:14 +03:00
iv_editor_auto_pair.h
Added auto closing of typed brackets in article editor.
2026-08-21 14:38:14 +03:00
iv_editor_box.cpp
Превращать набранный текст <details> в сворачиваемый блок и назвать пункт понятнее
2026-10-16 09:47:31 +03:00
iv_editor_box.h
[iv-editor] Added slash menu with list of insertable blocks.
2026-08-25 17:01:14 +03:00
iv_editor_button_box.cpp
Set input method hints in typed input fields
2026-08-24 14:56:28 +04:00
iv_editor_button_box.h
Add and edit buttons in the rich message editor
2026-08-10 18:42:50 +04:00
iv_editor_clipboard.cpp
Fix crash pasting rich content copied before a logout
2026-10-01 18:42:21 +04:00
iv_editor_clipboard.h
Fix crash pasting rich content copied before a logout
2026-10-01 18:42:21 +04:00
iv_editor_clipboard_import.cpp
Merge upstream tdesktop a8de5f928b (v7.3.4 + 51: Update brotli to 1.2.1)
2026-11-03 16:07:40 -05:00
iv_editor_clipboard_import.h
Confirm attaching local files from pasted HTML.
2026-10-27 14:45:06 +04:00
iv_editor_commands.cpp
[iv-editor] Added quote exit on Enter in empty last line.
2026-08-17 08:33:43 +03:00
iv_editor_commands.h
[iv-editor] Moved Enter handling into command chain.
2026-08-17 08:33:42 +03:00
iv_editor_insert_suggestions.cpp
Превращать набранный текст <details> в сворачиваемый блок и назвать пункт понятнее
2026-10-16 09:47:31 +03:00
iv_editor_insert_suggestions.h
[iv-editor] Added slash menu with list of insertable blocks.
2026-08-25 17:01:14 +03:00
iv_editor_math_box.cpp
Set input method hints in typed input fields
2026-08-24 14:56:28 +04:00
iv_editor_math_box.h
[iv-editor] Moved formula editing box to iv_editor_math_box.
2026-08-17 08:33:43 +03:00
iv_editor_page_blocks.cpp
Validate local links and external URL schemes
2026-10-26 23:47:55 +04:00
iv_editor_page_blocks.h
Got rid of cast-to-void result discarding.
2026-08-21 14:38:14 +03:00
iv_editor_page_list.cpp
Fix Roman list markers growing with huge item numbers
2026-10-01 18:46:51 +04:00
iv_editor_page_list.h
Fix Roman list markers growing with huge item numbers
2026-10-01 18:46:51 +04:00
iv_editor_page_media.cpp
[iv-editor] Moved media block helpers to iv_editor_page_media.
2026-08-17 08:33:43 +03:00
iv_editor_page_media.h
[iv-editor] Moved media block helpers to iv_editor_page_media.
2026-08-17 08:33:43 +03:00
iv_editor_page_path.cpp
[iv-editor] Moved block path helpers to iv_editor_page_path.
2026-08-17 08:33:43 +03:00
iv_editor_page_path.h
[iv-editor] Moved block path helpers to iv_editor_page_path.
2026-08-17 08:33:43 +03:00
iv_editor_page_table_grid.cpp
[iv-editor] Moved table grid helpers to iv_editor_page_table_grid.
2026-08-17 08:33:43 +03:00
iv_editor_page_table_grid.h
[iv-editor] Moved table grid helpers to iv_editor_page_table_grid.
2026-08-17 08:33:43 +03:00
iv_editor_prepared_selection.cpp
[iv-editor] Moved owner algebra to iv_editor_prepared_selection.
2026-08-17 08:33:43 +03:00
iv_editor_prepared_selection.h
[iv-editor] Moved owner algebra to iv_editor_prepared_selection.
2026-08-17 08:33:43 +03:00
iv_editor_session.cpp
Remove venue selection and sending from the location box
2026-11-03 08:10:34 +04:00
iv_editor_session.h
[iv-editor] Added pasting of source data into just opened editor.
2026-08-17 08:33:43 +03:00
iv_editor_state.cpp
Delete dividers with Backspace in the rich editor
2026-11-03 00:45:19 +04:00
iv_editor_state.h
Delete dividers with Backspace in the rich editor
2026-11-03 00:45:19 +04:00
iv_editor_structure_menu.cpp
Fix Roman list markers growing with huge item numbers
2026-10-01 18:46:51 +04:00
iv_editor_structure_menu.h
[iv-editor] Moved table and list menus to iv_editor_structure_menu.
2026-08-17 08:33:43 +03:00
iv_editor_text_entities.cpp
Resolve upstream integration contracts
2026-08-22 12:27:18 +03:00
iv_editor_text_entities.h
Resolve upstream integration contracts
2026-08-22 12:27:18 +03:00
iv_editor_toolbar_pill.cpp
Render the wallet's top bars as one pill island
2026-10-08 22:23:57 +04:00
iv_editor_toolbar_pill.h
Restore the Ai button star blink and enlarge the pill icon
2026-07-10 14:04:29 +04:00
iv_editor_widget.cpp
Merge upstream Telegram Desktop v7.3.5
2026-11-05 10:02:07 -05:00
iv_editor_widget.h
Merge upstream tdesktop a8de5f928b (v7.3.4 + 51: Update brotli to 1.2.1)
2026-11-03 16:07:40 -05:00
iv_editor_window.cpp
Merge upstream dev through b033e513f4
2026-08-22 11:23:33 +03:00
iv_editor_window.h
Minimize a focused rich message editor window
2026-08-10 18:42:50 +04:00