Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'ben/master' into add_tests | Dominik Ritter | 2018-07-19 | 1 | -13/+24 |
|\ | |||||
| * | Merge pull request #900 from AlexaraWu/patch/pyenv | Ben Hilburn | 2018-07-16 | 1 | -11/+16 |
| |\ | | | | | | | Fix `pyenv` segment | ||||
| | * | Improve conditions in `rbenv` & `pyenv` | Alexara Wu | 2018-07-14 | 1 | -2/+2 |
| | | | |||||
| | * | Improve `rbenv` as well | Alexara Wu | 2018-07-14 | 1 | -17/+12 |
| | | | |||||
| | * | Improve command check | Alexara Wu | 2018-07-14 | 1 | -2/+2 |
| | | | |||||
| | * | Fix `pyenv` segment | Alexara Wu | 2018-07-11 | 1 | -6/+16 |
| | | | |||||
| * | | Merge pull request #905 from ↵ | Ben Hilburn | 2018-07-13 | 1 | -1/+1 |
| |\ \ | | | | | | | | | | | | | | | | | robobenklein/robobenklein/defined-variable-performance-hotfix [performance] Defined function 2-20 times speedup | ||||
| | * | | Replace [[-v with `defined` | Ben Klein | 2018-07-11 | 1 | -1/+1 |
| | |/ | | | | | | | | | | For zsh 5.1 compatibility. | ||||
| * / | FIx status segment | Dominik Ritter | 2018-07-12 | 1 | -1/+7 |
| |/ | |||||
* | | Set background color of vi_mode segment to white in insert mode | Dominik Ritter | 2018-07-19 | 1 | -1/+1 |
| | | |||||
* | | Change swap segment to take an optional root prefix for testability | Dominik Ritter | 2018-07-18 | 1 | -2/+3 |
| | | |||||
* | | Change ram segment to take an optional root prefix for testability | Dominik Ritter | 2018-07-18 | 1 | -2/+3 |
| | | |||||
* | | Change load segment to accept an optional root prefix for testability | Dominik Ritter | 2018-07-18 | 1 | -1/+2 |
| | | |||||
* | | Change ip segment so that the tests can be executed on OSX as well | Dominik Ritter | 2018-07-18 | 1 | -4/+6 |
| | | | | | | | | Change regular expressions to a more compatible format. | ||||
* | | Simplify detect_virt segment | Dominik Ritter | 2018-07-18 | 1 | -8/+4 |
| | | |||||
* | | Add visual identifier to custom segments | Dominik Ritter | 2018-07-18 | 1 | -2/+4 |
| | | |||||
* | | Add tests for battery segment | Dominik Ritter | 2018-07-16 | 1 | -5/+6 |
|/ | | | | | | Additionally - Add a fourth parameter to prompt_battery for better testability. This parameter is the root prefix, so we can use our own test batteries. | ||||
* | Fix kubernetes segment | Dominik Ritter | 2018-07-09 | 1 | -1/+1 |
| | |||||
* | Merge branch 'master' into next | Ben Hilburn | 2018-07-09 | 1 | -1/+1 |
|\ | |||||
| * | kubecontext: fix context, namespace comparison | Kevin McBride | 2018-07-02 | 1 | -1/+1 |
| | | |||||
* | | Fix java_version segment | Dominik Ritter | 2018-06-20 | 1 | -1/+6 |
| | | |||||
* | | Merge remote-tracking branch 'softmoth/clean-right-margin' into staging_065 | Dominik Ritter | 2018-06-20 | 1 | -1/+10 |
|\ \ | |||||
| * | | Hide one-space indent at right margin | Tim Smith | 2018-06-15 | 1 | -1/+10 |
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | ZSH displays the right prompt indented one space from the right margin. This can be tweaked with ZLE_RPROMPT_INDENT=0, but that makes display problems very likely and I don't recommend it. But all is not lost. The %E prompt format does continue the current background color through that last indent space. So it can *look* like our prompt goes right up to the margin, if: 1) We remove the trailing space from the last segment, and 2) We add %E before clearing the background color | ||||
* | | Mute errors when asking for java version | Dominik Ritter | 2018-06-17 | 1 | -1/+1 |
| | | |||||
* | | Fix `rbenv` segment after merge | Dominik Ritter | 2018-06-09 | 1 | -1/+2 |
| | | |||||
* | | Fix travis build | Dominik Ritter | 2018-06-07 | 1 | -1/+2 |
| | | |||||
* | | Add a Laravel version segment | Dominik Ritter | 2018-06-07 | 1 | -0/+12 |
| | | |||||
* | | Merge remote-tracking branch 'ytang/fix-icons-cut-off' into staging_065 | Dominik Ritter | 2018-06-07 | 1 | -4/+8 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | 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 coloring | Yang Tang | 2018-06-01 | 1 | -2/+6 |
| | | | |||||
| * | | Fix icons cut off in some terminal emulators | Yang Tang | 2018-06-01 | 1 | -4/+4 |
| |/ | |||||
* | | Merge branch 'fix_rprompt_newline' into staging_065 | Dominik Ritter | 2018-06-07 | 1 | -1/+1 |
|\ \ | |||||
| * | | Fix RPROMPT placement | Dominik Ritter | 2018-05-26 | 1 | -1/+1 |
| | | | | | | | | | | | | This fixes #841 | ||||
* | | | Merge remote-tracking branch 'sambadevi/feature/etc-option-in-dir-segment' ↵ | Dominik Ritter | 2018-06-07 | 1 | -1/+4 |
|\ \ \ | | | | | | | | | | | | | into staging_065 | ||||
| * | | | add cog symbol to dir segment if folder is /etc* | Tim Otlik | 2018-05-17 | 1 | -1/+4 |
| |/ / | |||||
* | | | Merge remote-tracking branch 'sambadevi/feature/hide-battery-segment' into ↵ | Dominik Ritter | 2018-06-07 | 1 | -17/+21 |
|\ \ \ | | | | | | | | | | | | | staging_065 | ||||
| * | | | add comment line above battery-threshold condition | Tim Otlik | 2018-05-12 | 1 | -1/+1 |
| | | | | |||||
| * | | | rename variable to POWERLEVEL9K_BATTERY_HIDE_ABOVE_THRESHOLD | Tim Otlik | 2018-05-09 | 1 | -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 segment | Tim Otlik | 2018-05-09 | 1 | -29/+20 |
| | | | | |||||
| * | | | add new option "POWERLEVEL9K_BATTERY_HIDE_FULL" | Tim Otlik | 2018-05-08 | 1 | -7/+20 |
| |/ / | | | | | | | | | | Hides the battery segment if percentage hits 100% | ||||
* | | | Merge remote-tracking branch 'opes/chruby_options' into staging_065 | Dominik Ritter | 2018-06-07 | 1 | -4/+17 |
|\ \ \ | |||||
| * \ \ | Merge branch 'master' into chruby_options | Dan | 2018-04-30 | 1 | -112/+320 |
| |\ \ \ | | | |/ | | |/| | |||||
| * | | | Add options for customizing `chruby` segment | Dan | 2018-04-30 | 1 | -4/+17 |
| | | | | |||||
* | | | | Merge remote-tracking branch 'TheDan64/master' into staging_065 | Dominik Ritter | 2018-06-07 | 1 | -5/+7 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
| * | | | | Fix test for rust segment | Dominik Ritter | 2018-05-13 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Removed 'Rust' text from test; Silenced missing rustc warning | Daniel Kolsoi | 2018-05-10 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Fixed prompt_rust_version to avoid grep aliases | Daniel Kolsoi | 2018-05-05 | 1 | -2/+6 |
| | |/ / | |/| | | |||||
* | | | | Merge remote-tracking branch 'chhschou/master' into staging_065 | Dominik Ritter | 2018-06-07 | 1 | -2/+2 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 Chou | 2017-10-05 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | unavailable | ||||
* | | | | | Merge remote-tracking branch 'VanRoy/master' into staging_065 | Dominik Ritter | 2018-06-07 | 1 | -0/+9 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 Roy | 2018-03-24 | 1 | -0/+9 |
| | | | | | |