Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge remote-tracking branch 'sambadevi/feature/etc-option-in-dir-segment' ↵ | Dominik Ritter | 2018-06-07 | 1 | -0/+5 | |
|\ \ | | | | | | | | | | into staging_065 | |||||
| * | | add cog symbol to dir segment if folder is /etc* | Tim Otlik | 2018-05-17 | 1 | -0/+5 | |
| |/ | ||||||
* | | 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/+5 | |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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/+4 | |
| | | | | ||||||
* | | | | Merge remote-tracking branch 'floor114/next' into staging_065 | Dominik Ritter | 2018-06-07 | 1 | -0/+15 | |
|\ \ \ \ | ||||||
| * | | | | Add vcs branch name truncating. | Taras Shpachenko | 2018-04-12 | 1 | -0/+15 | |
| | | | | | ||||||
* | | | | | Merge remote-tracking branch 'guicassolato/fix-wrapper-slowness' into ↵ | Dominik Ritter | 2018-06-07 | 1 | -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 segment | Guilherme Cassolato | 2018-04-11 | 1 | -15/+15 | |
| | |_|/ | |/| | | ||||||
* | | | | Merge pull request #791 from dritter/local_variables | Ben Hilburn | 2018-04-14 | 2 | -3/+4 | |
|\ \ \ \ | |_|/ / |/| | | | Make variables local | |||||
| * | | | Make variables local | Dominik Ritter | 2018-03-27 | 2 | -3/+4 | |
| | | | | ||||||
* | | | | add compatible to the list of fontconfigs | Tim Otlik | 2018-03-20 | 1 | -0/+5 | |
| | | | | ||||||
* | | | | fixed missing icons for other fontconfigs | Tim Otlik | 2018-03-20 | 1 | -0/+15 | |
| | | | | ||||||
* | | | | update icons for nerd-fonts 2.0.0 | Tim Otlik | 2018-03-20 | 2 | -14/+34 | |
|/ / / | ||||||
* | | | **LARGE MERGE THAT TOUCHES LOTS OF THINGS.** | Ben Hilburn | 2018-03-07 | 1 | -0/+76 | |
|\ \ \ | | | | | | | | | | | | | | | | | 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 Hilburn | 2018-03-07 | 1 | -0/+76 | |
| |\ \ \ | | | | | | | | | | | | | | | | https://github.com/onaforeignshore/powerlevel9k into onaforeignshore-dir_strategies | |||||
| | * | | | Fixed silly coding error | Christo Kotze | 2018-02-22 | 1 | -5/+3 | |
| | | | | | | | | | | | | | | | | | | | | Did `local 3=...` instead of `3=...` | |||||
| | * | | | Update for Travis | Christo Kotze | 2018-02-22 | 1 | -1/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While zsh accepts the following code: ``` local paths=(${(s:/:)${1//"~\/"/}}) ``` Travis fails unless it is ``` local paths=$1 paths=(${(s:/:)${paths//"~\/"/}}) ``` | |||||
| | * | | | Updated truncatePath() | Christo Kotze | 2018-02-22 | 1 | -6/+7 | |
| | | | | | | | | | | | | | | | | | | | | Added variable `delim_len` with test when delim="" | |||||
| | * | | | Another Travis test | Christo Kotze | 2018-02-20 | 1 | -1/+2 | |
| | | | | | ||||||
| | * | | | Another change to test Travis | Christo Kotze | 2018-02-19 | 1 | -3/+3 | |
| | | | | | ||||||
| | * | | | Changed path splitting to test Travis | Christo Kotze | 2018-02-19 | 1 | -3/+3 | |
| | | | | | ||||||
| | * | | | Updated path splitting line | Christo Kotze | 2018-02-19 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | Works in the console, but Travis doesn't like it. | |||||
| | * | | | Added truncatePath to utilities.zsh | Christo Kotze | 2018-02-19 | 1 | -0/+75 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added `function truncatePath()` to utilities.zsh to take care of truncation. This is pure zsh code, without calls to `sed`. Parameters are: * $1 Path: string - the directory path to be truncated * $2 Length: integer - length to truncate to * $3 Delimiter: string - the delimiter to use * $4 From: string - "right" | "middle". If omited, assumes right. Cleaned up code to use the new function instead. | |||||
* | | | | | Merge pull request #729 from Mikewl/usersudo | Ben Hilburn | 2018-03-07 | 1 | -0/+5 | |
|\ \ \ \ \ | | | | | | | | | | | | | Added sudo state to prompt_user | |||||
| * | | | | | add new icons and add remote_sudo | Michael Louwrens | 2018-02-12 | 1 | -1/+4 | |
| | | | | | | ||||||
| * | | | | | try out sudo icon changes | Michael Louwrens | 2018-02-10 | 1 | -0/+2 | |
| | |/ / / | |/| | | | ||||||
* | | | | | Merge pull request #758 from sambadevi/next | Ben Hilburn | 2018-03-07 | 4 | -2/+112 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | Add icons for more distros in os_icon segment | |||||
| * | | | | fix $OS variable for battery segment | Tim Otlik | 2018-02-19 | 1 | -13/+1 | |
| | | | | | ||||||
| * | | | | arch icon was missing | Tim Otlik | 2018-02-16 | 1 | -0/+4 | |
| | | | | | ||||||
| * | | | | add missing icons to compat set | Tim Otlik | 2018-02-16 | 1 | -0/+48 | |
| | | | | | ||||||
| * | | | | add check of /etc/os-release for linux distros | Tim Otlik | 2018-02-16 | 4 | -27/+66 | |
| | | | | | ||||||
| * | | | | added LINUX_*_ICON for several OS | Tim Otlik | 2018-02-16 | 2 | -1/+32 | |
| |/ / / | ||||||
* / / / | Fix GIT and GITHUB nerdfont icon. | Christian Höltje | 2018-02-15 | 1 | -2/+3 | |
|/ / / | | | | | | | | | | VCS_GIT_ICON and VCS_GIT_GITHUB_ICON were wrong. | |||||
* | | | Merge pull request #681 from Stazer/tcolor-warning | Ben Hilburn | 2018-01-31 | 1 | -0/+4 | |
|\ \ \ | | | | | | | | | Added flag to ignore checking the term colors & lang settings | |||||
| * | | | renamed POWERLEVEL9K_CHECK_TERM_COLORS to POWERLEVEL9K_IGNORE_TERM_COLORS | Justus Flerlage | 2018-01-07 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Added flag for checking the term colors | Justus Flerlage | 2018-01-07 | 1 | -0/+4 | |
| | | | | ||||||
* | | | | Merge pull request #717 from onaforeignshore/date_segment | Ben Hilburn | 2018-01-24 | 1 | -0/+10 | |
|\ \ \ \ | | | | | | | | | | | Added `prompt_date` and fixed segment comments | |||||
| * | | | | Updates to `functions/icons.zsh` | Christo Kotze | 2018-01-05 | 1 | -0/+10 | |
| | | | | | | | | | | | | | | | | | | | | Added date and time icons | |||||
* | | | | | getColor() must always print result | Christian Höltje | 2018-01-20 | 1 | -1/+1 | |
| |/ / / |/| | | | | | | | | | | | This was causing colors specified as numbers to not be shown. | |||||
* | | | | colors checking optimized and added tput for check the colors | Charles Peterson | 2017-12-31 | 1 | -0/+16 | |
| | | | | | | | | | | | | | | | | moved to colors functions, because it makes sense. | |||||
* | | | | fix for colors since the terminals so not always render named colors when ↵ | Charles Peterson | 2017-12-16 | 1 | -267/+319 | |
|/ / / | | | | | | | | | | using parameter expansion. | |||||
* | | | Merge branch 'master' into next | Ben Hilburn | 2017-12-14 | 1 | -4/+4 | |
|\ \ \ | | |/ | |/| | ||||||
| * | | Disable alias of grep | Kentaro Hayashi | 2017-11-27 | 1 | -4/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | If user defined alias of grep command with '-r' or '--recursive' option, it causes a slow response of command line. It is not unexpected behavior of vcs info. This commit explicitly disables alias of grep to suppress side effects. | |||||
* | | | Merge pull request #688 from Stealthii/feature/stash-vcs | Ben Hilburn | 2017-12-05 | 1 | -0/+2 | |
|\ \ \ | | | | | | | | | Add Stash naming support for Bitbucket Server | |||||
| * | | | Add Stash naming support for Bitbucket Server | Daniel Porter | 2017-11-30 | 1 | -0/+2 | |
| |/ / | ||||||
* | | | Merge pull request #684 from Artistan/color_names | Ben Hilburn | 2017-12-05 | 1 | -9/+258 | |
|\ \ \ | | | | | | | | | Use color names, plus fixes | |||||
| * | | | color names and fixes | Charles Peterson | 2017-11-25 | 1 | -9/+258 | |
| |/ / | | | | | | | | | | | | | | | | | | | - fix for packageName truncated by POWERLEVEL9K_DIR_OMIT_FIRST_CHARACTER - processing the pwd/HOME replacement ONCE. - fix tests for named colors - use color names by default to allow dark/light themes to adjust colors based on names | |||||
* | | | Merge branch 'master' into next | Ben Hilburn | 2017-10-07 | 1 | -4/+4 | |
|\| | |