Commit Graph

257 Commits (958b11b77e42c14f820609565a11bf148dfe3f95)
 

Author SHA1 Message Date
Gilad Goldberg 958b11b77e Make docs reflect difference between status and longstatus 9 years ago
Ben Hilburn 692e6a7130 Revert "Merge pull request #91 from tusharsrivastava/master"
This reverts commit 2a2dfdfa29, reversing
changes made to 1390fbdea5.
9 years ago
Ben Hilburn 2a2dfdfa29 Merge pull request #91 from tusharsrivastava/master
Updated some of the Awesome Powerline Icons.
9 years ago
Tushar Srivastava a21c5615ec updated some icons 9 years ago
Tushar Srivastava 7e6616f590 Updated with new Icons 9 years ago
Ben Hilburn 1390fbdea5 Merge pull request #88 from dritter/vcs_merge_whitespace_fix
vcs segment: fix extra whitespace in actionformat, remove redundant color setting
9 years ago
Dominik Ritter adbf9947b2 Removed pointless changing of foreground color. 9 years ago
Dominik Ritter 9a814720db Removed unnecessary whitespace in git actionformats.
This fixes #78
9 years ago
Ben Hilburn 60d92135cc Merge pull request #82 from labianchin/patch-1
Fix VCS string print format for git-* (e.g., git-svn)
9 years ago
Luís Bianchin e90e353b0a Fix format for git-svn
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`.
9 years ago
Ben Hilburn 1a1cb8fdd2 Merge pull request #77 from jkoelndorfer/left-prompt-retval
Set RETVAL for left prompt also.
9 years ago
John Koelndorfer 2eea3aec56 Set RETVAL for left prompt also. 9 years ago
Ben Hilburn 4e2b1137d4 README: Quick update to the description 9 years ago
Ben Hilburn c37e4a8fa0 Merge remote-tracking branch 'dritter/dritter/disable_rprompt'
Allows disabling of the right prompt

Conflicts:
	powerlevel9k.zsh-theme
9 years ago
Ben Hilburn 961598e66b Merge branch 'dritter-various-improvements' 9 years ago
Ben Hilburn 143aac50fb README: Cleanup 9 years ago
Ben Hilburn 0654832da4 Merge remote-tracking branch 'dritter/dritter/various_improvements' into staging 9 years ago
Dominik Ritter 69096e02c9 Added a better example for the custom Time format. 9 years ago
Dominik Ritter 188970f11e Added documentation for disable RPROMPT. 9 years ago
Dominik Ritter e8dc33bb07 Added possibility to disable the RPROMPT completly. 9 years ago
Dominik Ritter 9789afd142 Added Troubleshooting-hint for wrong TERM. 9 years ago
Dominik Ritter 9e1f0639cf Whitespace fixes. 9 years ago
Ben Hilburn 925e6752f7 Merge pull request #62 from dritter/dritter/minimize_dependencies
Strip the whitespace of OSX `wc` with pure zsh. No need to install `coreutils`.
9 years ago
Dominik Ritter 30c4acd249 Strip the whitespace of OSX `wc` with pure zsh. No need to install `coreutils`. 9 years ago
Ben Hilburn 7f83bac947 Revert "We don't need `tr`, as we strip whitespace directly with zsh."
This reverts commit 10c5b28859.

Conflicts:
	powerlevel9k.zsh-theme
9 years ago
Ben Hilburn c853be57e7 README: markdown syntax derp 9 years ago
Ben Hilburn 71f5be368e README: Updating introduction to the theme. 9 years ago
Ben Hilburn 3927f055fe Merge remote-tracking branch 'dritter/dritter/minimize_dependencies'
Using the `translate` program does not appear to be necessary.
9 years ago
Ben Hilburn ea2af79042 README: simple cleanup 9 years ago
Ben Hilburn 8e19cc05aa Merge pull request #59 from dritter/dritter/multiline_improvements
Multiline icons are now customizable
9 years ago
Ben Hilburn d17fecbf81 README: bit of cleanup in color customization docs 9 years ago
Ben Hilburn 97cd46a347 Merge pull request #58 from dritter/dritter/customizable_context
Made the `context` segment customizable.
9 years ago
Ben Hilburn 1f69d67c2a Merging dritter/remote_icon_space_names
Optimizing VCS icon spacing for different configurations.
9 years ago
Dominik Ritter cb20e0e0d9 Made Multiline-Icons customizable. 9 years ago
Dominik Ritter 3076c72f2e Merge branch 'master' into dritter/multiline_improvements 9 years ago
Dominik Ritter eed0c84273 Made the `context` segment customizable. 9 years ago
Dominik Ritter b82e19f073 Merge branch 'master' into dritter/minimize_dependencies 9 years ago
Ben Hilburn 8358489470 README: Updating with minor fixes. 9 years ago
Ben Hilburn 20cb4a245e Merging @dritter's work to allow shortened dir segment.
This is PR #54.
Merge remote-tracking branch 'dritter/dritter/shorten_dir_path'
9 years ago
Ben Hilburn 6144225330 Merging @dritter's Node.js segment support.
This is PR #53.
Merge remote-tracking branch 'dritter/dritter/nvm'
9 years ago
Dominik Ritter 50bca4bf25 Merge branch 'master' into dritter/shorten_dir_path 9 years ago
Dominik Ritter 505a55b61c Updated node-prompt. 9 years ago
Dominik Ritter bc7c01648f Merge branch 'master' into dritter/nvm 9 years ago
Ben Hilburn 79499dbb00 README: Fixing symbol table headers 9 years ago
Ben Hilburn 767d4c75b0 Merge branch 'dritter/developers_guide' 9 years ago
Ben Hilburn 3a857c276d README: Moving Dev Guide to Github wiki 9 years ago
Ben Hilburn c9e6cc6cd0 Merge pull request #52 from dritter/dritter/mercurial_dirty_fix
Must always resolve changeset to show Hg repository status.

Resolves bug #51.
9 years ago
Ben Hilburn 48d4ebac10 Merge pull request #50 from dritter/dritter/vim_modelines_improvement
Add VIM default settings: "expandtab", encoding = "utf8"
9 years ago
Ben Hilburn 0d9fe3d60f Merge pull request #49 from dritter/dritter/branch_icon_fixes
Fix the branch icon in the VCS segment.

Resolves bug #49.
9 years ago
Ben Hilburn 7519b5292a Merge Vagrant VM support for development. 9 years ago