Jesse Duffield
c101993405
post-merge cleanup
2019-02-11 22:47:14 +11:00
Jesse Duffield
6430ab6ac9
Merge branch 'master' into feature/rebasing
2019-02-11 22:46:27 +11:00
Jesse Duffield
cfe3605e6b
use go-errors package to display stacktrace of errors that cause panics
2019-02-11 22:39:17 +11:00
Jesse Duffield
75ab8ec4d9
catch rebase errors and show in error panels
2019-02-11 21:29:47 +11:00
Jesse Duffield
77faf85cfc
post-merge cleanup
2019-02-11 21:07:12 +11:00
Jesse Duffield
3d343e9b57
Merge branch 'master' into feature/rebasing
2019-02-11 21:02:53 +11:00
Jesse Duffield
3a607061a2
Only reset origin in main view when handling the selection of a new file
2019-01-18 09:32:15 +11:00
Jesse Duffield
695b092c41
Directly send wrap argument rather than the view
2019-01-17 10:29:52 +11:00
Jesse Duffield
a38d1a3b68
Explicitly refer confirmation panel view
...
as @jesseduffield pointed in #358 , need to refer
confirmation panel view explicitly in case something
else has focus
Co-Authored-By: KOREAN139 <korean139@gmail.com>
2019-01-17 10:29:52 +11:00
KOREAN139
2dc5e6d503
Fix recent repo view size issue
...
getMessageHeight() calculates height under assumption that given view's
wrap option (view.Wrap) is true, and createMenu() does not set wrap
option as true. this causes gocui set improper view's height when lines
in view needs to be wrapped.
add *gocui.View as parameter in getMessageHeight(), and calculates
view's height depend on its wrap option.
resolve issue #354
2019-01-17 10:29:52 +11:00
Dawid Dziurla
b6f8ebc0ca
delete KeyReadable field from Binding struct
...
also rewrite GetKey function
2019-01-17 10:11:17 +11:00
KimMachineGune
3e24069722
pkg: Fix typo
2019-01-16 18:06:11 +11:00
Jesse Duffield
c722ea5afc
log in config directory rather than wherever you opened lazygit
2019-01-16 08:54:12 +11:00
KimMachineGune
7ff022f1e7
pkg/updates: Refactoring
2019-01-14 21:52:03 +11:00
Mark Kopenga
1db8801771
Update dutch.go
2018-12-20 09:17:10 +11:00
Mark Kopenga
666ea3a4a0
Fixed suggestion from glvr182
2018-12-20 09:17:10 +11:00
mjarkk
47d50989c4
Added dutch translations
2018-12-20 09:17:10 +11:00
Dawid Dziurla
e4f70278dd
i18n: pl translation
2018-12-20 09:13:41 +11:00
Jesse Duffield
0afffd03ca
remove comment
2018-12-19 21:46:48 +11:00
Jesse Duffield
6c5e409ffa
send direct error message
2018-12-19 20:12:35 +11:00
mjarkk
800b40ecc4
Translated credentials error with git push/pull/fetch
2018-12-19 10:06:58 +01:00
Jesse Duffield
7835fce708
fix tests
2018-12-18 22:40:36 +11:00
Jesse Duffield
160af3bb99
fix typo
2018-12-18 22:29:07 +11:00
Jesse Duffield
328b57e2cf
no longer checking for 'exit status 128' because we're directly returning stderr
2018-12-18 22:27:50 +11:00
Jesse Duffield
20a94447d7
explicitly return newlines to our live command stdin
2018-12-18 22:23:17 +11:00
Jesse Duffield
865c7c2332
minor refactor of credentials panel into its own file
2018-12-18 22:19:32 +11:00
Jesse Duffield
276ac3a92e
decrease frequency of refreshing files because it's causing index lock errors
2018-12-18 21:28:09 +11:00
Jesse Duffield
c35255b7a9
set stderr ourselves so that we only read the error output if there is any
2018-12-18 21:25:49 +11:00
mjarkk
f5f726e9c4
A try to hide the password from the error output
2018-12-17 08:58:09 +01:00
Jesse Duffield
4886b8350e
always hide rather than delete the credentials view, and don't log on error in case there is a user password in the error
2018-12-16 17:28:04 +11:00
mjarkk
af26b5f3e0
Tried to fix circleci
2018-12-14 13:45:43 +01:00
mjarkk
70cd6700e7
Tried to fix circleci
2018-12-14 13:43:13 +01:00
mjarkk
d11f8989d9
Merge branch 'https-ask-for-username-password' of https://github.com/mjarkk/lazygit into https-ask-for-username-password
2018-12-14 13:40:40 +01:00
mjarkk
0fca27d022
Tried to fix circleci
2018-12-14 13:40:29 +01:00
Mark Kopenga
255319e597
Merge branch 'master' into https-ask-for-username-password
2018-12-14 11:13:29 +01:00
mjarkk
5d038dfd33
Removed the wired error handling
2018-12-12 22:11:31 +01:00
mjarkk
0577d3b97f
Removed the username / password savety check
...
This check is not realy needed because the change that it will show up a second time is so low that this is more work to check than the change it actualy might happen
2018-12-12 21:08:53 +01:00
Jesse Duffield
a26c15dafa
some fixes for issues around the credentials panel
2018-12-12 22:34:20 +11:00
Jesse Duffield
c71bcc64ed
move fetch keybinding to files view to make way for branch-specific fetched
2018-12-12 22:33:42 +11:00
Jesse Duffield
a365615490
only use subprocess for merging, not rebasing
2018-12-11 22:16:48 +11:00
Jesse Duffield
9489a94473
Make merge panel its own panel
2018-12-11 22:02:12 +11:00
Jesse Duffield
e0ff46fe53
more work on rebasing including visual indicators
2018-12-11 09:39:54 +11:00
Glenn Vriesman
cce6f405a5
Making ci happier
2018-12-11 09:39:54 +11:00
Glenn Vriesman
e39d2ed44b
Added check to invoke continue/refresh
2018-12-11 09:39:54 +11:00
Glenn Vriesman
7a7e885773
Added rebase support commands
2018-12-11 09:39:54 +11:00
Glenn Vriesman
34fd18a395
Error handling
2018-12-11 09:39:54 +11:00
Glenn Vriesman
a1ee11e54e
Added error check to satisfy ci
2018-12-11 09:39:54 +11:00
Glenn Vriesman
7b850c56c4
Added some translations
2018-12-11 09:39:54 +11:00
Glenn Vriesman
88c01c1ded
Added rebase keybinding
2018-12-11 09:39:54 +11:00
Glenn Vriesman
27994f7de8
Added rebase handler
2018-12-11 09:39:54 +11:00
