295 Commits

Author	SHA1	Message	Date
Anthony HAMON	e889a40caf	fix golint issue	2018-08-29 13:46:51 +02:00
Anthony HAMON	66e5dacf5e	fix git tests	2018-08-29 12:03:32 +02:00
Anthony HAMON	e3ed899b20	refactor MergeStatusFiles	2018-08-29 12:03:32 +02:00
Anthony HAMON	d6b4d4b063	add tests for MergesStatusFiles	2018-08-29 12:03:32 +02:00
Anthony HAMON	45fa257128	add test for StashSave and refactor StashSave method	2018-08-29 12:03:32 +02:00
Anthony HAMON	99840d8fc4	add test for StashDo and refactor StashDo method	2018-08-29 12:03:32 +02:00
Anthony HAMON	85012dbc8f	add tests for GetStatusFiles	2018-08-29 12:03:32 +02:00
Anthony HAMON	13f9073552	add test for GetStashEntryDiff	2018-08-29 12:03:32 +02:00
Anthony HAMON	49b507d2ff	replace make	2018-08-29 12:03:32 +02:00
Anthony HAMON	8247fd69c9	add test for GetStashEntries	2018-08-29 12:03:32 +02:00
Anthony HAMON	983d0bd586	replace make	2018-08-29 12:03:32 +02:00
Anthony HAMON	ca9ce22693	use assert in tests, rename testing method	2018-08-29 12:03:32 +02:00
Jesse Duffield	cff1dee6dc	more lenient version comparison	2018-08-29 09:37:47 +10:00
Jesse Duffield	7e1e97d050	dont panic when catting directories	2018-08-28 19:12:35 +10:00
Jesse Duffield	320ccdb22a	when panicking due to malformed gitconfig, show a more useful error	2018-08-28 18:01:53 +10:00
Jesse Duffield	da2d3f253f	better translation	2018-08-27 20:58:17 +10:00
Jesse Duffield	b4323c029f	Merge branch 'master' into feature/add-all	2018-08-27 20:57:50 +10:00
Jesse Duffield	203ad29349	use logrus entry rather than logger	2018-08-27 20:51:21 +10:00
Jesse Duffield	04735d0601	update call to update user config function	2018-08-27 20:49:47 +10:00
Jesse Duffield	bbe603ff5b	separate english translation structs	2018-08-27 20:46:06 +10:00
Jesse Duffield	23a9f41d9d	Merge branch 'feature/anonymous-reporting'	2018-08-27 20:35:55 +10:00
Jesse Duffield	f861175f83	move update quit confirmation function into updates file	2018-08-27 20:26:49 +10:00
Jesse Duffield	25c60b1854	localize update errors	2018-08-27 20:23:47 +10:00
Jesse Duffield	38557f131d	record last update check as soon as you begin checking	2018-08-27 20:16:26 +10:00
Jesse Duffield	96eef7838e	better auto update logic	2018-08-27 20:08:10 +10:00
Jesse Duffield	2bf536265a	disable updating on windows for now	2018-08-27 19:37:01 +10:00
Jesse Duffield	43f612feb1	Merge branch 'master' into feature/auto-updates	2018-08-27 19:20:07 +10:00
Jesse Duffield	a1c6adab59	Merge branch 'master' into feature/anonymous-reporting	2018-08-27 18:50:24 +10:00
Anthony HAMON	a2a9e0c478	fix format issue	2018-08-27 10:01:05 +02:00
Jesse Duffield	d3953a1440	Merge pull request #206 from antham/add-pkg-commands-test ... Add test to pkg/commands, refactor some methods	2018-08-27 17:58:02 +10:00
Dawid Dziurla	b7f6bcb3ca	add config flag	2018-08-26 17:31:28 +02:00
Jesse Duffield	540edc0c35	anonymous reporting data	2018-08-26 16:53:31 +10:00
Jesse Duffield	12261ceb05	update config docs for auto updates	2018-08-26 13:03:37 +10:00
Anthony HAMON	f6ab11e4ee	run gofmt	2018-08-26 02:20:01 +02:00
Anthony HAMON	23fe0290ad	add openFile to gui struct	2018-08-26 01:58:20 +02:00
Anthony HAMON	ed2dcd9e46	add tests	2018-08-26 01:58:20 +02:00
Anthony HAMON	75e08993ea	extract dependencies	2018-08-26 01:58:20 +02:00
Anthony HAMON	0b07cd19f7	switch GetOpenCommand scope to private	2018-08-26 01:58:20 +02:00
Anthony HAMON	38f11f1f4a	move dummy functions, rename functions	2018-08-26 01:58:19 +02:00
Anthony HAMON	f91e2b12db	add tests to pkg/commands	2018-08-26 01:58:19 +02:00
Anthony HAMON	364c1ac5e7	remove useless returned variable	2018-08-26 01:58:19 +02:00
Anthony HAMON	883fcf1083	remove useless returned variable	2018-08-26 01:58:19 +02:00
Anthony HAMON	a891bc90b7	simplify method	2018-08-26 01:58:19 +02:00
Anthony HAMON	7a74bc504b	avoid useless allocation	2018-08-26 01:58:19 +02:00
Anthony HAMON	32f4d09e89	move platform specific code to dedicated platform files	2018-08-26 01:58:19 +02:00
Anthony HAMON	a5adfaee8a	remove useless returned variable	2018-08-26 01:58:19 +02:00
Jesse Duffield	57decdd11d	check error from setViewOnBottom	2018-08-25 17:38:03 +10:00
Jesse Duffield	21f6e9ba87	auto-updates	2018-08-25 17:32:34 +10:00
Jesse Duffield	f24c95aede	Merge branch 'master' into feature/auto-updates	2018-08-25 11:02:46 +10:00
Jesse Duffield	60422912c8	add 'a' keybinding to toggle staged/unstaged for all files	2018-08-25 08:59:51 +10:00
Jesse Duffield	6c389df57d	Merge pull request #200 from remyabel/feature/esc-quits ... Esc will quit when not in popup, fixes #197	2018-08-24 09:16:56 +10:00
Dawid Dziurla	bcbeec1a56	Sirupsen -> sirupsen	2018-08-23 14:22:03 +02:00
Jesse Duffield	5628eae502	WIP	2018-08-23 18:43:16 +10:00
Jesse Duffield	2cdd439286	Merge pull request #204 from remyabel/hotfix/fix-dutch-errors ... Fix typos causing tests to fail	2018-08-23 10:19:31 +10:00
Tommy Nguyen	110ff38c0d	Remove accidentally checked in code	2018-08-22 11:34:16 -04:00
Tommy Nguyen	3e8ef0d12d	Remove space before punctuation	2018-08-22 11:27:45 -04:00
Jesse Duffield	584d6b241c	Merge pull request #198 from antham/fix-various-errors ... Fix various errors reported by goreportcard	2018-08-22 09:28:19 +10:00
Anthony HAMON	37681627ab	remove useless check	2018-08-21 20:54:48 +02:00
Anthony HAMON	810155ef2f	fix documentation and reference issues	2018-08-21 20:54:46 +02:00
Tommy Nguyen	924a9bb2c9	Fix typos causing tests to fail	2018-08-21 10:55:33 -04:00
Jesse Duffield	4d635cd1cd	Merge pull request #151 from alcohol/force-delete-branch ... add option to force delete given branch	2018-08-21 23:45:27 +10:00
Jesse Duffield	3d49ab6666	Merge pull request #202 from dawidd6/test ... Fix testPath for debian packaging	2018-08-21 23:33:25 +10:00
Tommy Nguyen	cd4063c763	s/escape/quit	2018-08-21 08:54:51 -04:00
Tommy Nguyen	646c205227	s/quit/escape, don't use special handling for views	2018-08-21 07:50:37 -04:00
Tommy Nguyen	dc911906b3	Esc will quit when not in popup, fixes #197	2018-08-21 06:36:20 -04:00
Rob Bast	182e475116	correct variable assignment	2018-08-21 12:09:13 +02:00
Rob Bast	5f6b61d28c	adjust translation(s) for forced branch deletion	2018-08-21 12:06:42 +02:00
Rob Bast	810540edfa	add return	2018-08-21 11:32:17 +02:00
Jesse Duffield	c6a8899060	Merge pull request #160 from remyabel/157_remove_bom ... #157: clean BOM, allowing CSV files to display correctly	2018-08-21 17:39:55 +10:00
Jesse Duffield	da4c12bf9e	Merge pull request #193 from antham/add-tests ... Add tests to i18n package	2018-08-21 17:34:13 +10:00
Anthony HAMON	4972a4c218	rewrite addBundles	2018-08-20 21:18:50 +02:00
Anthony HAMON	e4070ccb4f	rewrite language detection, rewrite tests	2018-08-20 21:12:42 +02:00
Dawid Dziurla	483b4d939d	fix testPath for debian packaging	2018-08-20 15:21:05 +02:00
Tommy Nguyen	45fea83771	Convert \r\n to \n; don't depend on unix2dos	2018-08-20 09:16:35 -04:00
Jesse Duffield	37029f7db3	support empty version string	2018-08-20 20:52:32 +10:00
Jesse Duffield	954dfb12e4	Merge branch 'master' into feature/auto-updates	2018-08-20 19:53:53 +10:00
Jesse Duffield	8364509d1f	Merge pull request #188 from jesseduffield/feature/force-push ... Force push confirmation panel	2018-08-20 19:52:41 +10:00
Jesse Duffield	d938a437a2	WIP auto updates	2018-08-20 19:52:20 +10:00
Anthony HAMON	3c0fb9b324	add tests to i18n package	2018-08-20 09:02:57 +02:00
Rob Bast	8e3df6b981	add option to force delete given branch	2018-08-20 08:37:16 +02:00
Tommy Nguyen	5dd049eb82	Convert test to use new library	2018-08-19 23:39:57 -04:00
Tommy Nguyen	108815c790	Add missing brace	2018-08-19 23:31:26 -04:00
remyabel	5c65066cbb	Merge branch 'master' into 157_remove_bom	2018-08-19 23:29:47 -04:00
Jesse Duffield	5fcbe4ff8a	Merge pull request #191 from jesseduffield/hotfix/174-language-not-found ... 174: Use fallback language if language not detected on startup	2018-08-20 13:23:26 +10:00
Jesse Duffield	fa8248bd70	use fallback language if language not detected on startup	2018-08-20 13:20:59 +10:00
Jesse Duffield	65c5a6014b	Merge pull request #185 from antham/add-tests ... Add test to utils package	2018-08-20 09:24:54 +10:00
Anthony HAMON	fc126a1718	remove test	2018-08-19 21:39:23 +02:00
Tommy Nguyen	e8b12a086c	Fix ineffectual assignment	2018-08-19 08:52:08 -04:00
Tommy Nguyen	766197de9d	NormalizeLinefeeds removes rather than converts Window/Mac style lf's	2018-08-19 08:48:03 -04:00
Jesse Duffield	1e44001910	Merge branch 'master' into feature/auto-updates	2018-08-19 21:36:40 +10:00
Jesse Duffield	317926c808	fix golangci lint	2018-08-19 21:34:24 +10:00
Jesse Duffield	4d2346f80a	popup force push confirmation panel if the local branch has diverged from the upstream branch	2018-08-19 21:28:13 +10:00
Tommy Nguyen	d2bdac29aa	Merge branch 'master' into 157_remove_bom	2018-08-19 07:22:48 -04:00
Tommy Nguyen	cea736e6e9	Factor out into NormalizeLinefeeds; add tests	2018-08-19 07:20:50 -04:00
Jesse Duffield	aa4d739577	fix ignore feature	2018-08-19 20:41:04 +10:00
Jesse Duffield	35884f81e9	handle filenames with spaces better	2018-08-19 20:13:29 +10:00
Jesse Duffield	c5d4024d58	compare error message rather than error itself on no-commits error	2018-08-19 18:51:42 +10:00
Anthony HAMON	f91b4067f4	add test to utils package	2018-08-19 10:37:03 +02:00
Tommy Nguyen	b46d174f70	view_helpers.go: don't ignore return value	2018-08-19 02:21:33 -04:00
Tommy Nguyen	cdc6d45fa4	view_helpers.go: replace \r with \r\n	2018-08-19 02:19:19 -04:00
Jesse Duffield	81b07daa01	Merge branch 'hotfix/167-ambiguous-name-in-diff'	2018-08-19 15:06:06 +10:00
Jesse Duffield	93266cc2a4	support forked branches when getting project root	2018-08-19 15:05:36 +10:00
Jesse Duffield	60fc24eada	Merge pull request #172 from jesseduffield/hotfix/167-ambiguous-name-in-diff ... 167: Support File names that match Branch names	2018-08-19 14:53:14 +10:00
Jesse Duffield	cd9eada0c6	add test for variety of potential git diff situations	2018-08-19 14:48:39 +10:00
Mark Kopenga	29f2bdbba3	removed logrus logger import	2018-08-18 14:03:20 +02:00
Jesse Duffield	b104dccab2	Merge pull request #163 from dawidd6/translation/pl ... Add Polish translation	2018-08-18 21:08:56 +10:00
Jesse Duffield	08666889f4	improve remove file logic	2018-08-18 20:14:44 +10:00
Jesse Duffield	13ac1d151a	WIP updater package	2018-08-18 19:54:44 +10:00
Jesse Duffield	1f756d3d0a	avoid nil pointer reference on startup	2018-08-18 19:43:58 +10:00
Jesse Duffield	f025b289f0	enforce white text color in prompt panels	2018-08-18 16:23:19 +10:00
remyabel	9a923eb300	Merge branch 'master' into 157_remove_bom	2018-08-18 02:11:13 -04:00
Jesse Duffield	29431ddc8e	create dashboard	2018-08-18 15:30:56 +10:00
Jesse Duffield	a1a828a781	support opening and editing config file	2018-08-18 14:54:05 +10:00
Jesse Duffield	6b150a4be0	bump dependencies	2018-08-18 14:20:19 +10:00
Jesse Duffield	284c534251	user configurable border colors	2018-08-18 13:53:58 +10:00
Jesse Duffield	10fdb5a609	support writing back to user config	2018-08-18 13:22:05 +10:00
Jesse Duffield	4dc6d40b5a	merge master	2018-08-18 12:08:21 +10:00
Mark Kopenga	0f145093fe	Here i a fix for the error go complain on your pull	2018-08-17 20:43:51 +02:00
Dawid Dziurla	bf5f3bb972	pl translation 3	2018-08-17 14:27:13 +02:00
Jesse Duffield	03a7e32694	support filenames that match branchnames	2018-08-17 22:25:53 +10:00
Dawid Dziurla	b0e08491ac	pl translation 2	2018-08-17 14:11:48 +02:00
Jesse Duffield	aaa8558de8	Merge pull request #159 from remyabel/158_escape_backticks ... #158: escapes backticks, which is a problem in shells like Bash	2018-08-17 21:11:20 +10:00
Jesse Duffield	dcd3bb6bbd	use platform independent command to remove a file or directory	2018-08-17 11:13:21 +10:00
Tommy Nguyen	52033b32f7	Use strings.Replace instead of regexp	2018-08-16 17:04:39 -04:00
Mark Kopenga	5c738fa493	Removed duplicates	2018-08-16 20:59:32 +02:00
Dawid Dziurla	2d80a83d27	pl translation 1	2018-08-16 18:56:16 +02:00
Nicolas Borboën	ff15d86ced	Typo path → patch	2018-08-16 14:15:55 +02:00
remyabel	64d8a55dbd	Merge branch 'master' into 157_remove_bom	2018-08-16 07:59:31 -04:00
Mark Kopenga	fcf616bd62	Fixed it	2018-08-16 13:35:04 +02:00
Tommy Nguyen	74d81ae080	[rebase] Fix errors; update dependencies ... Argument must be []byte not string Don't commit bomtest.txt	2018-08-16 07:17:47 -04:00
Tommy Nguyen	a7755ab184	reformat	2018-08-16 07:00:13 -04:00
Mark Kopenga	faf218f465	Fixed comments from jesseduffield on issue #137	2018-08-16 11:31:50 +02:00
Mark Kopenga	90746502df	Fixed comments from jesseduffield on issue #137	2018-08-16 11:31:03 +02:00
Jesse Duffield	5819e04c53	use shibukawa/configdir package to follow xdg spec config directory structure	2018-08-16 19:17:38 +10:00
Jesse Duffield	fd3ce21576	use yaml for config file rather than json	2018-08-16 18:43:46 +10:00
Tommy Nguyen	f09515867d	#157: clean BOM, allowing CSV files to display correctly	2018-08-16 01:53:53 -04:00
Mark Kopenga	88e1a815fe	Fixed comment on issue #137 from @jesseduffield	2018-08-16 07:16:32 +02:00
Tommy Nguyen	db94dde114	fix formatting	2018-08-15 23:58:44 -04:00
Tommy Nguyen	ee4660af97	#158: escapes backticks, which is a problem in shells like Bash	2018-08-15 23:55:55 -04:00
Mark Kopenga	9abbfe5a43	Fully translated pkg/gui/confirmation_panel.go	2018-08-15 15:12:55 +02:00
Mark Kopenga	9112278ab7	Merge pull request #4 from jesseduffield/master ... Update to latest master	2018-08-15 15:03:27 +02:00
Mark Kopenga	d00c46a712	Added all english translations to a file and fixed some typos	2018-08-15 14:57:20 +02:00
Jesse Duffield	29ed971558	add user configuration in json file	2018-08-15 22:06:37 +10:00
Jesse Duffield	8d99b400fd	factor out code for new popup panels	2018-08-15 21:49:38 +10:00
Jesse Duffield	7c33c02930	dont panic if unable to close confirmation prompt	2018-08-15 21:43:31 +10:00
Mark Kopenga	50b41bfccc	Translated pkg/gui/view_helpers.go	2018-08-15 11:49:43 +02:00
Mark Kopenga	295093a432	Translated pkg/gui/stash_panel.go	2018-08-15 11:12:46 +02:00
Mark Kopenga	10c53162ca	Merge pull request #3 from jesseduffield/master ... Updated to latest master	2018-08-15 10:54:43 +02:00
Mark Kopenga	7e926cf41d	Added translation for pkg/gui/ confirmation_panel.go gui.go merge_panel.go	2018-08-15 10:53:05 +02:00
Mark Kopenga	d12cc5a74e	Fully translated pkg/gui/commits_panel.go	2018-08-15 10:30:29 +02:00