1522 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Glenn Vriesman	670f0e37c7	Added rebase functions	2018-12-11 09:39:54 +11:00
Glenn Vriesman	822dc5dada	Moved push-pullables status to the end	2018-12-11 09:38:33 +11:00
mjarkk	e20d8366e1	Made gobot happy	2018-12-10 14:21:00 +01:00
mjarkk	76e9582739	Not always git fetch	2018-12-10 13:45:03 +01:00
mjarkk	50f20de8f3	Removed a lot of duplicated code	2018-12-10 08:22:52 +01:00
mjarkk	8e3f5e19e0	Changed some other names	2018-12-10 08:04:22 +01:00
mjarkk	61c2778de1	Changed pushPassUname name to credentials	2018-12-10 07:51:06 +01:00
mjarkk	3c17bf761a	Better name for this function	2018-12-10 07:46:26 +01:00
mjarkk	696d6dc20c	Fixed loop before error check	2018-12-10 07:43:32 +01:00
mjarkk	f14effe5f5	Worked and fixed a view comments	2018-12-09 13:04:19 +01:00
Tommy Nguyen	b95abd95ef	Dockerfile: add alias	2018-12-09 16:36:12 +11:00
Tommy Nguyen	ea6712dec8	Remove -a -installsuffix; copy to /bin/	2018-12-09 16:36:12 +11:00
Tommy Nguyen	de37a66ef3	Dockerfile improvements	2018-12-09 16:36:12 +11:00
mjarkk	efb82a58ae	Tried to fix circleci error	2018-12-08 16:54:00 +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
Jesse Duffield	ccc771d8b1	Merge pull request #342 from jesseduffield/hotfix/faster-reset-hard-head ... Faster reset --hard head and clean as well	2018-12-08 10:04:27 +11:00
mjarkk	cf5a85b80f	Intro message stays on screen now	2018-12-07 19:22:22 +01:00
mjarkk	2f7bd2896c	Fixed error when there is no state.yml	2018-12-07 15:46:49 +01:00
mjarkk	8f904ffd72	Working popup	2018-12-07 14:56:29 +01:00
mjarkk	ced81e11f0	Only show private repo popup when opening repo for first time	2018-12-06 22:05:16 +01:00
mjarkk	6d0fa8bc29	Made some small inprovements	2018-12-06 09:05:51 +01:00
mjarkk	21a808a52b	Renamed branch to branches	2018-12-06 08:39:49 +01:00
mjarkk	89c272eed5	Removed the tabs for spaces	2018-12-06 08:33:04 +01:00
Mark Kopenga	1b6d34e76a	Merge branch 'master' into https-ask-for-username-password	2018-12-06 08:31:12 +01:00
mjarkk	6711543634	Made the gobot happy again	2018-12-06 08:28:56 +01:00
mjarkk	f6e83cdbdf	Started working on the popup	2018-12-06 08:26:05 +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	66512ca253	use porcelain git rather than go-git for reset --hard HEAD because go-git takes over 5 seconds	2018-12-05 19:49:07 +11:00
Jesse Duffield	1a6a69a8f1	You can now stage changes one line at a time ... Staging Lines	2018-12-05 19:40:22 +11:00
Jesse Duffield	933874fb25	dutch and polish translations to be updated	2018-12-05 19:33:54 +11:00
Jesse Duffield	c0f9795910	staging lines and hunks	2018-12-05 19:33:46 +11:00