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 |
|
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 |
|
Mark Kopenga
|
a3a14e9ff4
|
Merge pull request #1423 from FoamScience/feature/colorsInMenuFromCommand
Support match colors in `labelFormat` entry in menuFromCommand prompts
|
2021-08-09 21:13:32 +02: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 |
|
Elwardi
|
b5d8849c06
|
Support match colors in labelFormat entry in menuFromCommand prompts
|
2021-08-07 16:06:36 +01:00 |
|
Mark Kopenga
|
5d1a9639b6
|
Merge pull request #1416 from FoamScience/feature_menuOptions
|
2021-08-07 15:24:42 +02:00 |
|
mjarkk
|
ea136e4e77
|
Improve code quality
- Make CommandMenuEntry private
- create candidates only once we really need it
- Use only 1 buffer
- Clearify CommandMenuEntry creation fields
|
2021-08-06 21:50:58 +02:00 |
|
Elwardi
|
dcd3b7c058
|
Show only labels in menuFromCommand prompts
|
2021-08-06 18:38:26 +01:00 |
|
Mark Kopenga
|
fd8cb6e6d7
|
Merge pull request #1419 from mrgarelli/1418_bug_tests_ForceSetColorLevel
1418 Fixing test failure due to ColorLevel in test renderers
|
2021-08-06 14:30:26 +02:00 |
|
Elwardi
|
906ec30cac
|
Minor changes to menuFromCommand prompts
|
2021-08-06 10:53:32 +01:00 |
|
Matthew Garelli
|
46c146a8c1
|
fixed test failing due to ForceSetColorLevel in pkg/gui/style/style_test.go
|
2021-08-06 02:18:04 -07:00 |
|
Elwardi
|
a8ec044f0e
|
Make menuFromCommand format menu items and their description
|
2021-08-05 15:45:18 +01:00 |
|