aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1126 from Shini31/masterDominik Ritter2019-02-265-204/+611
|\ | | | | Use ip command for VPN segment - fix #1125
| * Add small changes suggested by @SyphdiasDominik Ritter2019-02-253-6/+3
| |
| * Strip all newlines from ifconfig outputDominik Ritter2019-02-221-1/+1
| |
| * Fix regexDominik Ritter2019-02-221-1/+1
| |
| * Interface States can be unsortedDominik Ritter2019-02-211-3/+7
| |
| * Avoid loopback interfaces and parse IPv4 on OSXDominik Ritter2019-02-061-1/+4
| |
| * Fix regular expression and testDominik Ritter2019-02-042-1/+5
| |
| * Merge remote-tracking branch 'ben/master' into HEADDominik Ritter2019-02-0335-166/+220
| |\
| * | Parse IPs properlyDominik Ritter2019-02-034-246/+262
| | | | | | | | | | | | | | | | | | | | | 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 LinuxDominik Ritter2019-01-232-2/+18
| | |
| * | Match VPN Interface fuzzyDominik Ritter2019-01-232-4/+49
| | |
| * | Simplify code that checks if a VPN is runningDominik Ritter2019-01-232-13/+10
| | |
| * | Improve testsDominik Ritter2019-01-232-51/+93
| | |
| * | Fix testsDominik Ritter2019-01-222-3/+3
| | |
| * | Fix regular expressionDominik Ritter2019-01-211-1/+1
| | |
| * | Add testsDominik Ritter2019-01-213-6/+273
| | |
| * | Use ip command for VPN segment - fix #1125Shini312018-12-301-10/+26
| | |
* | | Merge pull request #1149 from dritter/HaoZeke-fix-RVMDominik Ritter2019-02-091-3/+5
|\ \ \ | | | | | | | | Fix RVM
| * | | rvm: Use @natemccurdy review suggestionsHaoZeke2019-01-251-3/+5
| | | |
| * | | rvm: Only show version and patchsetHaoZeke2019-01-251-1/+1
| | | |
| * | | Revert "Huge performance improvement if you use `rvm` segment."HaoZeke2019-01-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 643555a30c9576838157e04d45632080472e1b8b. This does allow rvm to be detected even without using the depreciated gemset settings.
* | | | Merge pull request #1157 from 88maomao/fix-git-operation-not-permittedDominik Ritter2019-02-071-2/+2
|\ \ \ \ | |_|_|/ |/| | | Hide stderr from git ls-files
| * | | Hide errors from git ls-files🐈2019-02-061-2/+2
|/ / /
* | | Merge pull request #1154 from dritter/fix_font_debugging_konsoleDominik Ritter2019-02-031-36/+34
|\ \ \ | | | | | | | | Fix issues with debug/fonts script in Konsole
| * | | Merge from upstreamDominik Ritter2019-02-031-7/+6
| | | |
| * | | Mute errors when detecting fontDominik Ritter2019-02-031-5/+5
| | | |
| * | | Make variables optionalDominik Ritter2019-02-031-0/+1
| | | |
| * | | Add missing functionDominik Ritter2019-02-031-0/+6
| | | |
| * | | Fix font-debugging script for alacrittyDominik Ritter2019-02-031-4/+4
| | | |
| * | | Use Konsole/Yakuake detection from upstreamDominik Ritter2019-02-031-2/+2
| | | |
| * | | Fix parsing font for KittyDominik Ritter2019-02-031-14/+6
| | | |
| * | | Fix issues with debug/fonts script in KonsoleDominik Ritter2019-02-031-3/+3
|/ / /
* | | Merge pull request #1151 from Wuestengecko/bugfix-1150Dominik Ritter2019-02-022-1/+19
|\ \ \ | | | | | | | | [Bugfix] Only abbreviate $HOME at the beginning of cwd
| * | | Add testsDominik Ritter2019-02-021-0/+18
| | | |
| * | | Only abbreviate $HOME at the beginning of cwdWuestengecko2019-02-011-1/+1
| | | | | | | | | | | | Fixes #1150
* | | | Merge pull request #1147 from dritter/fix_newlines_in_zsh57Dominik Ritter2019-02-022-1/+44
|\ \ \ \ | |/ / / |/| | | Fix newlines in ZSH 5.7
| * | | Add tests for newline segmentDominik Ritter2019-02-011-0/+42
| | | |
| * | | Fix Segment endings if followed by newlineDominik Ritter2019-02-011-1/+1
| | | |
| * | | Fix white arrow on newlineYthildir2019-02-011-0/+1
| |/ /
* | | Merge pull request #1148 from dritter/remove_nodeenv_disable_promptDominik Ritter2019-02-013-24/+9
|\ \ \ | | | | | | | | Remove checking for NODEENV_DISABLE_PROMPT
| * | | Add documentationDominik Ritter2019-02-011-1/+7
| | | |
| * | | Remove checking for NODEENV_DISABLE_PROMPTDominik Ritter2019-02-012-23/+2
| |/ / | | | | | | | | | This variable is none of our buisness.
* | | Merge pull request #966 from ytang/fix-rprompt-icons-cut-offDominik Ritter2019-02-0129-95/+95
|\ \ \ | |/ / |/| | [Bugfix] Fix icons cut off in RPROMPT segments
| * | Remove extra %f in unit testsYang Tang2018-10-1221-74/+74
| | |
| * | Merge branch 'master' into fix-rprompt-icons-cut-offYang Tang2018-10-1260-1135/+4898
| |\ \
| * | | Update unit tests for fixing RPROMPT icons cut offYang Tang2018-08-222-2/+2
| | | |
| * | | Fix icons cut off in RPROMPT segmentsYang Tang2018-08-226-19/+19
| | | |
* | | | Merge pull request #981 from pgierz/os_release_fixDominik Ritter2019-01-241-1/+3
|\ \ \ \ | | | | | | | | | | [Bugfix] Fix for #974
| * | | | Avoid externals when parsing the os release on linuxDominik Ritter2019-01-241-1/+1
| | | | |
| * | | | Fix for #974Paul Gierz2018-09-071-1/+3
| | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-20 13:25:50 +0300