Commit graph

4309 commits

Author SHA1 Message Date
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
Mark Kopenga 8418fa17a5 Fully translated pkg/gui/commit_message_panel.go 2018-08-15 09:15:31 +02:00
Jesse Duffield 0687c07f50 more robust reading of reflog to get branch name 2018-08-15 09:45:24 +10:00
Jesse Duffield 922f4ed5a4 try rev-parse of git symbolic-ref returns nothing 2018-08-15 09:42:02 +10: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
Jesse Duffield 4d0702fba5 Merge branch 'master' of https://github.com/mjarkk/lazygit 2018-08-14 22:12:11 +10:00
Jesse Duffield 5cbacb0c67 make local i18n package confirm to project structure 2018-08-14 22:12:07 +10:00
Mark Kopenga 0568b32f0b Added more translations 2018-08-14 13:31:23 +02:00
Mark Kopenga 6e518142b4 added some commands 2018-08-14 12:56:11 +02:00
Mark Kopenga 0c39347224 Added auto detection for the system language 2018-08-14 12:52:26 +02:00
Mark Kopenga dd7e93ac8d Added all the missing translations from dutch.go 2018-08-14 11:35:39 +02:00
Mark Kopenga 5ad97add08 Added the translation to some words again 2018-08-14 11:27:46 +02:00
Jesse Duffield 6a3f8eefa5 send version number through app 2018-08-14 19:22:38 +10:00
Mark Kopenga dfafb98871 tried to update to latest master 2018-08-14 11:05:26 +02:00
Jesse Duffield 574b34930c support files with spaces in name 2018-08-14 18:48:08 +10:00
Jesse Duffield c476dfc1cb fix open command 2018-08-14 18:35:47 +10:00
Jesse Duffield bde6182c94 better git squash logic 2018-08-14 18:30:06 +10:00
Jesse Duffield efb049cd24 better error handling for stashing files 2018-08-14 18:29:25 +10:00
Jesse Duffield 5f30f07ea5 Merge branch 'master' into feature/quoted-messages 2018-08-14 18:10:44 +10:00
Jesse Duffield b32173b0c7 output to development.log in append mode 2018-08-14 18:02:27 +10:00
Jesse Duffield 1c750fdb40 fix reflog command 2018-08-14 18:02:14 +10:00
Jesse Duffield 9ecd7908aa refactor commands to depend less on the shell 2018-08-14 17:47:33 +10:00
Andrei Miulescu 842ceec9b0
Platform should only be present once 2018-08-14 12:24:32 +10:00
Jesse Duffield 95c7df4c61 use platform-specific message quoting 2018-08-14 11:16:52 +10:00
Jesse Duffield 047892962a centralise subprocess code to gui.go 2018-08-14 08:33:40 +10:00
Jesse Duffield d4f4b46a1f check both local and global config for gpgsign 2018-08-14 08:33:27 +10:00
Jesse Duffield f549ad0f37 use git command with message in subprocess if using gpgsign 2018-08-14 07:27:59 +10:00
Jesse Duffield ebfed34145 add PR #135 keybindings to this branch 2018-08-13 23:46:08 +10:00
Jesse Duffield 59e5545f38 discard log output when not in debug mode 2018-08-13 23:35:01 +10:00
Jesse Duffield fb0004481b correct cursor before returning item position 2018-08-13 21:42:56 +10:00
Jesse Duffield 12de0345e4 minor cleanup 2018-08-13 21:35:54 +10:00
Jesse Duffield 9e725ae24e got this bad boy compiling again 2018-08-13 21:16:21 +10:00
Jesse Duffield 97cff65612 progress on refactor 2018-08-13 20:26:02 +10:00
Jesse Duffield e6beb5d50b no more go-git for committing (reflecting the change in master) 2018-08-12 23:29:58 +10:00
Andrei Miulescu e8eb78617c
Mid refactor change some more stuff 2018-08-12 21:04:47 +10:00
Andrei Miulescu e65ddd7b6f
Move some commands around 2018-08-12 20:22:20 +10:00
Jesse Duffield c01bc09442 WIP refactor 2018-08-12 19:50:55 +10:00
Andrei Miulescu dcd461d29f
Restrucure project in a way where it is more modular 2018-08-12 19:31:27 +10:00