71 Commits

Author	SHA1	Message	Date
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
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	37029f7db3	support empty version string	2018-08-20 20:52:32 +10: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	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	c5d4024d58	compare error message rather than error itself on no-commits error	2018-08-19 18:51:42 +10: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	08666889f4	improve remove file logic	2018-08-18 20:14:44 +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
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
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
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
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	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
Mark Kopenga	8418fa17a5	Fully translated pkg/gui/commit_message_panel.go	2018-08-15 09:15:31 +02:00
Mark Kopenga	3dba246029	Added translations for files_panel.go and fixed some typos	2018-08-14 22:29:17 +02:00
Mark Kopenga	be3f5846e4	Added more translations	2018-08-14 21:06:50 +02:00
Mark Kopenga	38a1a00cf1	Fixed comment from myself on issue: 137	2018-08-14 16:38:25 +02:00
Mark Kopenga	9c97b75aad	Merge remote-tracking branch 'origin/master'	2018-08-14 16:14:11 +02:00
Mark Kopenga	883f436b0f	can't go any further because of an error	2018-08-14 16:12:21 +02:00
Jesse Duffield	d923796cff	Merge branch 'master' of https://github.com/mjarkk/lazygit	2018-08-14 23:48:18 +10:00
Jesse Duffield	ba2b6fbf1f	pull errors out of package scope and store sentinel errors on the gui struct	2018-08-14 23:47:14 +10:00
Mark Kopenga	73a1682540	fixed package naming and added tr object to file_panel.go	2018-08-14 15:26:25 +02:00
Mark Kopenga	8e22d569a0	Merge pull request #2 from jesseduffield/master ... Updated to latest master	2018-08-14 15:10:59 +02:00