2825 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
black_desk	5eff56b557	Remove unused strings	2021-09-19 19:05:11 +08:00
Mark Kopenga	60c87b3e70	Merge pull request #1479 from black-desk/format-code ... Format code to pass lint	2021-09-19 11:40:49 +02:00
black_desk	66d0fd2133	Format code to pass lint	2021-09-16 21:38:43 +08:00
Mark Kopenga	f44ae68e99	Merge pull request #1463 from Ryooooooga/feature/fix-delete-branch	2021-09-04 20:43:48 +02:00
Ryooooooga	57f7051590	Fix deletion of unmerged branches in languages other than English	2021-09-04 21:01:38 +09:00
Mark Kopenga	0543d43f10	Merge pull request #1459 from btwise/master ... fix chinese translate	2021-09-02 09:27:46 +02:00
Mark Kopenga	ab8f2b7cc4	Merge pull request #1461 from mjarkk/remove-ununsed-gomod-replace ... Remove unused dep replacement in go.mod	2021-09-02 09:19:34 +02:00
mjarkk	16dbb6f76e	remove unused dep replacement in go.mod	2021-09-02 09:13:18 +02:00
Mark Kopenga	51383f24bf	Merge pull request #1458 from codesoap/master ... Fix misspells	2021-09-02 09:09:24 +02:00
btwise	151486dcfb	fix chinese translate	2021-09-02 12:16:53 +08:00
codesoap	c1d2aa61f3	Fix misspells	2021-09-01 22:51:24 +02:00
Dwarven YANG	63072af5bc	allow user to configure the gui language	2021-08-30 09:12:29 +10:00
Jesse Duffield	44d08edfb0	Address feedback	2021-08-25 22:23:55 +10:00
Jesse Duffield	f08fdb2873	Minor refactor	2021-08-25 22:23:55 +10:00
Ryooooooga	df4eb70ba2	Fix translations	2021-08-25 22:23:55 +10:00
Ryooooooga	6ca42ff720	Fix pick all hunks	2021-08-25 22:23:55 +10:00
Ryooooooga	a533f8e1a5	simplify merge panel logic	2021-08-25 22:23:55 +10:00
Ryooooooga	cf8ded0b79	add mergeConflict#hasAncestor	2021-08-25 22:23:55 +10:00
Ryooooooga	73548fa15f	Fix conflict resolution	2021-08-25 22:23:55 +10:00
Ryooooooga	a0e7604f61	Support git config merge.conflictStyle diff3	2021-08-25 22:23:55 +10:00
Daniel Bast	aedeba4fe3	Limit to security updates	2021-08-25 21:43:58 +10:00
Daniel Bast	7033a4bd58	Add dependabot config for dependency updates	2021-08-25 21:43:58 +10:00
Ryooooooga	c3d7de1c18	Change not to use cat command	2021-08-25 21:32:48 +10:00
Liberatys	711bd5a670	Lint	2021-08-25 20:13:50 +10:00
Liberatys	6b68f4f25d	Update as per review and add tests	2021-08-25 20:13:50 +10:00
Liberatys	89ee0a1dee	Move field names to translation	2021-08-25 20:13:50 +10:00
Liberatys	2dc6f5f079	Implement state filtering for commit files	2021-08-25 20:13:50 +10:00
Mark Kopenga	bdea3b7dcf	Merge pull request #1448 from Ryooooooga/feature/fix-open-files-in-windows ... Fix open command in Windows #1403	2021-08-23 15:37:07 +02:00
Ryooooooga	51f05ce08b	Fix open command in Windows	2021-08-23 21:21:34 +09:00
Mark Kopenga	487ad196a7	Merge pull request #1413 from Ryooooooga/feature/edit-line ... Make os.editCommand customizable using template	2021-08-23 10:15:38 +02:00
Ryoga	44140adb92	Update docs/Config.md ... Co-authored-by: Jesse Duffield <jessedduffield@gmail.com>	2021-08-23 08:33:05 +09:00
Mark Kopenga	508af269fb	Merge pull request #1446 from Ryooooooga/feature/fix-panic-in-merge-conflict ... Fix panic during merge conflict #1375	2021-08-21 18:07:21 +02:00
Ryooooooga	0af0e66586	Fix panic in merge conflict	2021-08-21 18:34:30 +09:00
Ryooooooga	821a59f21d	apply suggestion for the document of editCommandTemplate	2021-08-21 01:01:34 +09:00
Ryooooooga	5ea3dc7579	add documentation of editCommandTemplate	2021-08-20 22:39:08 +09:00
Mark Kopenga	2eeff1257b	Merge pull request #1432 from black-desk/moved-submodule ... fix moved submodule	2021-08-17 10:10:22 +02:00
Mark Kopenga	c878f34ff1	Merge pull request #1438 from Ryooooooga/feature/rename-files-with-modification ... Fix staged renamed file with unstaged in file pane #1408	2021-08-16 17:29:08 +02:00
Mark Kopenga	f8db3592e3	Merge pull request #1440 from Ryooooooga/feature/quote-git-C-path ... Fix stash submodule #1436	2021-08-16 16:43:12 +02:00
Ryooooooga	d073932cec	Fix stash submodule #1436	2021-08-16 23:36:16 +09:00
Ryooooooga	a2f7fcd730	Remove unused constant	2021-08-16 23:21:46 +09:00
Ryooooooga	f96674b24b	Fix error when filename contains ->	2021-08-16 23:15:37 +09:00
Ryooooooga	a553f7fb77	Fix staged renamed file with unstaged changes displays incorrectly in Files view #1408	2021-08-16 20:05:59 +09:00
Mark Kopenga	6c415d1341	Merge pull request #1434 from Ryooooooga/feature/fix-quote-in-filename ... the patch panel would crash if the filename contained an odd number of double quotes	2021-08-16 09:52:06 +02:00
Mark Kopenga	617e8a05ee	Merge pull request #1437 from Ryooooooga/feature/fix-submodule-update ... Fix submodule command escaping #1436	2021-08-16 09:48:50 +02:00
Ryooooooga	b21ac990ea	fix submodule command escaping #1436	2021-08-16 12:34:52 +09:00
Ryooooooga	0740409f43	fix test	2021-08-13 22:15:06 +09:00
Ryooooooga	37700908cc	fix checkout file command	2021-08-13 21:49:40 +09:00
Ryooooooga	488c43aaa2	fix crash when double quotes in filename #1433	2021-08-13 21:39:38 +09:00
black_desk	bb4fe2653b	fix moved submodule	2021-08-13 17:03:37 +08:00
Mark Kopenga	a2ee52142c	Merge pull request #1433 from black-desk/fix-space-in-filename ... fix empty patch panel when spaces in filename	2021-08-13 10:47:40 +02:00