github-mirrors/sourcegit
1
0
Fork 0
mirror of https://fastgit.cc/github.com/sourcegit-scm/sourcegit synced 2026-04-21 21:30:37 +08:00
Code Issues Packages Projects Releases Wiki Activity
4,874 Commits 3 Branches 160 Tags
4516b0020cf7719051915969e73ef8ec747e7558
Commit Graph

4874 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
leo
4516b0020c enhance: handle binary file in built-in merge tool 
Signed-off-by: leo <longshuang@msn.cn>
 2026-01-27 17:51:22 +08:00
leo
52da0168fd ux: new style for SplitButton 
Signed-off-by: leo <longshuang@msn.cn>
 2026-01-27 17:30:02 +08:00
leo
008e4c07bd code_review: PR #2070 
- `Commands.DiffConflictStage` and `Commands.QueryConflictContent` are never used
- Remove unnecessary attributes of `Views.MergeConflictEditor`
- New line-background render for conflict editor

Signed-off-by: leo <longshuang@msn.cn>
 2026-01-27 17:07:29 +08:00
github-actions[bot]
a376545157 doc: Update translation status and sort locale files 2026-01-27 05:34:28 +00:00
leo
ea9517eef9 code_review: PR #2070 
- Remove unused code
- Add translations for Chinese (Simplified & Traditional)
- UI/UX changes
- Fix sync-scroll function sometimes does not work
- Re-arrange context menu items for local change

Signed-off-by: leo <longshuang@msn.cn>
 2026-01-27 13:34:06 +08:00
