summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'TheDan64/master' into staging_065Dominik Ritter2018-06-072-11/+22
|\ | | | | | | | | | | | | Conflicts were: - test/segments/rust_version.spec and powerlevel9k.zsh-theme. #826 removes grep from parsing the rust version on next; #703 changes color names.
| * Merge pull request #1 from dritter/fix_rust_testsDaniel Kolsoi2018-05-132-5/+16
| |\ | | | | | | Fix test for rust segment
| | * Fix test for rust segmentDominik Ritter2018-05-132-5/+16
| |/
| * Removed 'Rust' text from test; Silenced missing rustc warningDaniel Kolsoi2018-05-102-2/+2
| |
| * Fixed prompt_rust_version to avoid grep aliasesDaniel Kolsoi2018-05-051-2/+6
| |
* | Merge remote-tracking branch 'chhschou/master' into staging_065Dominik Ritter2018-06-073-5/+6
|\ \ | | | | | | | | | | | | | | | | | | Conflicts were: - powerlevel9k.zsh-theme and test/segments/rust_version.spec: rust_version Segment changed (#641) on master and colors got names (#703) on next.
| * | #632: Indicate `Rust` or `(rust)` for rust_version segment only if icon is ↵Chris Chou2017-10-053-5/+5
| | | | | | | | | | | | unavailable
* | | Merge remote-tracking branch 'VanRoy/master' into staging_065Dominik Ritter2018-06-073-0/+16
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts were: - functions/icons.zsh: The Java Segment was added on master, but on next were added various Segments with icons in the meantime. - powerlevel9k.zsh-theme: Java Segment was added on master, Dropbox Segment was added on next.
| * | | Added a segment that shows the Java version.Julien Roy2018-03-243-0/+15
| | | |
* | | | Merge remote-tracking branch 'floor114/next' into staging_065Dominik Ritter2018-06-073-0/+118
|\ \ \ \
| * | | | Add vcs branch name truncating.Taras Shpachenko2018-04-123-0/+118
| | | | |
* | | | | Merge remote-tracking branch 'guicassolato/fix-wrapper-slowness' into ↵Dominik Ritter2018-06-071-15/+15
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | staging_065 Conflicts were: - functions/vcs.zsh: Two commits avoided wrapper behaviour. #685 in grep, #797 in git.
| * | | | | Fixes wrapper slowness in vcs segmentGuilherme Cassolato2018-04-111-15/+15
| | | | | |
* | | | | | Merge branch 'master' into staging_065Dominik Ritter2018-06-073-16/+54
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts were: - README.md: Two commits targeted the brightness table. #781 from 14. April 2018 on master and #684 from 05. December 2017 on next. - powerlevel9k.zsh-theme: Two commits targeted the rbenv segment. Both achieve the same thing: To show the Ruby version number always. #795 on next from 14. April 2018 and #610 on master from 28. September 2017. I went with #795 here as this - although being newer - is the one on master, and that should be more stable.
| * | | | | Merge pull request #795 from ryandav/rbenv-prompt-option-always-displays-#777Ben Hilburn2018-04-142-5/+10
| |\ \ \ \ \ | | | | | | | | | | | | | | Rbenv prompt option always displays #777
| | * | | | | #777 update Readme with POWERLEVEL9K_RBENV_PROMPT_ALWAYS_SHOW variable ↵Ryan Davidson2018-04-031-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | description
| | * | | | | #777 Add POWERLEVEL9K_RBENV_PROMPT_ALWAYS_SHOW variable to display ↵Ryan Davidson2018-04-031-5/+6
| | | |_|/ / | | |/| | | | | | | | | | | | | | | prompt_rbenv if rbenv_version_name is the same as rbenv_global
| * | | | | Merge pull request #773 from conradhaupt/fix_dir_navBen Hilburn2018-04-142-1/+24
| |\ \ \ \ \ | | | | | | | | | | | | | | Fixed home abbreviation not being exclusive with circular navigation
| | * \ \ \ \ Merge branch 'dritter-fix_dir_home_issue' into fix_dir_navConrad Haupt2018-03-211-0/+21
| | |\ \ \ \ \
| | | * | | | | Add test for wrong truncation if switching back to home folderDominik Ritter2018-03-211-0/+21
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This happens if a user switches from a subdirectory of $HOME back to the home folder and truncation strategy is "truncate folders from left". Then the folder is displayed as .../~ PR: #773
| | * / / / / Fixed home abbreviation not being exclusive with circular navigationConrad Haupt2018-03-121-1/+3
| | |/ / / /
| * | | | | Merge pull request #789 from docwhat/pr/status-bugBen Hilburn2018-04-141-2/+7
| |\ \ \ \ \ | | | | | | | | | | | | | | workaround for ZSH status behavior
| | * | | | | workaround for ZSH status behaviorChristian Höltje2018-03-261-2/+7
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `$pipestatus` is returning all zeros when using `[[ ]]` expressions that are false. This works around it by using `$status` (A.K.A. `$?`) when `$pipestatus` has only 1 items. Fixes #749
| * | | | | Merge pull request #781 from nikeee/masterBen Hilburn2018-04-141-8/+9
| |\ \ \ \ \ | | | | | | | | | | | | | | Fix Brightness Table in README
| | * \ \ \ \ Merge branch 'master' into masterBen Hilburn2018-04-141-0/+2
| | |\ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge pull request #799 from noraj/patch-1Ben Hilburn2018-04-141-0/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | add rvm to README
| | * | | | | | add rvmAlexandre ZANNI2018-04-121-0/+1
| | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | see those files and look for `rvm` + https://github.com/bhilburn/powerlevel9k/blob/master/CHANGELOG.md + https://github.com/bhilburn/powerlevel9k/blob/master/powerlevel9k.zsh-theme
| * | | | | | Merge pull request #800 from lifehackett/patch-1Ben Hilburn2018-04-141-0/+3
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | Fix table formatting in README
| | * | | | | Another table formatting fixlifehackett2018-04-131-0/+2
| | | | | | |
| | * | | | | Fix table formatting in READMElifehackett2018-04-131-0/+1
| |/ / / / /
| | * | | | Fix POWERLEVEL9k_BATTERY_STAGES TableNiklas Mollenhauer2018-03-221-2/+3
| | | | | |
| | * | | | Fix Brightness TableNiklas Mollenhauer2018-03-211-4/+6
| |/ / / /
* | | | | Merge pull request #791 from dritter/local_variablesBen Hilburn2018-04-143-6/+9
|\ \ \ \ \ | |_|_|/ / |/| | | | Make variables local
| * | | | Make _path variable local in anaconda segmentDominik Ritter2018-03-281-1/+1
| | | | |
| * | | | Make variables localDominik Ritter2018-03-273-5/+8
| | | | |
* | | | | Merge pull request #780 from sambadevi/nextBen Hilburn2018-03-262-14/+54
|\ \ \ \ \ | |/ / / / |/| | | | update icons for nerd-fonts 2.0.0
| * | | | add compatible to the list of fontconfigsTim Otlik2018-03-201-0/+5
| | | | |
| * | | | fixed missing icons for other fontconfigsTim Otlik2018-03-201-0/+15
| | | | |
| * | | | update icons for nerd-fonts 2.0.0Tim Otlik2018-03-202-14/+34
|/ / / /
* | | | **LARGE MERGE THAT TOUCHES LOTS OF THINGS.**Ben Hilburn2018-03-074-78/+456
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | From this point until the next tagged release, `next` will be in a state of heavy flux as we make some significant and invasive changes.
| * \ \ \ Merge branch 'dir_strategies' of ↵Ben Hilburn2018-03-074-78/+456
| |\ \ \ \ | | | | | | | | | | | | | | | | | | https://github.com/onaforeignshore/powerlevel9k into onaforeignshore-dir_strategies
| | * | | | Updated testing for folder iconsChristo Kotze2018-02-231-4/+3
| | | | | |
| | * | | | Added POWERLEVEL9K_DIR_PATH_ABSOLUTE to README.mdChristo Kotze2018-02-232-2/+3
| | | | | |
| | * | | | Updated test for POWERLEVEL9K_DIR_PATH_ABSOLUTEChristo Kotze2018-02-231-2/+2
| | | | | |
| | * | | | Added new variable POWERLEVEL9K_DIR_PATH_ABSOLUTEChristo Kotze2018-02-232-3/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If user sets POWERLEVEL9K_DIR_PATH_ABSOLUTE to true, uses absolute paths instead of home folder abbreviation, e.g. /Users/chris/... instead of ~/...
| | * | | | Fixed typo - ~= instead of !=Christo Kotze2018-02-231-1/+1
| | | | | |
| | * | | | Added test for root based folder to first&lastChristo Kotze2018-02-231-1/+2
| | | | | |
| | * | | | Updated dir.spec test for first_and_lastChristo Kotze2018-02-231-1/+1
| | | | | |
| | * | | | Added truncate_to_first_and_last strategyChristo Kotze2018-02-233-29/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Truncate middle directories from the path. How many directories will be untouched is controlled by POWERLEVEL9K_SHORTER_DIR_LENGTH.
| | * | | | Updated README dir truncation strategiesChristo Kotze2018-02-231-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added `truncate_to_last` Added `truncate_absolute` Moved `truncate_to_unique` before folder marker
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-21 07:11:30 +0300