update submodules and small fixes to build without errors - #261
Open
azhang wants to merge 71 commits into
Open
Conversation
Make PIP show on all desktop/fullscreen apps
…mprovements * commit 'fb5afb361c2b365d8f1fd2cf72b2873f04a0e0a1': Show a half-visible fourth row of reply markup buttons, if there are more than three rows. Refactor constants in reply markup layout Make PIP show on all desktop/fullscreen apps
* design-improvements: no message no message no message no message no message no message no message no message no message Show a half-visible fourth row of reply markup buttons, if there are more than three rows. Refactor constants in reply markup layout Make PIP show on all desktop/fullscreen apps no message # Conflicts: # Telegram-Mac.xcworkspace/xcuserdata/mikhailfilimonov.xcuserdatad/UserInterfaceState.xcuserstate # Telegram-Mac.xcworkspace/xcuserdata/mikhailfilimonov.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist # Telegram-Mac/Info.plist # TelegramShare/Info.plist
Implement scroll for InstantView using space/shift space key combinations
* 'master' of https://github.com/overtake/TelegramSwift: Implement scroll for InstantView using space/shift space key combinations # Conflicts: # Telegram-Mac/en.lproj/Localizable.strings
3.9.2 release
# Conflicts: # TGUIKit/TGUIKit/MajorNavigationController.swift # TGUIKit/TGUIKit/Window.swift # Telegram-Mac.xcworkspace/xcuserdata/mikhailfilimonov.xcuserdatad/UserInterfaceState.xcuserstate # Telegram-Mac/ApplicationContext.swift # Telegram-Mac/ChatController.swift # Telegram-Mac/CoreExtension.swift # Telegram-Mac/GridMessageItem.swift # Telegram-Mac/Info.plist # Telegram-Mac/ReplyModel.swift # Telegram-Mac/TGModernGrowingTextView.m # Telegram-Mac/en.lproj/Localizable.strings # TelegramShare/Info.plist
# Conflicts: # Telegram-Mac/Info.plist # Telegram.xcodeproj/project.pbxproj # TelegramShare/Info.plist
# Conflicts: # Telegram-Mac/GalleryModernControls.swift # Telegram-Mac/Info.plist # Telegram.xcodeproj/project.pbxproj # TelegramShare/Info.plist
|
|
overtake
force-pushed
the
master
branch
3 times, most recently
from
September 22, 2025 14:14
9aa8690 to
579cebb
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
basicDomainso I commented it out.Manual changes necessary to make it fully buildable:
update Sparkle submodule to use overtake's commit, or use
masterbranch and apply this change:NOTE:
CFBundleVersionneeds to be updated to the actual bundle version and thebasicDomainneeds to be fixed.