aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'host_user' of https://github.com/onaforeignshore/powerlevel9k ↵Ben Hilburn2017-05-252-4/+4
|\ | | | | | | into onaforeignshore-host_user
| * updated to fix copy/pasteChristo Kotze2017-05-231-2/+2
| |
| * updated render check logicChristo Kotze2017-05-231-2/+2
| |
* | Merge branch 'host_user' of https://github.com/onaforeignshore/powerlevel9k ↵Ben Hilburn2017-05-233-0/+114
|\| | | | | | | into onaforeignshore-host_user
| * Revised User segment in README.mdChristo Kotze2017-04-271-0/+6
| |
| * Removed POWERLEVEL9K_ALWAYS_SHOW_CONTEXTChristo Kotze2017-04-271-2/+2
| |
| * host and user segmentsChristo Kotze2017-04-203-1/+109
| |
* | Merge branch 'next' of github.com:bhilburn/powerlevel9k into nextBen Hilburn2017-05-231-7/+10
|\ \
| * \ Merge pull request #531 from shibumi/nextBen Hilburn2017-05-231-2/+2
| |\ \ | | | | | | | | swapped colors for virtualization detection
| | * | swapped colors for virtualization detection, black on yellow was pain for ↵Christian Rebischke2017-05-211-2/+2
| | | | | | | | | | | | | | | | the eyes
| * | | Merge pull request #526 from docwhat/pr/nvm-currentBen Hilburn2017-05-231-5/+8
| |\ \ \ | | | | | | | | | | nvm: improve default detection
| | * | | nvm: improve default detectionChristian Höltje2017-05-131-5/+8
| | |/ / | | | | | | | | | | | | This is also (marginally) faster than before.
* | | | Merge branch 'master' into nextBen Hilburn2017-05-231-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Merge branch 'moxon6-master'Ben Hilburn2017-05-231-1/+1
| |\ \ \
| | * | | Make Anaconda environment status match Virtualenv formatMartin Moxon2017-05-171-1/+1
| |/ / /
* | | | Updating the README to add a note about `teardown` feature.Ben Hilburn2017-05-231-0/+15
| | | |
* | | | Fixing typo in #525 to teardown `RPROMPT`Ben Hilburn2017-05-231-1/+1
| | | |
* | | | Merge branch 'pr/teardown' of https://github.com/docwhat/powerlevel9k into ↵Ben Hilburn2017-05-231-0/+7
|\ \ \ \ | | | | | | | | | | | | | | | docwhat-pr/teardown
| * | | | teardown: reset PROMPT and RPROMPTChristian Höltje2017-05-131-0/+2
| | | | |
| * | | | add function to disable powerlevel9kChristian Höltje2017-05-131-0/+5
| | |/ / | |/| | | | | | | | | | Sometimes you have to disable your prompt. :-(
* | | | Incorporating @dritter's feedback from #524.Ben Hilburn2017-05-233-8/+9
| | | |
* | | | Merge branch 'pr/newline' of https://github.com/docwhat/powerlevel9k into ↵Ben Hilburn2017-05-233-4/+34
|\ \ \ \ | | | | | | | | | | | | | | | docwhat-pr/newline
| * | | | newline: support PROMPT_ON_NEWLINEChristian Höltje2017-05-132-6/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The newline segment will now show ├─ when using `POWERLEVEL9K_PROMPT_ON_NEWLINE` Note: This can be overridden via `POWERLEVEL9K_MULTILINE_FIRST_PROMPT_PREFIX`
| * | | | newline: can't work with right sideChristian Höltje2017-05-132-6/+5
| | | | |
| * | | | newline: add new segmentChristian Höltje2017-05-132-0/+23
| |/ / /
* | | | Merge pull request #515 from docwhat/pr/pipe-statusBen Hilburn2017-05-232-2/+24
|\ \ \ \ | |/ / / |/| | | status: add option for support pipes
| * | | pipestatus: default to true (on)Christian Höltje2017-05-132-2/+2
| | | |
| * | | status: add option for support pipesChristian Höltje2017-05-132-2/+24
|/ / / | | | | | | | | | | | | | | | | | | Added new option (POWERLEVEL9K_STATUS_SHOW_PIPESTATUS) that shows the status for all piped commands, not just the right-most. Closes #514
* | | Merge branch 'master' into nextBen Hilburn2017-05-101-1/+1
|\| |
| * | Merge pull request #519 from docwhat/pr/readme-typoBen Hilburn2017-05-101-1/+1
| |\ \ | | | | | | | | readme: typo fix
| | * | readme: typoChristian Höltje2017-05-041-1/+1
| |/ /
* | | Merge pull request #521 from guixxx/develBen Hilburn2017-05-103-5/+13
|\ \ \ | | | | | | | | Icons for Windows/Cygwin + Refixes 32-bit support
| * | | Icons for Windows/Cygwin + Refixes 32-bit supportguixxx2017-05-073-5/+13
| |/ /
* | | Merge branch 'master' into nextBen Hilburn2017-05-031-1/+1
|\| |
| * | Merge pull request #513 from belak/belak/prompt-crBen Hilburn2017-05-031-1/+1
| |\ \ | | | | | | | | Make sure prompt_cr is set
| | * | Make sure prompt_cr is setKaleb Elwert2017-05-031-1/+1
| |/ / | | | | | | | | | Fixes #511
* | | Updates to README and CHANGELOG for changes from #498.Ben Hilburn2017-05-022-15/+23
| | |
* | | Merge branch 'battery' of https://github.com/onaforeignshore/powerlevel9k ↵Ben Hilburn2017-05-022-6/+67
|/ / | | | | | | into onaforeignshore-battery
* | Merge pull request #502 from shibumi/detect-virt-debuggingBen Hilburn2017-04-241-4/+3
|\ \ | | | | | | [detect-virt] quickfix for unnecessary information in prompt
| * | [detect-virt] quickfix for unnecessary information in promptChristian Rebischke2017-04-231-4/+3
|/ /
* | Updating CHANGELOG for v0.6.3.Ben Hilburn2017-04-211-0/+8
| |
* | Merge branch 'master' into nextBen Hilburn2017-04-211-1/+1
|\ \
| * \ Merge pull request #494 from belak/better-realpathBen Hilburn2017-04-201-2/+2
| |\ \ | | | | | | | | Use method built in to zsh to read symlinks
| | * | Use method built in to zsh to read symlinksKaleb Elwert2017-04-191-2/+2
| |/ /
* | | Merge pull request #496 from belak/options-odditiesBen Hilburn2017-04-201-6/+10
|\ \ \ | | | | | | | | Fix some oddities with prompt options
| * | | Stop setting options in prompt setup which are thrown awayKaleb Elwert2017-04-201-8/+6
| | | |
| * | | Add prompt_opts to prompt setup functionKaleb Elwert2017-04-201-0/+6
|/ / /
* | | Merge branch 'master' into nextBen Hilburn2017-04-190-0/+0
|\| |
| * | Revert "Merge branch 'fix-pw3nage-exploit' of ↵Ben Hilburn2017-04-191-5/+5
| | | | | | | | | | | | | | | | | | | | | https://github.com/belak/powerlevel9k into belak-fix-pw3nage-exploit" This reverts commit ae259ff5940420389c6f7175d6f5a844362b56ae, reversing changes made to 01a5c6a3a10ff1fea9782607a431ac07652546dc.
| * | Merge branch 'fix-pw3nage-exploit' of https://github.com/belak/powerlevel9k ↵Ben Hilburn2017-04-191-5/+5
| |\ \ | | | | | | | | | | | | into belak-fix-pw3nage-exploit