Sync upstream v2026.15 into develop#9
Merged
Conversation
Signed-off-by: leo <longshuang@msn.cn>
Since `EscapeForBRE` is only used when selecting item in suggestion popup (and the searching command runs immediately after it), directly call `EscapeForBRE` to generate the searching filter Signed-off-by: leo <longshuang@msn.cn>
…states Signed-off-by: leo <longshuang@msn.cn>
Signed-off-by: leo <longshuang@msn.cn>
…it-scm#2496) Double-tapping a change in the Info tab raced against the tab switch: the view poked the TabControl directly while SelectedChanges was still clearing DiffContext to null, so the right-hand AvaloniaEdit rendered blank until a later file switch rebuilt it. Drive the switch through the ViewModel instead -- set SelectedChanges first, then ActiveTabIndex, and raise OnPropertyChanged so the existing DiffContext compensation in the setter reliably fires before the Changes tab materializes.
…ntChar` that consists of more than a single ASCII byte (sourcegit-scm#2500)
…it-scm#2502) Signed-off-by: leo <longshuang@msn.cn>
Signed-off-by: leo <longshuang@msn.cn>
- Use `Directory.Exists(_id)` instead of `IsInvalid` since we have alread makes sure it's a repository - For invalid repository node, only show `Delete` entry in context menu Signed-off-by: leo <longshuang@msn.cn>
…ourcegit-scm#2502) Signed-off-by: leo <longshuang@msn.cn>
…ndows/Linux - Add missing hotkey tooltips - Because on Windows/Linux (WSL), the hotkey `Ctrl+Shift+O` will be parsed as `Key.ImeProcessed`, change the hotkey to open local repository to `Ctrl+L` Signed-off-by: leo <longshuang@msn.cn>
- Hotkey to clone remote repository: `Ctrl+R`/`⌘+R` (R means remote) - Hotkey to open local repository: `Ctrl+L`/`⌘+L` (L means local) Signed-off-by: leo <longshuang@msn.cn>
…te window (sourcegit-scm#2506) Signed-off-by: leo <longshuang@msn.cn>
…nsions (sourcegit-scm#2467) Signed-off-by: leo <longshuang@msn.cn>
Signed-off-by: leo <longshuang@msn.cn>
Signed-off-by: leo <longshuang@msn.cn>
+ Add missing strings. + Change old instaces of lines with text `untracked` to `sin rastrear` for consistency.
Add the 30 remaining Text.* keys that were missing from el_GR relative to en_US, bringing the Greek locale to full coverage. Wording follows the existing el_GR conventions (git jargon such as checkout, rebase, commit, Patch, HEAD kept as loanwords; 'mode' kept for git file-mode codes). (cherry picked from commit 2274c41)
Signed-off-by: leo <longshuang@msn.cn>
Signed-off-by: leo <longshuang@msn.cn>
Signed-off-by: leo <longshuang@msn.cn>
…submodule and other file Signed-off-by: leo <longshuang@msn.cn>
Signed-off-by: leo <longshuang@msn.cn>
Signed-off-by: leo <longshuang@msn.cn>
Signed-off-by: leo <longshuang@msn.cn>
Signed-off-by: leo <longshuang@msn.cn>
Signed-off-by: leo <longshuang@msn.cn>
Signed-off-by: leo <longshuang@msn.cn>
Resolves VERSION (keep 2026.17-sk-dev), Launcher bracket-tab nav vs upstream isMacOS refactor, and regenerated TRANSLATION.md. Adopts upstream AvaloniaEdit submodule bump.
AvaloniaStatsTask writes to ~/Library/Application Support/AvaloniaUI, which fails in restricted/sandboxed build environments. Opt out to keep builds hermetic.
…c-2026.15 # Conflicts: # VERSION
Add a Fork customizations section to the README (marked fork-only) and an Unreleased CHANGELOG entry for the upstream sync.
Merged
skoonin
added a commit
that referenced
this pull request
Jul 24, 2026
Release **2026.17-sk** (first fork release carrying upstream v2026.15). Changes vs `develop`: bumps `VERSION` to `2026.17-sk` (drops `-dev`) and finalizes the CHANGELOG entry. No code changes — the released code is what CI validated on #9 (all 6 runtimes + format-check). CI validation on this exact commit is run via workflow_dispatch (PRs to `master` don't auto-trigger the workflows). After it's green: tag `v2026.17-sk` on the merge, push the tag (triggers `release.yml` to build all platforms and publish), then back-merge to `develop`.
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
9 participants
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.
What
Merges upstream
sourcegit-scm/sourcegitv2026.15 (41 commits) into our fork'sdevelop, keeping all fork customizations intact.Conflict resolutions
2026.17-sk-dev); upstream 2026.15 < our 2026.17-sk, no collision.OemOpenBrackets/OemCloseBrackets), adopting upstream's refactor ofOperatingSystem.IsMacOS()into the localisMacOSvar.make loc-check(not hand-merged).3451f4e0->11bf2b6a).Hotspot files (
DiffContext.cs,Repository.axaml) auto-merged cleanly; all fork features verified present (multi-file continuous diff, sidebar recent-commits graph, About-skversion regex, custom locale keys).Extra commit
build: opt out of Avalonia build telemetry— exportsAVALONIA_TELEMETRY_OPTOUT=truein the Makefile so the Avalonia stats task doesn't write to~/Library/Application Support/AvaloniaUI(fails in sandboxed/restricted build environments).Verification
make checkpasses locally (format-check + build + 15 headless tests).