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
..
touchbar
Clear a window's TouchBar when it is destroyed
2026-08-18 21:50:09 +04:00
current_geo_location_mac.h
Initial location sending on Windows.
2024-07-19 11:20:53 +02:00
current_geo_location_mac.mm
Use system reverse geocoding on macOS.
2024-07-19 11:56:34 +02:00
file_bookmark_mac.h
Fix build on macOS.
2020-10-30 18:32:18 +03:00
file_bookmark_mac.mm
Version 3.4.2: Fix build for Mac App Store.
2021-12-31 23:40:36 +03:00
file_utilities_mac.h
[ai] Fuse real launches and assert document opens
2026-07-29 13:01:53 +04:00
file_utilities_mac.mm
Keep launch warnings when Open With shows no chooser
2026-10-28 17:50:27 +04:00
global_menu_mac.h
Use single global menu on macOS.
2026-04-24 13:06:15 +07:00
global_menu_mac.mm
Added window menu items to macOS Window menu.
2026-10-21 15:26:37 +03:00
integration_mac.h
Fix build for macOS.
2022-01-06 15:41:17 +03:00
integration_mac.mm
Fix build for macOS.
2022-01-06 15:41:17 +03:00
launcher_mac.h
Use QT_DEPRECATED_WARNINGS_SINCE
2023-02-14 18:37:01 +04:00
launcher_mac.mm
Switch freetype to experimental settings
2023-02-22 16:51:13 +04:00
mac_iconv_helper.c
Use single LEGAL file with license and copyright.
2018-01-03 13:23:14 +03:00
main_window_mac.h
Fixed Qt6 work area offset moving notifications off screen on Windows.
2026-10-30 11:35:25 +04:00
main_window_mac.mm
Fixed Qt6 work area offset moving notifications off screen on Windows.
2026-10-30 11:35:25 +04:00
native_event_mac.h
Launch IV editor in a separate window.
2026-06-09 14:28:13 +04:00
native_event_mac.mm
Added keyboard shortcuts legend layer.
2026-10-19 19:15:12 +04:00
notifications_manager_mac.h
Support shared media / pins for sublists.
2025-06-04 10:00:23 +04:00
notifications_manager_mac.mm
Remove stale notifications in Saved Messages and monoforums
2026-10-29 14:45:55 +04:00
notifications_manager_mac_tokens.h
Remove stale notifications in Saved Messages and monoforums
2026-10-29 14:45:55 +04:00
notifications_manager_mac_tokens.mm
Remove stale notifications in Saved Messages and monoforums
2026-10-29 14:45:55 +04:00
notifications_manager_mac_un.h
Added experimental UserNotifications manager for macOS.
2026-07-28 09:53:53 +03:00
notifications_manager_mac_un.mm
Keep macOS notifications after modern ones are turned off
2026-10-29 14:45:55 +04:00
overlay_widget_mac.h
Fixed title buttons dragging media view overlay window on macOS.
2026-08-28 12:21:38 +03:00
overlay_widget_mac.mm
Fixed title buttons dragging media view overlay window on macOS.
2026-08-28 12:21:38 +03:00
specific_mac.h
Merge upstream tdesktop a8de5f928b (v7.3.4 + 51: Update brotli to 1.2.1)
2026-11-03 16:07:40 -05:00
specific_mac.mm
Read only local photos in Cmd+Shift+C and keep outside copies
2026-10-15 14:23:06 +04:00
specific_mac_p.h
Move Media::Clip::Reader and FileLocation to td_ui.
2020-10-30 18:32:18 +03:00
specific_mac_p.mm
Wrap the wallet engine secrets in a passcode vault
2026-10-08 22:23:54 +04:00
text_recognition_mac.h
Added dummy platform files for text recognition.
2025-12-05 20:11:53 +04:00
text_recognition_mac.mm
Bound image allocations in the media viewer
2026-10-26 23:47:53 +04:00
translate_provider_mac.h
Added platform provider of translations.
2026-03-04 08:32:04 +03:00
translate_provider_mac.mm
Fix Apple translation results delivered to a closed box
2026-10-01 18:43:05 +04:00
tray_mac.h
Fix stale macOS tray menu after toggling the icon
2026-10-01 18:48:00 +04:00
tray_mac.mm
Fix stale macOS tray menu after toggling the icon
2026-10-01 18:48:00 +04:00
wallet_protection_mac.h
Unlock the wallet vault with Touch ID on macOS
2026-10-08 22:23:56 +04:00
wallet_protection_mac.mm
Remove some new lang phrases.
2026-10-08 22:24:50 +04:00
webauthn_mac.mm
Define the non-Windows passkey wrappers in one place
2026-11-02 22:56:27 +04:00
window_title_mac.mm
Fixed alignment of group call and theme preview titles left on macOS 26.
2026-10-10 21:10:53 +03:00