github-actions[bot]
d25faca618 doc: Update translation status and sort locale files 2026-01-27 02:24:23 +00:00
Iacopo Sbalchiero
e5a5fad432 feature: built-in merge conflict solver (#2070) 
* feat: first implementation of merge tool
* feat: three way merge test
* feat: moved to two way merge solver
* refactor: moved files
* feat: color themes in merge conflict panel
* feat: updated logic
* feat: better scroll
* fix: localization
* feat: code cleanup
* feat: scroll sync
* fix: arrows work
* fix: scroll with wheel
* fix: arrow and scrollbar handlers
* feat: added popup buttons
* feat: moving and clicable flying buttons
* fix: moving buttons
* feat: undo button
* fix: separator line
* fix: scroll sync works with keyboard and scrollbar
* feat: accept both
* refactor: removed "accept all" buttons
* feat: better navigation
* feat: added right click entry and shortcut
* fix: scroll sync works with keyboard and scrollbar (again)
* fix: removed unnecessary directive
 2026-01-27 10:24:13 +08:00
leo
bdff65aa8f enhance: supports to clone into a local folder with spaces (#2069) 
Signed-off-by: leo <longshuang@msn.cn>
 2026-01-27 10:04:49 +08:00
leo
4716124b9e feature: Linux AppImages support portable data dir (#2062) 
Signed-off-by: leo <longshuang@msn.cn>
 2026-01-26 18:03:09 +08:00
leo
d6288719ad ux: add a check mark to indicate which side is HEAD in Compare window 
Signed-off-by: leo <longshuang@msn.cn>
 2026-01-26 16:10:14 +08:00
github-actions[bot]
2271adcb2f doc: Update translation status and sort locale files 2026-01-26 07:10:40 +00:00
leo
fba8f2375e localization: update Brazilian Portuguese translations 
`StashAndReapply` has been removed because typo on keys

Signed-off-by: leo <longshuang@msn.cn>
 2026-01-26 15:10:20 +08:00
leo
3be4e93403 Merge branch 'master' into develop 2026-01-26 10:34:37 +08:00
leo
080c446ce0 Merge branch 'release/v2026.02' v2026.02 2026-01-26 10:33:45 +08:00
leo
15763ddde0 version: Release 2026.02 
Signed-off-by: leo <longshuang@msn.cn>
 2026-01-26 10:33:36 +08:00
github-actions[bot]
357352c4cd doc: Update translation status and sort locale files 2026-01-26 02:30:10 +00:00
Ramon Melo
29cb03524d localization: update Brazilian Portuguese translate (#2067) 2026-01-26 10:29:57 +08:00
Ramon Melo
924cd08ffd utils: Translation Utility Script (#1831) 
* feature: Translation helper script

A small python scritp that helps to translate between EN to a target language. It loads the target translation file and compares with the EN base file, showing which keys are missing and asking to translate.

* feature: Added  code comments to translation utility script
* feature: Insert new keys in alphabetical order when translating
* feature: README for the translate_helper.py
* feature: Move translate helper script to root folder
* feature: Added traslation utility script documentation to README file
* feature: removed old docs for translation script
 2026-01-26 10:29:31 +08:00
leo
08c796cdc1 doc: update doc about third-party dependencies 
Signed-off-by: leo <longshuang@msn.cn>
 2026-01-23 17:09:16 +08:00
leo
41c60176a1 project: upgrade AvaloniaEdit and TextMateSharp 
- Upgrade `AvaloniaEdit` to `11.4.0-rc1`
- Upgrade `TextMateSharp` to `2.0.2`

Signed-off-by: leo <longshuang@msn.cn>
 2026-01-23 17:05:40 +08:00
leo
38a389405b ux: remove Reset to Parent Revision context menu entry for selected file in FILES page (#2060) 
Since the file in `Parent Revision` may not be modified, and user can not notice this (also can not see the
differences between current and prev revision) in `FILES` page, the `Reset to Parent Revision` should not
be available here.

Signed-off-by: leo <longshuang@msn.cn>
 2026-01-23 12:59:10 +08:00
leo
b29e96bfb8 ux: remove MaxHeight of commit info panel in submodule diff view (#2057) 
Signed-off-by: leo <longshuang@msn.cn>
 2026-01-23 11:01:07 +08:00
leo
2cbd63a4a2 feature: supports to copy subjects of selected multi-commits 
Signed-off-by: leo <longshuang@msn.cn>
 2026-01-23 10:37:39 +08:00
leo
00c237f9c6 ux: the left change list in RevisionCompare uses the same width with it in CommitChanges view (#2055) 
Signed-off-by: leo <longshuang@msn.cn>
 2026-01-22 14:19:34 +08:00
leo
f55bed21c7 ux: new layout for Blame window 
Signed-off-by: leo <longshuang@msn.cn>
 2026-01-21 17:11:28 +08:00
github-actions[bot]
6f3b9b036a doc: Update translation status and sort locale files 2026-01-21 04:01:28 +00:00
leo
4d14c79a19 feature: allows to toggle -w option (ignore whitespace changes) while blaming a file (#1838) 
Signed-off-by: leo <longshuang@msn.cn>
 2026-01-21 12:01:07 +08:00
leo
0bf22f5f76 enhance: better keyword detection of commit subject 
Signed-off-by: leo <longshuang@msn.cn>
 2026-01-21 11:08:59 +08:00
leo
f8c1a18e29 ux: remove MaxWidth limitation of change list in RevisionCompare view (#2055) 
Signed-off-by: leo <longshuang@msn.cn>
 2026-01-21 10:27:14 +08:00
github-actions[bot]
53f89b284e doc: Update translation status and sort locale files 2026-01-20 03:15:46 +00:00
leo
792c0b640f ux: add a RESOLVE button in InProgress banner (#2053) 
Signed-off-by: leo <longshuang@msn.cn>
 2026-01-20 11:15:28 +08:00
leo
79f6eed1ca feature: supports git repo with reftable format 
Signed-off-by: leo <longshuang@msn.cn>
 2026-01-19 15:48:35 +08:00
github-actions[bot]
958097e5f4 doc: Update translation status and sort locale files 2026-01-19 02:28:52 +00:00
AquariusStar
b476935cad localization: update Russian translate (#2052) 
* localization: update Russian translate
* Update src/Resources/Locales/ru_RU.axaml

Co-authored-by: Mingun <Alexander_Sergey@mail.ru>

---------

Co-authored-by: Mingun <Alexander_Sergey@mail.ru>
 2026-01-19 10:28:41 +08:00
leo
02a02929e7 ux: refine icons 
Signed-off-by: leo <longshuang@msn.cn>
 2026-01-17 15:54:05 +08:00
leo
d2b8295ecc ux: show the git options in tooltip and use easy-to-understand descriptions for labels 
Signed-off-by: leo <longshuang@msn.cn>
 2026-01-15 16:41:27 +08:00
leo
12efd855b1 ux: use monospace font for inline code in commit message 
Signed-off-by: leo <longshuang@msn.cn>
 2026-01-15 15:48:51 +08:00
leo
a035e62793 ux: default avatar for action@github.com 
Signed-off-by: leo <longshuang@msn.cn>
 2026-01-15 14:43:21 +08:00
leo
ea1159cf20 code_style: rename TryAutoUpdateSubmodules to AutoUpdateSubmodulesAsync 
Signed-off-by: leo <longshuang@msn.cn>
 2026-01-14 16:16:40 +08:00
leo
5b333bc502 ux: min width for confirm dialog 
Signed-off-by: leo <longshuang@msn.cn>
 2026-01-14 14:39:14 +08:00
github-actions[bot]
f187d49878 doc: Update translation status and sort locale files 2026-01-14 06:30:54 +00:00
leo
b789267d6f ux: use YES/NO instead of OK/CANCEL to ask confirm about auto-updating submodules (#2045) 
Signed-off-by: leo <longshuang@msn.cn>
 2026-01-14 14:27:40 +08:00
github-actions[bot]
afafac822c doc: Update translation status and sort locale files 2026-01-14 03:59:21 +00:00
leo
3c9a7920a3 feature: add a repository configuration - Ask before auto-updating submodules (default false) (#2045) 
Signed-off-by: leo <longshuang@msn.cn>
 2026-01-14 11:58:44 +08:00
leo
f72684b4a4 project: upgrade AvaloniaUI to 11.3.11 
Signed-off-by: leo <longshuang@msn.cn>
 2026-01-14 10:32:02 +08:00
leo
bd34111081 doc: update README.md for commandline usage 
Signed-off-by: leo <longshuang@msn.cn>
 2026-01-13 21:13:44 +08:00
leo
7db1442090 feature: use <SOURCEGIT> --blame <FILE> to launch SourceGit as Blame viewer (#2047) 
Signed-off-by: leo <longshuang@msn.cn>
 2026-01-13 20:58:44 +08:00
github-actions[bot]
a546bec89d doc: Update translation status and sort locale files 2026-01-13 07:41:11 +00:00
leo
3ee3c4e021 refactor: --recursive will always be enabled while initializing or updating submodules 
Signed-off-by: leo <longshuang@msn.cn>
 2026-01-13 15:40:53 +08:00
github-actions[bot]
36702b9f97 doc: Update translation status and sort locale files 2026-01-13 04:05:22 +00:00