summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into nextBen Hilburn2015-09-061-4/+6
|\
| * Merge pull request #88 from dritter/vcs_merge_whitespace_fixBen Hilburn2015-09-061-2/+2
| |\ | | | | | | vcs segment: fix extra whitespace in actionformat, remove redundant color setting
| | * Removed pointless changing of foreground color.Dominik Ritter2015-09-041-1/+1
| | |
| | * Removed unnecessary whitespace in git actionformats.Dominik Ritter2015-09-041-1/+1
| |/ | | | | | | This fixes #78
| * Merge pull request #82 from labianchin/patch-1Ben Hilburn2015-09-031-2/+2
| |\ | | | | | | Fix VCS string print format for git-* (e.g., git-svn)
| | * Fix format for git-svnLuís Bianchin2015-09-011-2/+2
| |/ | | | | When the repository backend is like git-svn or git-hg, there was a conflict with `zstyle` `formats` from `functions/VCS_INFO_formats`. Now it applies the format to all backends starting with `git` or `svn`.
| * Merge pull request #77 from jkoelndorfer/left-prompt-retvalBen Hilburn2015-08-271-0/+2
| |\ | | | | | | Set RETVAL for left prompt also.
| | * Set RETVAL for left prompt also.John Koelndorfer2015-08-261-0/+2
| |/
* | Merge branch 'dritter/dritter/minimize_dependencies' into `next`Ben Hilburn2015-08-021-1/+1
|\ \
| * | `test -n` seems to read the whole string. For performance issues we just ↵Dominik Ritter2015-07-311-1/+1
| | | | | | | | | | | | analyze the first line by stripping the output of cat to the first line with `sed q`.
| * | Less dependencies. If `sed q | wc -l` is just for testing if the string is ↵Dominik Ritter2015-07-301-1/+1
| | | | | | | | | | | | empty or not, we can do that with just ZSH. Trusting that the implentation of `test -n` is intelligent enough to abort if a character is found.
* | | Merge OS detection & segment into `next`Ben Hilburn2015-08-022-78/+116
|\ \ \ | |_|/ |/| |
| * | Merge branch 'dritter/dritter/os_detection' into os-iconBen Hilburn2015-08-011-5/+7
| |\ \
| | * | Added OpenBSD and DragonFly again.Dominik Ritter2015-07-291-5/+7
| |/ /
| * | os_icon: Combining OS detection and icon setting into one case statementBen Hilburn2015-07-291-18/+10
| | |
| * | Merge branch 'dritter/os_detection' of local staging.Ben Hilburn2015-07-292-27/+42
| |\ \
| | * | Whitespace fix.Dominik Ritter2015-07-281-1/+1
| | | |
| | * | The VCS-Branch icon is broken, if we use Unicode-characters with uppercase \U.Dominik Ritter2015-07-281-2/+2
| | | |
| | * | Reworked OS-Icons to fit in our general scheme.Dominik Ritter2015-07-281-24/+29
| | | |
| | * | Merge branch 'master' into dritter/os_detectionDominik Ritter2015-07-272-1/+11
| | |\|
| * | | Merge branch 'dritter/os_detection' into dritter-os-iconBen Hilburn2015-07-272-101/+127
| |\| |
| | * | Uhm. It seems to make a difference, whether you print unicode characters ↵Dominik Ritter2015-07-271-84/+84
| | | | | | | | | | | | | | | | | | | | | | | | with lowercase \u or uppercase \U. Some of them only work with uppercase \U. Therefore I changed all of them to the uppercase variant. Try `echo $'\u1F427' $'\U1F427'`. Only the latter one should work. The first one prints some gibberish.
| | * | Determine the right OS-Icon only once.Dominik Ritter2015-07-271-15/+25
| | | |
| | * | Merge branch 'master' into dritter/os_detectionDominik Ritter2015-07-272-9/+25
| | |\ \
| * | | | Merge remote-tracking branch 'dritter/dritter/os_detection' into stagingBen Hilburn2015-07-272-0/+29
| |\| | |
| | * | | Added documentation.Dominik Ritter2015-07-251-0/+1
| | | | |
| | * | | Updated the os-icon prompt to newest coding guidelines.Dominik Ritter2015-07-251-4/+4
| | | | |
| | * | | Merge branch 'master' into dritter/os_detectionDominik Ritter2015-07-2510-162/+744
| | |\ \ \ | | |/ / / | |/| | |
| | * | | New prompt segment `os_icon`.Dominik Ritter2015-06-071-0/+23
| | | | |
* | | | | README: Quick update to the descriptionBen Hilburn2015-07-271-1/+3
| |_|_|/ |/| | |
* | | | Merge remote-tracking branch 'dritter/dritter/disable_rprompt'Ben Hilburn2015-07-272-1/+11
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | Allows disabling of the right prompt Conflicts: powerlevel9k.zsh-theme
| * | | Added documentation for disable RPROMPT.Dominik Ritter2015-07-251-0/+7
| | | |
| * | | Added possibility to disable the RPROMPT completly.Dominik Ritter2015-07-251-1/+4
| |/ /
* | | Merge branch 'dritter-various-improvements'Ben Hilburn2015-07-272-9/+25
|\ \ \ | |/ / |/| |
| * | README: CleanupBen Hilburn2015-07-271-9/+15
| | |
| * | Merge remote-tracking branch 'dritter/dritter/various_improvements' into stagingBen Hilburn2015-07-272-9/+19
|/| |
| * | Added a better example for the custom Time format.Dominik Ritter2015-07-251-2/+2
| | |
| * | Added Troubleshooting-hint for wrong TERM.Dominik Ritter2015-07-251-0/+11
| | |
| * | Whitespace fixes.Dominik Ritter2015-07-251-7/+6
|/ /
* | Merge pull request #62 from dritter/dritter/minimize_dependenciesBen Hilburn2015-07-221-3/+3
|\ \ | | | | | | Strip the whitespace of OSX `wc` with pure zsh. No need to install `coreutils`.
| * | Strip the whitespace of OSX `wc` with pure zsh. No need to install `coreutils`.Dominik Ritter2015-07-211-3/+3
|/ /
* | Revert "We don't need `tr`, as we strip whitespace directly with zsh."Ben Hilburn2015-07-201-3/+3
| | | | | | | | | | | | | | This reverts commit 10c5b28859d372f480c1352d4b7a74672e77b430. Conflicts: powerlevel9k.zsh-theme
* | README: markdown syntax derpBen Hilburn2015-07-191-0/+1
| |
* | README: Updating introduction to the theme.Ben Hilburn2015-07-191-11/+12
| |
* | Merge remote-tracking branch 'dritter/dritter/minimize_dependencies'Ben Hilburn2015-07-191-3/+3
|\ \ | | | | | | | | | Using the `translate` program does not appear to be necessary.
| * \ Merge branch 'master' into dritter/minimize_dependenciesDominik Ritter2015-07-1910-154/+763
| |\ \
| * | | We don't need `tr`, as we strip whitespace directly with zsh.Dominik Ritter2015-05-311-3/+3
| | | |
* | | | README: simple cleanupBen Hilburn2015-07-191-4/+10
| | | |
* | | | Merge pull request #59 from dritter/dritter/multiline_improvementsBen Hilburn2015-07-192-2/+10
|\ \ \ \ | | | | | | | | | | Multiline icons are now customizable
| * | | | Made Multiline-Icons customizable.Dominik Ritter2015-07-192-2/+10
| | | | |