summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix travis buildDominik Ritter2018-06-073-3/+4
|
* Add tests for laravel version segment to travisDominik Ritter2018-06-072-0/+70
|
* Add a Laravel version segmentDominik Ritter2018-06-074-0/+24
|
* Merge remote-tracking branch 'ytang/fix-icons-cut-off' into staging_065Dominik Ritter2018-06-077-22/+26
|\ | | | | | | | | | | | | | | Conflicts were: - test/segments/command_execution_time.spec and test/segments/go_version.spec: All conflicts come from renaming color names on next (#703) and adding a whitespace to the Visual Identifier (#854) on master.
| * Add comments about the whitespace and coloringYang Tang2018-06-011-2/+6
| |
| * Update unit tests for fixing icons cut offYang Tang2018-06-015-17/+17
| |
| * Fix icons cut off in some terminal emulatorsYang Tang2018-06-011-4/+4
| |
| * Merge pull request #811 from shirts/chore/public-ip-file-nameBen Hilburn2018-05-231-1/+1
| |\ | | | | | | Update default public ip file name
| | * Update default public ip file nameKevin Chandler2018-04-251-1/+1
| |/
* | Merge remote-tracking branch 'Maxattax97/next' into staging_065Dominik Ritter2018-06-071-18/+18
|\ \
| * | Fix Linux distribution detectionMax O'Cull2018-05-191-18/+18
| | |
* | | Merge branch 'fix_rprompt_newline' into staging_065Dominik Ritter2018-06-072-1/+20
|\ \ \
| * | | Fix RPROMPT placementDominik Ritter2018-05-262-1/+20
| |/ / | | | | | | | | | This fixes #841
* | | Merge remote-tracking branch 'sambadevi/feature/etc-option-in-dir-segment' ↵Dominik Ritter2018-06-072-1/+9
|\ \ \ | | | | | | | | | | | | into staging_065
| * | | add cog symbol to dir segment if folder is /etc*Tim Otlik2018-05-172-1/+9
| |/ /
* | | Merge remote-tracking branch 'sambadevi/feature/hide-battery-segment' into ↵Dominik Ritter2018-06-071-17/+21
|\ \ \ | | | | | | | | | | | | staging_065
| * | | add comment line above battery-threshold conditionTim Otlik2018-05-121-1/+1
| | | |
| * | | rename variable to POWERLEVEL9K_BATTERY_HIDE_ABOVE_THRESHOLDTim Otlik2018-05-091-1/+1
| | | | | | | | | | | | | | | | | | | | Variable now holds an integer, if your battery status is greater or equal to this integer the segment will be hidden
| * | | remove duplicate code in battery segmentTim Otlik2018-05-091-29/+20
| | | |
| * | | add new option "POWERLEVEL9K_BATTERY_HIDE_FULL"Tim Otlik2018-05-081-7/+20
| |/ / | | | | | | | | | Hides the battery segment if percentage hits 100%
* | | Merge remote-tracking branch 'opes/chruby_options' into staging_065Dominik Ritter2018-06-072-4/+28
|\ \ \
| * \ \ Merge branch 'master' into chruby_optionsDan2018-04-3048-153/+1349
| |\ \ \ | | | |/ | | |/|
| * | | Alphabetize chruby documentationDan2018-04-301-11/+11
| | | |
| * | | Add options for customizing `chruby` segmentDan2018-04-302-4/+28
| | | |
* | | | 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