282 Commits

Author	SHA1	Message	Date
Jesse Duffield	d5f617ec92	show some more errors in the gui rather than panicking	2019-03-16 12:51:48 +11:00
Jesse Duffield	6d104bfa91	show file remove error in gui rather than panic	2019-03-16 12:51:48 +11:00
Jesse Duffield	0079015102	distinguish between inline and non-inline merge conflicts	2019-03-03 15:58:01 +11:00
Jesse Duffield Duffield	8c0ea8f45f	mouse support	2019-03-02 17:49:30 +11:00
Jesse Duffield	1337f6e76a	appease golangci	2019-03-02 17:45:53 +11:00
Jesse Duffield Duffield	95d451e59a	Make it easier to run sync/async commands, switch to interactive rebase when rebasing on branches	2019-02-24 10:58:15 +11:00
Jesse Duffield	0228e25084	work towards more interactive rebase options	2019-02-19 23:36:36 +11:00
Jesse Duffield	ad93b4c863	consider whether the view has focus when rendering the contents of a view	2019-02-16 15:17:44 +11:00
Jesse Duffield	198cbee498	introduce panel contexts and more work on rebasing	2019-02-16 12:07:27 +11:00
Jesse Duffield	daca07eaca	add loading panel	2019-02-16 12:03:22 +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	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
mjarkk	50f20de8f3	Removed a lot of duplicated code	2018-12-10 08:22:52 +01:00
mjarkk	61c2778de1	Changed pushPassUname name to credentials	2018-12-10 07:51:06 +01:00
mjarkk	f14effe5f5	Worked and fixed a view comments	2018-12-09 13:04:19 +01:00
Mark Kopenga	19a6a32625	Merge branch 'master' into https-ask-for-username-password	2018-12-08 16:41:39 +01:00
mjarkk	270658fc00	Made code ready to merge to master's latest commit	2018-12-08 16:40:22 +01:00
Jesse Duffield	ff856b7630	fetching branches without checking out	2018-12-08 11:51:47 +11:00
Jesse Duffield	ca3afa2a39	standardising how list panels deal with cursor movement	2018-12-08 11:51:47 +11:00
Jesse Duffield	99a8b1ae8b	making a start on unidirectional data binding to fix these UI bugs	2018-12-08 11:51:47 +11:00
Mark Kopenga	1b6d34e76a	Merge branch 'master' into https-ask-for-username-password	2018-12-06 08:31:12 +01:00
Jesse Duffield	3b51d7cd00	clean as well as reset (I'm hoping this is a good design decision)	2018-12-05 20:06:47 +11:00
Jesse Duffield	c0f9795910	staging lines and hunks	2018-12-05 19:33:46 +11:00
Jesse Duffield	658e5a9faf	initial support for staging individual lines	2018-12-04 22:11:48 +11:00
mjarkk	af54d7f015	Fixed view not defined error with git push and pull	2018-11-02 15:07:10 +01:00
mjarkk	cb9ad5bc73	Fixed golangcibot surgestion	2018-11-02 10:06:10 +01:00
mjarkk	5470bb4121	Added username password detect to git pull	2018-11-02 09:54:54 +01:00
mjarkk	9a99748d3b	Fixed bug where username input didn't go away	2018-10-27 16:29:16 +02:00
mjarkk	ac03665df3	Handled some errors	2018-10-20 19:44:56 +02:00
mjarkk	12425f0aa7	First good success	2018-10-20 17:37:55 +02:00
mjarkk	01fa106de3	Added files to commit pannelsidjfjlisdjfilisldjfiljisldjilfjisdjilfjlsidMoved some code around	2018-10-17 21:12:33 +02:00
Kristijan Husak	4287f8ae90	Fix tests and add test scenarios for amend.	2018-10-08 22:19:42 +02:00
Kristijan Husak	190309e5c1	Check if there is any commit to amend and use 'A' instead of 'M' as shortcut.	2018-10-08 21:19:45 +02:00
Kristijan Husak	5f7ac97a39	Refresh side panels and use uppercase HEAD in all git commands that requires it.	2018-10-06 09:53:54 +02:00
Kristijan Husak	28fe3d6cf9	Use confirmation popup for amending last commit.	2018-09-25 22:11:51 +02:00
Jesse Duffield	7164f37266	Merge branch 'master' into feature/commit-amend	2018-09-25 19:05:24 +10:00
Jesse Duffield	f89bc10af1	appease golangci	2018-09-17 21:32:19 +10:00
Jesse Duffield	c00c834b35	standardise rendering of lists in panels	2018-09-17 21:02:30 +10:00
Kristijan Husak	61f0801bd3	Add ammend commit action.	2018-09-13 12:44:32 +02:00
Jesse Duffield	f8b484f638	don't use newlines at the end of panel buffers	2018-09-12 18:23:25 +10:00
Jesse Duffield	52b132fe01	better handling of cursor and origin positionings	2018-09-10 20:17:39 +10:00
Dawid Dziurla	6f7de83bce	Merge branch 'master' into feature/help ... conflicts resolved	2018-09-09 10:41:01 +02:00
Jesse Duffield	a2d40cfbf1	allow users to configure whether the commit length is shown	2018-09-05 23:02:13 +10:00
Jesse Duffield	986774e5c7	add commit count via gocui subtitle	2018-09-05 20:43:45 +10:00
Dawid Dziurla	98763e98cb	initial commit message counter	2018-09-05 11:26:54 +02:00
Dawid Dziurla	e21f739f4f	add renderGlobalOptions ... render only global options for all panels	2018-09-04 16:07:31 +02:00
Dawid Dziurla	97ad4a1643	delete options	2018-09-04 15:40:29 +02:00