summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'ben/master' into HEADDominik Ritter2019-02-0335-166/+220
|\
| * Merge pull request #1154 from dritter/fix_font_debugging_konsoleDominik Ritter2019-02-031-36/+34
| |\
| | * 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
| |\
| | * Add testsDominik Ritter2019-02-021-0/+18
| | * Only abbreviate $HOME at the beginning of cwdWuestengecko2019-02-011-1/+1
| * | Merge pull request #1147 from dritter/fix_newlines_in_zsh57Dominik Ritter2019-02-022-1/+44
| |\ \ | | |/ | |/|
| | * 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
| |\ \
| | * | Add documentationDominik Ritter2019-02-011-1/+7
| | * | Remove checking for NODEENV_DISABLE_PROMPTDominik Ritter2019-02-012-23/+2
| | |/
| * | Merge pull request #966 from ytang/fix-rprompt-icons-cut-offDominik Ritter2019-02-0129-95/+95
| |\ \ | | |/ | |/|
| | * 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
| |\ \ \
| | * | | Avoid externals when parsing the os release on linuxDominik Ritter2019-01-241-1/+1
| | * | | Fix for #974Paul Gierz2018-09-071-1/+3
| * | | | Replace call to basename with ZSH internals #1128Dominik Ritter2019-01-241-1/+1
| * | | | Add documentation about VIRTUAL_ENV_DISABLE_PROMPT #1128Dominik Ritter2019-01-241-1/+7
| * | | | Merge pull request #1128 from ymage/fix_virtualenv_promptDominik Ritter2019-01-241-3/+5
| |\ \ \ \
| | * | | | Remove $VIRTUAL_ENV_DISABLE_PROMPT testingYmage2019-01-091-4/+1
| | * | | | Merge with @dritter proposalYmage2019-01-071-1/+6
| | * | | | [Bugfix] virtualenv prompt displayingYmage2019-01-031-1/+1
| |/ / / /
* | | | | Parse IPs properlyDominik Ritter2019-02-034-246/+262
* | | | | 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 #1079 from josselinauguste/masterBen Hilburn2018-11-191-1/+1
|\ \ \ \
| * | | | Update VIRTUAL_ENV_DISABLE_PROMPT valueJosselin Auguste2018-11-181-1/+1
* | | | | Merge pull request #1080 from macserv/port/vcs-segment-untracked-file-checkDominik Ritter2018-11-182-27/+46
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Port git submodule test from `next`.Matthew Judy2018-11-181-0/+29
| * | | | Port #1071 to `master` (fatal errors emitted by untracked file check in vcs.zsh)Matthew Judy2018-11-181-27/+17
|/ / / /
* | | | Merge pull request #1065 from dritter/protect_localeDominik Ritter2018-11-172-12/+20
|\ \ \ \
| * | | | Ensure that LC_CTYPE IS NOT overwritten by P9KDominik Ritter2018-11-151-12/+18