summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into nextBen Hilburn2017-10-183-2/+10
|\
| * Merge pull request #651 from claycephas/more-documentationBen Hilburn2017-10-182-0/+4
| |\ | | | | | | Add documentation for VCS hooks config
| | * Add documentation for VCS hooks configClay Anderson2017-10-171-0/+3
| | |
| | * Add *.swp to ignoreClay Anderson2017-10-171-0/+1
| | |
| * | Merge pull request #647 from sbutler2901/masterBen Hilburn2017-10-181-1/+5
| |\ \ | | | | | | | | OSX bug fix for prompt_public_ip
| | * | Bug fix for prompt_public_ip. The OSX date command does not have the -r ↵sbutler29012017-10-121-1/+5
| | |/ | | | | | | | | | option for getting the last modification time of a file. The stat command is being used instead
| * | Merge pull request #643 from terencode/patch-1Ben Hilburn2017-10-181-1/+1
| |\ \ | | |/ | |/| Fix incomplete vpn segment name
| | * Fix incomplete vpn segment nameTérence Clastres2017-10-071-1/+1
| |/ | | | | The segment function is called *prompt_vpn_ip()* thus the segment needs to be called "vpn_ip".
* | Merge branch 'master' into nextBen Hilburn2017-10-071-3/+3
|\|
| * Fixing `vcs.spec` tests after adding space.Ben Hilburn2017-10-071-3/+3
| |
* | Adding `SIG` to signal name, removing `-` sign.Ben Hilburn2017-10-071-1/+1
| |
* | Merge branch 'master' into nextBen Hilburn2017-10-072-8/+8
|\|
| * Adding a space after VCS_BRANCH_ICON by defaultBen Hilburn2017-10-071-3/+3
| |
| * Merge pull request #640 from simonvpe/masterBen Hilburn2017-10-071-1/+1
| |\ | | | | | | Corrected awesome-fontconfig lock icon
| | * Corrected awesome-fontconfig lock iconSimon Pettersson2017-10-051-1/+1
| | |
| * | Merge pull request #636 from ZeGentzy/masterBen Hilburn2017-10-071-4/+4
| |\ \ | | |/ | |/| Fixes issue #619
| | * These probably have similar bugsHal Gentz2017-09-291-3/+3
| | | | | | | | | | | | Signed-off-by: Hal Gentz <zegentzy@protonmail.com>
| | * Fixes issue #619Hal Gentz2017-09-291-1/+1
| |/ | | | | | | Signed-off-by: Hal Gentz <zegentzy@protonmail.com>
* | Merge pull request #638 from TimothyEarley/dropbox-integrationBen Hilburn2017-10-073-0/+25
|\ \ | | | | | | Added Dropbox segment
| * | Updating Dropbox icon for non-awesome fontsBen Hilburn2017-10-071-1/+4
| | |
| * | Don't show when dropbox is not runningTimothy Earley2017-10-021-2/+2
| | |
| * | Added dropbox segmentTimothy Earley2017-10-013-0/+22
|/ /
* | Merge branch 'master' into nextBen Hilburn2017-09-292-25/+32
|\|
| * Merge pull request #616 from trashbat/patch-2Ben Hilburn2017-09-291-1/+1
| |\ | | | | | | Changed "less than" to "fewer than".
| | * Changed "less than" to "fewer than".trashbat2017-09-051-1/+1
| | |
| * | Merge pull request #611 from Typositoire/fix/prompt_kubecontextlocal1Ben Hilburn2017-09-291-1/+1
| |\ \ | | |/ | |/| Fix prompt_kubecontext:local:1: not valid in this context: Version:
| | * Fix prompt_kubecontext:local:1: not valid in this context: Version:Yann David2017-08-311-1/+1
| |/
| * Merge pull request #608 from tippl/fix_load_segmentBen Hilburn2017-08-281-21/+28
| |\ | | | | | | Fix average selection in load segment.
| | * Fix average selection in load segment.Richard Tippl2017-08-271-21/+28
| |/ | | | | | | | | | | | | Removed duplicate code selecting which load average to use. Fixed load average selection being in OSX/BSD part of if, making it not work on non OSX/BSD systems. Optimized actually getting the load average.
| * README: Quick typo fix.Ben Hilburn2017-08-271-1/+1
| |
| * README: Quick fix to MD formattingBen Hilburn2017-08-261-1/+1
| |
* | Merge pull request #610 from sjoeboo/rbenv_alwaysBen Hilburn2017-09-292-6/+10
|\ \ | | | | | | Add ability to always show rbenv prompt
| * | Final cleanup for new POWERLEVEL9K_RBENV_ALWAYS flagBen Hilburn2017-09-291-7/+3
| | |
| * | Cleaning up README language about new `rbenv` feature.Ben Hilburn2017-09-291-2/+2
| | |
| * | add ability to force rbenv being shownMatt Nicholson2017-09-062-4/+12
| | |
* | | Slight tweaks to the awesome-mapped-fontconfig error message.Ben Hilburn2017-08-271-1/+4
| | |
* | | Merge branch 'awesome-font-mapping' of ↵Ben Hilburn2017-08-271-0/+71
|\ \ \ | |_|/ |/| | | | | https://github.com/pfrybar/powerlevel9k into pfrybar-awesome-font-mapping
| * | similar to PR #472, fixing for awesome font mappingsPaul Frybarger2017-08-131-0/+71
| | |
* | | Updating CHANGELOG for v0.6.4Ben Hilburn2017-08-261-6/+14
| | |
* | | Merge branch 'master' into nextBen Hilburn2017-08-261-1/+1
|\ \ \
| * \ \ Merge pull request #602 from varundey/patch-1Ben Hilburn2017-08-261-1/+1
| |\ \ \ | | | | | | | | | | README: Updated braces for hyperlink
| | * | | Updated braces for hyperlinkVarun Dey2017-08-141-1/+1
| |/ / /
* | | | Merge pull request #605 from tadeoos/nextBen Hilburn2017-08-262-7/+29
|\ \ \ \ | |_|_|/ |/| | | Add average choice to load extension
| * | | Add average choice to load extensionTadek Teleżyński2017-08-172-7/+29
|/ / / | | | | | | | | | | | | | | | | | | This commit adds a functionality to choose if one wants to see 1, 5 or 15 minutes average. Resolves issue #604
* | | Merge pull request #596 from eumiro/truncate_to_uniqueBen Hilburn2017-08-123-0/+43
|\ \ \ | | | | | | | | Add TRUNCATE_TO_UNIQUE shortening dir strategy
| * | | Adding reference for `truncate_to_unique` code.Ben Hilburn2017-08-121-1/+1
| | | |
| * | | README: Slight change to new truncation strategy docBen Hilburn2017-08-121-1/+1
| | | |
| * | | add TRUNCATE_TO_UNIQUE shortening dir strategyMiroslav Šedivý2017-08-113-0/+43
| | |/ | |/| | | | | | | This creates the shortest unique path elements that can be unambiguously expanded to the original path.
* | | Merge branch 'master' into nextBen Hilburn2017-08-124-12/+32
|\ \ \ | | |/ | |/|
| * | Merge pull request #594 from belak/fix-prompt-spBen Hilburn2017-08-121-2/+2
| |\ \ | | |/ | |/| Add back the `prompt_sp` option for zsh >= 5.4.1
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-22 20:11:07 +0300