3384 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Gadfly	17cf402c78	enhance: navigate to upstream head after fetch, pull, and merge (#1180)	2025-04-14 10:42:34 +08:00
leo	245de9b458	fix: tooltip did not hide after pointer move out (#1178) ... Signed-off-by: leo <longshuang@msn.cn>	2025-04-14 10:40:24 +08:00
leo	e76328ff38	Merge branch 'master' into develop	2025-04-14 09:56:48 +08:00
leo	61a1b130f2	Merge branch 'release/v2025.13'	2025-04-14 09:55:55 +08:00
leo	69d8d963ea	version: Release 2025.13 ... Signed-off-by: leo <longshuang@msn.cn>	2025-04-14 09:55:49 +08:00
leo	48835ca043	project: upgrade AvaloniaUI to 11.2.7 ... Signed-off-by: leo <longshuang@msn.cn>	2025-04-14 09:53:59 +08:00
github-actions[bot]	241f92a290	doc: Update translation status and missing keys	2025-04-14 01:47:39 +00:00
AquariusStar	12b1204809	update russian localization (#1181)	2025-04-14 09:47:23 +08:00
leo	cd5a682194	refactor: directly use --exclude=HEAD instead of --exclude=HEA[D] ... Signed-off-by: leo <longshuang@msn.cn>	2025-04-11 15:44:02 +08:00
leo	18888de081	refactor: rewrite histories filter to support ref name that contains non-ascii characters (#1175) ... Signed-off-by: leo <longshuang@msn.cn>	2025-04-11 15:39:51 +08:00
github-actions[bot]	13af0a43ed	doc: Update translation status and missing keys	2025-04-11 04:31:25 +00:00
leo	af350c2fcd	code_review: PR #1174 ... - keeps all keys in locale files in order - add தமிழ் (Tamil) Signed-off-by: leo <longshuang@msn.cn>	2025-04-11 12:31:09 +08:00
தமிழ் நேரம்	accccb5ea3	தமிழ் (Tamil) translation file added (#1174) ... * Tamil file added 220 * 0 * Tamil file added 220 0 (cherry picked from commit 355db34db382d17e0b8f0bb6f05b8e2e2f2963d9)	2025-04-11 12:22:48 +08:00
github-actions[bot]	cfabfb7368	doc: Update translation status and missing keys	2025-04-11 02:02:56 +00:00
leo	1799de4907	code_review: PR #1173 ... - rename c-style `file_arg` to `fileArg` - add missing translations for zh_CN and zh_TW - re-design conflict view and add tooltip for `USE THEIRS` and `USE MINE` - re-order unstaged toolbar buttons Signed-off-by: leo <longshuang@msn.cn>	2025-04-11 10:02:33 +08:00
github-actions[bot]	a99ab37797	doc: Update translation status and missing keys	2025-04-11 01:33:18 +00:00
Göran W	47824dc27a	Add button for running external mergetool on ALL conflicts (#1173) ... * Make a few non-translated strings localizable (in Conflict view) * Add button and wiring to run mergetool on all conflicts * Corrected spelling and wording in related code and exception msg	2025-04-11 09:33:07 +08:00
leo	3b18ee0b37	code_style: remove unused code ... Signed-off-by: leo <longshuang@msn.cn>	2025-04-08 20:20:20 +08:00
github-actions[bot]	5d90c2ed60	doc: Update translation status and missing keys	2025-04-08 12:06:21 +00:00
leo	768b324356	ux: if there are no local changes, show different confirm message (#1143) ... Signed-off-by: leo <longshuang@msn.cn>	2025-04-08 20:06:00 +08:00
github-actions[bot]	8b5f491e34	doc: Update translation status and missing keys	2025-04-08 12:01:06 +00:00
leo	506af95963	enhance: new confirm empty commit dialog (#1143) ... Signed-off-by: leo <longshuang@msn.cn>	2025-04-08 20:00:42 +08:00
leo	898a8bc69a	ux: resize confirm commit dialog ... Signed-off-by: leo <longshuang@msn.cn>	2025-04-08 18:05:53 +08:00
leo	da38b72ee5	ux: disable commit button when commit message is empty ... Signed-off-by: leo <longshuang@msn.cn>	2025-04-08 18:03:40 +08:00
leo	7cda7211f1	refactor: statistics dialog ... - use `%aN+%aE` instead of `%aN` to get commit author - show user avatar in statistics dialog Signed-off-by: leo <longshuang@msn.cn>	2025-04-07 21:20:59 +08:00
Göran W	1555abd027	Added new ExternalMerger - Plastic SCM (#1162) ... Motivation: https://m-pixel.com/how-to-use-plastic-scms-merge-tool-with-p4v/	2025-04-07 20:22:53 +08:00
github-actions[bot]	7fedef396f	doc: Update translation status and missing keys	2025-04-07 12:19:19 +00:00
leo	2c5ee4fa99	localization: add keys deleted by sorter tools back ... Signed-off-by: leo <longshuang@msn.cn>	2025-04-07 20:19:00 +08:00
github-actions[bot]	f29402ceec	doc: Update translation status and missing keys	2025-04-07 12:05:43 +00:00
leo	f5c213060e	localization: keep all keys in order and remove duplicated keys in fr_FR (#1161) ... Signed-off-by: leo <longshuang@msn.cn>	2025-04-07 20:05:24 +08:00
leo	3275dd07d2	enhance: auto stash and re-apply local changes before squashing (#1141) ... Signed-off-by: leo <longshuang@msn.cn>	2025-04-07 16:04:10 +08:00
github-actions[bot]	67fb0b300f	doc: Update translation status and missing keys	2025-04-07 06:43:08 +00:00
leo	3049730dd5	feature: add Preferred Merge Mode in repository configure (#1156) ... Signed-off-by: leo <longshuang@msn.cn>	2025-04-07 14:42:46 +08:00
leo	ad9021e892	enhance: allow using + character in branch name (#1152) ... Signed-off-by: leo <longshuang@msn.cn>	2025-04-07 14:07:58 +08:00
leo	39f7f119dd	doc: always show current translation status in develop branch ... Signed-off-by: leo <longshuang@msn.cn>	2025-04-07 12:06:06 +08:00
leo	3431ed4bab	Merge branch 'master' into develop	2025-04-07 12:02:24 +08:00
leo	f3d99d64bf	Merge branch 'release/v2025.12'	2025-04-07 12:00:59 +08:00
leo	b65c697e5b	version: Release 2025.12 ... Signed-off-by: leo <longshuang@msn.cn>	2025-04-07 12:00:45 +08:00
github-actions[bot]	48f8b6116a	doc: Update translation status and missing keys	2025-04-07 03:48:59 +00:00
leo	fa02c65da5	code_review: PR #1153 ... - use a single filter for both unstage and staged files - show confirm dialog if staged files are displayed partially Signed-off-by: leo <longshuang@msn.cn>	2025-04-07 11:48:38 +08:00
Göran W	a37c6b29ec	In Local Changes, added filter-box in Staged area, to match Unstaged area (#1153) ... Also added minimal handling (RaiseException) if trying to commit with active filter (might commit more changes than visible, so disallow). Minor unification in unstageChanges() to make it more similar to StageChanges().	2025-04-07 10:37:58 +08:00
leo	ac7b02590b	enhance: add comma between date and time (#1150) ... Signed-off-by: leo <longshuang@msn.cn>	2025-04-07 10:23:37 +08:00
leo	8c9cf05c1d	fix: renamed files are missing in commit changes and stash changes (#1151) ... Signed-off-by: leo <longshuang@msn.cn>	2025-04-07 10:14:02 +08:00
leo	c615d04038	doc: update README.md for Japanese support ... Signed-off-by: leo <longshuang@msn.cn>	2025-04-07 09:54:48 +08:00
github-actions[bot]	17d285d9bf	doc: Update translation status and missing keys	2025-04-07 01:53:35 +00:00
Sousi Omine	ef106e6909	Add Japanese localization (#1157) ... * Initial Japanese translation Only a small part was translated * Unspecified words will be in English When new words are added, they will be displayed in English even if Japanese support is delayed. * Expanded translation scope * Expanded translation scope * Proceed with translation with a focus on overall settings * Re-translated the outdated settings screen * Add items that only exist in the latest en_US and remove items that do not exist in en_US * A lot of translation work done * A lot more translation work has been done * ja_JP.axaml has been translated into Japanese * Fixed three incomplete parts of the Japanese translation	2025-04-07 09:53:20 +08:00
github-actions[bot]	cbc7079e59	doc: Update translation status and missing keys	2025-04-07 01:45:21 +00:00
UchiTesting	904432a8f1	style(locale): Add a few translations to the French locale (#1158)	2025-04-07 09:45:02 +08:00
github-actions[bot]	7ef4cca1f5	doc: Update translation status and missing keys	2025-04-02 09:20:43 +00:00
Javier J. Martínez M.	2deb79f8ce	localization: update spanish translations (#1142) ... add literal translation for 'CopyFullPath' string	2025-04-02 17:20:33 +08:00