Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'ben/master' into HEAD | Dominik Ritter | 2019-02-03 | 1 | -1/+3 |
|\ | |||||
| * | Merge pull request #981 from pgierz/os_release_fix | Dominik Ritter | 2019-01-24 | 1 | -1/+3 |
| |\ | | | | | | | [Bugfix] Fix for #974 | ||||
| | * | Avoid externals when parsing the os release on linux | Dominik Ritter | 2019-01-24 | 1 | -1/+1 |
| | | | |||||
| | * | Fix for #974 | Paul Gierz | 2018-09-07 | 1 | -1/+3 |
| | | | |||||
* | | | Parse IPs properly | Dominik Ritter | 2019-02-03 | 1 | -0/+48 |
|/ / | | | | | | | | | | | | | This is done if we want to show a public IP, internal IP, or a VPN. In the VPN case, what we actually want is to display an indicator that a VPN is active, instead of the VPN IP itself. We parse the IP here anyway, because we want to save some specific code there. | ||||
* | | Port #1071 to `master` (fatal errors emitted by untracked file check in vcs.zsh) | Matthew Judy | 2018-11-18 | 1 | -27/+17 |
| | | |||||
* | | Merge pull request #1065 from dritter/protect_locale | Dominik Ritter | 2018-11-17 | 1 | -0/+2 |
|\ \ | | | | | | | Protect locale | ||||
| * | | Protect users locale | Dominik Ritter | 2018-11-05 | 1 | -0/+2 |
| |/ | |||||
* | | Fix checking for untracked files | Dominik Ritter | 2018-11-12 | 1 | -1/+15 |
| | | | | | | | | | | Now the untracked files are always checked from the root folder of the repo. | ||||
* | | Fix stashes display | Dominik Ritter | 2018-11-12 | 1 | -22/+6 |
| | | | | | | | | | | | | | | Changing directories while checking for untracked files broke the display of git stashes. The hook was not called any more. This is why we disabled checking for untracked files within a .git folder. | ||||
* | | Fix error if user cds into a .git directory | Dominik Ritter | 2018-11-12 | 1 | -4/+22 |
| | | | | | | | | | | | | In this case is was previously not possible to get the untracked status. Now we temporarily change the directory to the repo root folder and then get the list of untracked files. | ||||
* | | Avoid warning when inside of .git dir | Dominik Ritter | 2018-11-12 | 1 | -0/+2 |
| | | | | | | | | | | We cannot detect untracked files when we are inside of a .git directory. | ||||
* | | Count stashes via ZSH | Dominik Ritter | 2018-11-12 | 1 | -5/+3 |
| | | |||||
* | | Avoid aliases | Dominik Ritter | 2018-11-06 | 1 | -1/+1 |
| | | |||||
* | | Get rid of externals when truncating branch name | Dominik Ritter | 2018-11-06 | 1 | -3/+3 |
| | | |||||
* | | When checking for untracked or modified files, take submodules into account | Dominik Ritter | 2018-11-03 | 1 | -1/+1 |
| | | |||||
* | | Speedup VCS segment | Dominik Ritter | 2018-11-03 | 1 | -11/+5 |
| | | | | | | | | | | | | | | Now the untracked files are detected via `git ls-files`, which is much faster than `git status`. Additionally, we flipped the default for checking submodules. They are now NOT checked by default, as most users probably do not use git submodules. | ||||
* | | Make use of git dir determined by VCS_INFO subsystem | Dominik Ritter | 2018-11-03 | 1 | -1/+1 |
| | | | | | | | | instead of determine the git dir manually. | ||||
* | | Get branch name from VCS_INFO subsystem when collecting remote branch | Dominik Ritter | 2018-11-03 | 1 | -2/+2 |
| | | |||||
* | | Get branch name from VCS_INFO subsystem when collecting ahead/behind info | Dominik Ritter | 2018-11-03 | 1 | -7/+5 |
| | | |||||
* | | Get rid of wc dependency when showing ahead/behind info | Dominik Ritter | 2018-11-03 | 1 | -2/+2 |
|/ | |||||
* | Change bright colors to old color codes | Dominik Ritter | 2018-08-17 | 1 | -12/+12 |
| | | | | | Before this, there was no difference in that colors, as we always used the bright color codes. | ||||
* | Merge remote-tracking branch 'eloo/master' into prepare_066 | Dominik Ritter | 2018-08-12 | 1 | -54/+54 |
|\ | |||||
| * | Add fallback icon for linux distros | Joseph Weigl | 2018-08-11 | 1 | -54/+54 |
| | | |||||
* | | Merge branch 'fix_colors' into prepare_066 | Dominik Ritter | 2018-08-08 | 1 | -322/+297 |
|\ \ | |||||
| * | | Write comparison with double quotes | Dominik Ritter | 2018-08-08 | 1 | -1/+1 |
| | | | |||||
| * | | Pad colors with zeroes | Dominik Ritter | 2018-08-08 | 1 | -1/+2 |
| | | | |||||
| * | | Always use color codes instead of named colors | Dominik Ritter | 2018-08-08 | 1 | -34/+25 |
| | | | | | | | | | | | | | | | | | | This Code was to check if the color is supported by the Terminal Emulator. This is not necessary, if we always use the numerical code. This makes the code much clearer. | ||||
| * | | Fix bright colors | Dominik Ritter | 2018-08-08 | 1 | -6/+0 |
| | | | | | | | | | | | | | | | | | | Remove old code that set bright colors equal to normal colors. This code was ancient and led to bright colors being unusable. The code originates from 0e37d8ef865daddd6af02ba78b4a3bb86fd5917e. | ||||
| * | | Make colors a global array | Dominik Ritter | 2018-08-07 | 1 | -265/+267 |
| | | | | | | | | | | | | That way it must not be defined in every function call. | ||||
| * | | Write comparisons with double equals | Dominik Ritter | 2018-08-07 | 1 | -1/+1 |
| | | | |||||
| * | | Fix bright colors | Dominik Ritter | 2018-08-07 | 1 | -6/+2 |
| | | | | | | | | | | | | | | | | | | Remove old code that set bright colors equal to normal colors. This code was ancient and led to bright colors being unusable. The code originates from 0e37d8ef865daddd6af02ba78b4a3bb86fd5917e. | ||||
| * | | Make purpose clear of backgroundColor and foregroundColor functions | Dominik Ritter | 2018-08-07 | 1 | -12/+4 |
| | | | | | | | | | | | | | | | The functions just start the colors, they do not end them. It seems too much to have a function that terminates a color. | ||||
* | | | Merge branch 'fix_colors' into prepare_066 | Dominik Ritter | 2018-08-06 | 1 | -0/+2 |
|\| | | |||||
| * | | Add missing colors to fix color comparison | Dominik Ritter | 2018-07-24 | 1 | -0/+2 |
| |/ | | | | | | | | | Added magenta and cyan that were only present with their alternative names (fuchsia and aqua). See https://en.wikipedia.org/wiki/X11_color_names#Clashes_between_web_and_X11_colors_in_the_CSS_color_scheme | ||||
* | | Test more readable | Ythildir | 2018-07-22 | 1 | -1/+1 |
| | | |||||
* | | Resolve #918 Transparent background | Ythildir | 2018-07-21 | 1 | -0/+4 |
|/ | | | | | Now function getColorCode consider value 'none' like a good value. When it's use to set background the segment become transparent | ||||
* | Replace `typeset` check with shellvar flag | Ben Klein | 2018-07-12 | 1 | -3/+1 |
| | | | | More performance without changing functionality. | ||||
* | Fix os detection for MSYS2 | blackb1rd | 2018-06-30 | 1 | -1/+1 |
| | |||||
* | Use cog glyph on all modes | Dominik Ritter | 2018-06-17 | 1 | -4/+4 |
| | |||||
* | Add a Laravel version segment | Dominik Ritter | 2018-06-07 | 1 | -0/+5 |
| | |||||
* | Merge remote-tracking branch 'Maxattax97/next' into staging_065 | Dominik Ritter | 2018-06-07 | 1 | -18/+18 |
|\ | |||||
| * | Fix Linux distribution detection | Max O'Cull | 2018-05-19 | 1 | -18/+18 |
| | | |||||
* | | 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 |
|\ \ \ \ |