Stefan Haller
16dceb813b
Show menu instead of prompt when there are conflicts in a rebase or merge
...
This solves the issue that previously you could too easily abort a rebase
accidentally by hitting escape.
2023-06-01 10:51:48 +02:00
Jesse Duffield
d772c9f1d4
Use sentence case everywhere
...
We have not been good at consistent casing so far. Now we use 'Sentence case' everywhere. EVERYWHERE.
Also Removing 'Lc' prefix from i18n field names: the 'Lc' stood for lowercase but now that everything
is in 'Sentence case' there's no need for the distinction.
I've got a couple lower case things I've kept: namely, things that show up in parentheses.
2023-05-25 23:52:19 +10:00
Jesse Duffield
fc91ef6a59
standardise helper args
2023-04-30 13:19:53 +10:00
Jesse Duffield
43251e7275
split context common from helper common
2023-04-30 13:19:53 +10:00
AzraelSec
28501fbf77
chore: add focus on local commits after interactively rebase
2023-04-15 10:42:36 +02:00
AzraelSec
a3fdf91714
feat: allow to perform a rebase with breaking before the first commit
2023-04-15 17:26:08 +10:00
Jesse Duffield
037e957282
fix PullMergeConflict integration test
2023-02-25 11:39:24 +11:00
Jesse Duffield
7410acd1aa
move merge conflicts code into controller
2022-08-07 11:16:03 +10:00
Jesse Duffield
445a625b56
rename merging context to mergeConflicts
2022-08-06 18:05:00 +10:00
Jesse Duffield
debc58b6c5
fix popup focus issue
2022-08-01 22:09:48 +10:00
Jesse Duffield
6f8063217d
rename displayString to label for menu items
2022-05-08 14:26:18 +10:00
Moritz Haase
8fb2acc224
pkg/gui: Rename IPopupHandler::Ask() to Confirm()
...
Follow the JavaScript naming scheme for user interaction (alert, prompt,
confirm) as discussed in #1832 .
2022-03-30 20:13:43 +11:00
Jesse Duffield
860d1e0145
fix copy for merge confirmation
2022-03-27 18:16:16 +11:00
Jesse Duffield
3e5d4b2c74
add menu keybindings for various things
2022-03-27 18:16:16 +11:00
Jesse Duffield
1b75ed3740
many more generics
2022-03-24 20:14:41 +11:00
Jesse Duffield
722410aded
refactor controllers
2022-03-17 19:13:40 +11:00
