1035 Commits

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