Sam Burville
|
268d4080b3
|
Fix text formatting
|
2021-09-30 01:26:05 +10:00 |
|
Jesse Duffield
|
2c72990838
|
Update pkg/theme/theme.go
|
2021-09-30 01:26:05 +10:00 |
|
Jesse Duffield
|
046edd8120
|
Update pkg/theme/theme.go
|
2021-09-30 01:26:05 +10:00 |
|
samburville
|
c4552aad28
|
Use simpler short variable declaration
Co-authored-by: Jesse Duffield <jessedduffield@gmail.com>
|
2021-09-30 01:26:05 +10:00 |
|
Sam Burville
|
5c57c973d6
|
Tidy of spacing on GetDefaultConfig in user_config
|
2021-09-30 01:26:05 +10:00 |
|
Sam Burville
|
c5f7ad5adb
|
Make cherry pick commit color customisable
Two new settings in the config, which allow the cherry picked
foreground and background to be custom colors.
Issue #856
|
2021-09-30 01:26:05 +10:00 |
|
Ryooooooga
|
663c036ca5
|
Save patch files in TempDir
|
2021-09-29 22:05:58 +10:00 |
|
Jesse Duffield
|
ab0117c416
|
fix some encodings
|
2021-09-27 19:58:24 +10:00 |
|
Jesse Duffield
|
652c97d239
|
honour options menu press
|
2021-09-27 19:41:38 +10:00 |
|
Mark Kopenga
|
5193353020
|
Merge pull request #1478 from black-desk/remove-unused-strings
Remove unused strings
|
2021-09-23 22:23:52 +02:00 |
|
Ryooooooga
|
add3e8783e
|
Fix crash on remove tracked files #1480
|
2021-09-21 18:51:18 +09:00 |
|
black_desk
|
5eff56b557
|
Remove unused strings
|
2021-09-19 19:05:11 +08:00 |
|
black_desk
|
66d0fd2133
|
Format code to pass lint
|
2021-09-16 21:38:43 +08: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 |
|
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 |
|
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 |
|
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 |
|
Ryooooooga
|
0af0e66586
|
Fix panic in merge conflict
|
2021-08-21 18:34:30 +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 |
|
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 |
|
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 |
|
black_desk
|
66d735acb5
|
Update pkg/commands/files.go
Co-authored-by: Mark Kopenga <mkopenga@gmail.com>
|
2021-08-13 16:41:23 +08:00 |
|
black_desk
|
d51b065f2a
|
fix empty patch panel when spaces in filename
|
2021-08-13 14:02:11 +08:00 |
|
mjarkk
|
e58376f9f7
|
add tests for TemplateFuncMapAddColors
|
2021-08-09 21:09:52 +02:00 |
|
Elwardi
|
e8e4fa5957
|
Add color functions to templates funcMaps
|
2021-08-09 11:52:00 +01:00 |
|