Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1126 from Shini31/master | Dominik Ritter | 2019-02-26 | 1 | -34/+13 |
|\ | | | | | Use ip command for VPN segment - fix #1125 | ||||
| * | Merge remote-tracking branch 'ben/master' into HEAD | Dominik Ritter | 2019-02-03 | 1 | -10/+12 |
| |\ | |||||
| * | | Parse IPs properly | Dominik Ritter | 2019-02-03 | 1 | -67/+9 |
| | | | | | | | | | | | | | | | | | | | | | This is done if we want to show a public IP, internal IP, or a VPN. In the VPN case, what we actually want is to display an indicator that a VPN is active, instead of the VPN IP itself. We parse the IP here anyway, because we want to save some specific code there. | ||||
| * | | Match VPN interface fuzzy on Linux | Dominik Ritter | 2019-01-23 | 1 | -2/+9 |
| | | | |||||
| * | | Match VPN Interface fuzzy | Dominik Ritter | 2019-01-23 | 1 | -3/+19 |
| | | | |||||
| * | | Simplify code that checks if a VPN is running | Dominik Ritter | 2019-01-23 | 1 | -10/+5 |
| | | | |||||
| * | | Improve tests | Dominik Ritter | 2019-01-23 | 1 | -1/+1 |
| | | | |||||
| * | | Fix regular expression | Dominik Ritter | 2019-01-21 | 1 | -1/+1 |
| | | | |||||
| * | | Add tests | Dominik Ritter | 2019-01-21 | 1 | -6/+9 |
| | | | |||||
| * | | Use ip command for VPN segment - fix #1125 | Shini31 | 2018-12-30 | 1 | -10/+26 |
| | | | |||||
* | | | Merge pull request #1149 from dritter/HaoZeke-fix-RVM | Dominik Ritter | 2019-02-09 | 1 | -3/+5 |
|\ \ \ | |_|/ |/| | | Fix RVM | ||||
| * | | rvm: Use @natemccurdy review suggestions | HaoZeke | 2019-01-25 | 1 | -3/+5 |
| | | | |||||
| * | | rvm: Only show version and patchset | HaoZeke | 2019-01-25 | 1 | -1/+1 |
| | | | |||||
| * | | Revert "Huge performance improvement if you use `rvm` segment." | HaoZeke | 2019-01-25 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | This reverts commit 643555a30c9576838157e04d45632080472e1b8b. This does allow rvm to be detected even without using the depreciated gemset settings. | ||||
* | | | Merge pull request #1151 from Wuestengecko/bugfix-1150 | Dominik Ritter | 2019-02-02 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | [Bugfix] Only abbreviate $HOME at the beginning of cwd | ||||
| * | | | Only abbreviate $HOME at the beginning of cwd | Wuestengecko | 2019-02-01 | 1 | -1/+1 |
| | | | | | | | | | | | | Fixes #1150 | ||||
* | | | | Merge pull request #1147 from dritter/fix_newlines_in_zsh57 | Dominik Ritter | 2019-02-02 | 1 | -1/+2 |
|\ \ \ \ | |/ / / |/| | | | Fix newlines in ZSH 5.7 | ||||
| * | | | Fix Segment endings if followed by newline | Dominik Ritter | 2019-02-01 | 1 | -1/+1 |
| | | | | |||||
| * | | | Fix white arrow on newline | Ythildir | 2019-02-01 | 1 | -0/+1 |
| |/ / | |||||
* | | | Merge pull request #1148 from dritter/remove_nodeenv_disable_prompt | Dominik Ritter | 2019-02-01 | 1 | -3/+2 |
|\ \ \ | | | | | | | | | Remove checking for NODEENV_DISABLE_PROMPT | ||||
| * | | | Remove checking for NODEENV_DISABLE_PROMPT | Dominik Ritter | 2019-02-01 | 1 | -3/+2 |
| |/ / | | | | | | | | | | This variable is none of our buisness. | ||||
* | | | Merge pull request #966 from ytang/fix-rprompt-icons-cut-off | Dominik Ritter | 2019-02-01 | 1 | -2/+2 |
|\ \ \ | |/ / |/| | | [Bugfix] Fix icons cut off in RPROMPT segments | ||||
| * | | Merge branch 'master' into fix-rprompt-icons-cut-off | Yang Tang | 2018-10-12 | 1 | -69/+86 |
| |\ \ | |||||
| * | | | Fix icons cut off in RPROMPT segments | Yang Tang | 2018-08-22 | 1 | -2/+2 |
| | | | | |||||
* | | | | Replace call to basename with ZSH internals #1128 | Dominik Ritter | 2019-01-24 | 1 | -1/+1 |
| | | | | |||||
* | | | | Remove $VIRTUAL_ENV_DISABLE_PROMPT testing | Ymage | 2019-01-09 | 1 | -4/+1 |
| | | | | |||||
* | | | | Merge with @dritter proposal | Ymage | 2019-01-07 | 1 | -1/+6 |
| | | | | |||||
* | | | | [Bugfix] virtualenv prompt displaying | Ymage | 2019-01-03 | 1 | -1/+1 |
| |_|/ |/| | | | | | | | | Fix #1127 | ||||
* | | | Update VIRTUAL_ENV_DISABLE_PROMPT value | Josselin Auguste | 2018-11-18 | 1 | -1/+1 |
| | | | | | | | | | | | | Following prezto update | ||||
* | | | Merge pull request #1037 from dritter/fix_vpn_ip_segment | Dominik Ritter | 2018-11-16 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Fix vpn_ip segment | ||||
| * | | | Fix vpn_ip segment | Dominik Ritter | 2018-10-25 | 1 | -1/+1 |
| | |/ | |/| | |||||
* / | | Make truncate with package name work without setting shorten length | Dominik Ritter | 2018-10-25 | 1 | -1/+1 |
|/ / | |||||
* | | Removing `rbenv` from default LPROMPT list. | Ben Hilburn | 2018-09-06 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'docwhat/pr/sudo-check' into prepare_066 | Dominik Ritter | 2018-08-10 | 1 | -1/+1 |
|\ \ | |||||
| * | | Use SUDO_COMMAND to check for sudo | Christian Höltje | 2018-08-10 | 1 | -3/+3 |
| |/ | | | | | | | | | | | | | `sudo -n true` only checks that we _could_ use `sudo`, not if we are in a sudo session. closes #852 | ||||
* | | Merge branch 'fix_colors' into prepare_066 | Dominik Ritter | 2018-08-10 | 1 | -1/+1 |
|\ \ | |||||
| * | | Fix foreground colors in right prompt segments | Dominik Ritter | 2018-08-10 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'fix_colors' into prepare_066 | Dominik Ritter | 2018-08-09 | 1 | -3/+3 |
|\| | | |||||
| * | | Make use of helper function in left_end_segment | Dominik Ritter | 2018-08-09 | 1 | -1/+1 |
| | | | |||||
| * | | Fix colors for visual identifiers | Dominik Ritter | 2018-08-09 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | Make the visual identifier color use numerical color codes as well. This way colors like "purple3" work as visual identifier color. | ||||
* | | | Merge branch 'fix_colors' into prepare_066 | Dominik Ritter | 2018-08-08 | 1 | -36/+49 |
|\| | | |||||
| * | | Improve naming of variables | Dominik Ritter | 2018-08-07 | 1 | -31/+49 |
| | | | | | | | | | | | | | | | | | | As a side effect this should improve the performance slightly, as we get the fore- and background color codes as early as possible, and store the result, so that we don't have to recalculate the color code all over. | ||||
| * | | Remove duplicate variable | Dominik Ritter | 2018-08-07 | 1 | -5/+0 |
| | | | |||||
| * | | Fix bug so that the segment separator of left middle has the right color | Dominik Ritter | 2018-08-07 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | In short: the current background color was the unfiltered color and is used to print the next segment separator. If the user set a color like "purple3" that would result in a white segment separator as Terminal Emulators do not understand the color "purple3". | ||||
| * | | Make purpose clear of backgroundColor and foregroundColor functions | Dominik Ritter | 2018-08-07 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | The functions just start the colors, they do not end them. It seems too much to have a function that terminates a color. | ||||
* | | | Merge remote-tracking branch 'docwhat/pr/sudo-check' into prepare_066 | Dominik Ritter | 2018-08-06 | 1 | -2/+2 |
|\ \ \ | |||||
| * | | | Use SUDO_COMMAND to check for sudo | Christian Höltje | 2018-07-31 | 1 | -2/+2 |
| |/ / | | | | | | | | | | | | | | | | | | | `sudo -n true` only checks that we _could_ use `sudo`, not if we are in a sudo session. closes #852 | ||||
* | | | Merge branch 'add_tests' into prepare_066 | Dominik Ritter | 2018-08-06 | 1 | -25/+29 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Merge remote-tracking branch 'ben/master' into add_tests | Dominik Ritter | 2018-07-19 | 1 | -13/+24 |
| |\| | |||||
| * | | Set background color of vi_mode segment to white in insert mode | Dominik Ritter | 2018-07-19 | 1 | -1/+1 |
| | | |