Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | | | | |||||
* | | | | | Merge branch 'master' into staging_065 | Dominik Ritter | 2018-06-07 | 1 | -10/+18 |
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-#777 | Ben Hilburn | 2018-04-14 | 1 | -5/+6 |
| |\ \ \ \ | | | | | | | | | | | | | Rbenv prompt option always displays #777 | ||||
| | * | | | | #777 Add POWERLEVEL9K_RBENV_PROMPT_ALWAYS_SHOW variable to display ↵ | Ryan Davidson | 2018-04-03 | 1 | -5/+6 |
| | |/ / / | | | | | | | | | | | | | | | | prompt_rbenv if rbenv_version_name is the same as rbenv_global | ||||
| * | | | | Merge pull request #773 from conradhaupt/fix_dir_nav | Ben Hilburn | 2018-04-14 | 1 | -1/+3 |
| |\ \ \ \ | | | | | | | | | | | | | Fixed home abbreviation not being exclusive with circular navigation | ||||
| | * | | | | Fixed home abbreviation not being exclusive with circular navigation | Conrad Haupt | 2018-03-12 | 1 | -1/+3 |
| | |/ / / | |||||
| * / / / | workaround for ZSH status behavior | Christian Höltje | 2018-03-26 | 1 | -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 | ||||
* | | | | Make _path variable local in anaconda segment | Dominik Ritter | 2018-03-28 | 1 | -1/+1 |
| | | | | |||||
* | | | | Make variables local | Dominik Ritter | 2018-03-27 | 1 | -2/+4 |
| | | | | |||||
* | | | | **LARGE MERGE THAT TOUCHES LOTS OF THINGS.** | Ben Hilburn | 2018-03-07 | 1 | -77/+175 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | 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. | ||||
| * | | | | Updated testing for folder icons | Christo Kotze | 2018-02-23 | 1 | -4/+3 |
| | | | | | |||||
| * | | | | Added POWERLEVEL9K_DIR_PATH_ABSOLUTE to README.md | Christo Kotze | 2018-02-23 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Added new variable POWERLEVEL9K_DIR_PATH_ABSOLUTE | Christo Kotze | 2018-02-23 | 1 | -3/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 Kotze | 2018-02-23 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Added test for root based folder to first&last | Christo Kotze | 2018-02-23 | 1 | -1/+2 |
| | | | | | |||||
| * | | | | Added truncate_to_first_and_last strategy | Christo Kotze | 2018-02-23 | 1 | -28/+43 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Truncate middle directories from the path. How many directories will be untouched is controlled by POWERLEVEL9K_SHORTER_DIR_LENGTH. | ||||
| * | | | | Update to truncate_absolute | Christo Kotze | 2018-02-22 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Removed final SEDs and more comments | Christo Kotze | 2018-02-22 | 1 | -14/+33 |
| | | | | | |||||
| * | | | | Comments, trunc_to_last, trunc_absolute | Christo Kotze | 2018-02-22 | 1 | -12/+40 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added comments throughout the code Added `truncate_to_last` - displays only the current folder Added `truncate_absolute` - displays only the last POWERLEVEL9K_SHORTER_DIR_LENGTH characters - see #736 | ||||
| * | | | | Missed one variable name change | Christo Kotze | 2018-02-22 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | There's always that one pesky variable name you forget to change... | ||||
| * | | | | All code should now be functional | Christo Kotze | 2018-02-22 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | *Fingers crossed* | ||||
| * | | | | Updated test for trunc_to_unique | Christo Kotze | 2018-02-22 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Instead of testing for number of folders, now only tests if string is longer than 1 character. | ||||
| * | | | | Fixed error in coding | Christo Kotze | 2018-02-19 | 1 | -2/+1 |
| | | | | | | | | | | | | | | | | | | | | Shouldn't code when tired lol. | ||||
| * | | | | Forgot to update code when creating new func | Christo Kotze | 2018-02-19 | 1 | -2/+3 |
| | | | | | |||||
| * | | | | Added truncatePath to utilities.zsh | Christo Kotze | 2018-02-19 | 1 | -60/+33 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
| * | | | | Improved truncation code | Christo Kotze | 2018-02-19 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Updated truncate_to_unique | Christo Kotze | 2018-02-18 | 1 | -2/+3 |
| | | | | | |||||
| * | | | | Updated code for testing | Christo Kotze | 2018-02-18 | 1 | -30/+30 |
| | | | | | |||||
| * | | | | Added / for non-home folders | Christo Kotze | 2018-02-18 | 1 | -0/+2 |
| | | | | | |||||
| * | | | | Rewrote trunc middle/right to use for loop | Christo Kotze | 2018-02-18 | 1 | -47/+41 |
| | | | | | |||||
| * | | | | Fixed another typo - shouldn't code when sick :p | Christo Kotze | 2018-02-18 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Fixed typo | Christo Kotze | 2018-02-18 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Added test for dir_length == trunc_length | Christo Kotze | 2018-02-18 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Updated truncate_from_right test | Christo Kotze | 2018-02-18 | 1 | -3/+2 |
| | | | | | |||||
| * | | | | Changed current_dir - Test Travis response | Christo Kotze | 2018-02-18 | 1 | -2/+3 |
| | | | | | |||||
| * | | | | Fix issue with SHORTEN_DELIM | Christo Kotze | 2018-02-17 | 1 | -3/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | If `$POWERLEVEL9K_SHORTEN_DELIMITER` is a unicode escape sequence, its length is 6 instead of 1. Added variable to hold actual character(s) | ||||
| * | | | | Updated previous test as Travis still fails | Christo Kotze | 2018-02-17 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Fixed truncate_from_right to incl length of delim | Christo Kotze | 2018-02-17 | 1 | -11/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Updated length test to include delimiter length. Added comments | ||||
| * | | | | Accidentally deleted )) which threw an error | Christo Kotze | 2018-02-17 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Fixed accidentally truncating current folder too | Christo Kotze | 2018-02-17 | 1 | -3/+3 |
| | | | | |