3104 Commits

Author	SHA1	Message	Date
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