Gilad Goldberg
958b11b77e
Make docs reflect difference between status and longstatus
2015-09-19 21:39:03 +03:00
Ben Hilburn
692e6a7130
Revert "Merge pull request #91 from tusharsrivastava/master"
...
This reverts commit 2a2dfdfa291390fbdea5
2015-09-17 10:24:52 -07:00
Ben Hilburn
2a2dfdfa29
Merge pull request #91 from tusharsrivastava/master
...
Updated some of the Awesome Powerline Icons.
2015-09-15 15:34:48 -07:00
Tushar Srivastava
a21c5615ec
updated some icons
2015-09-12 18:12:39 +05:30
Tushar Srivastava
7e6616f590
Updated with new Icons
2015-09-12 17:49:18 +05:30
Ben Hilburn
1390fbdea5
Merge pull request #88 from dritter/vcs_merge_whitespace_fix
...
vcs segment: fix extra whitespace in actionformat, remove redundant color setting
2015-09-05 14:44:43 -07:00
Dominik Ritter
adbf9947b2
Removed pointless changing of foreground color.
2015-09-04 19:26:05 +02:00
Dominik Ritter
9a814720db
Removed unnecessary whitespace in git actionformats.
...
This fixes #78
2015-09-04 19:24:07 +02:00
Ben Hilburn
60d92135cc
Merge pull request #82 from labianchin/patch-1
...
Fix VCS string print format for git-* (e.g., git-svn)
2015-09-03 12:10:36 -07:00
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`.
2015-08-31 20:53:31 -07:00
Ben Hilburn
1a1cb8fdd2
Merge pull request #77 from jkoelndorfer/left-prompt-retval
...
Set RETVAL for left prompt also.
2015-08-26 19:51:40 -07:00
John Koelndorfer
2eea3aec56
Set RETVAL for left prompt also.
2015-08-26 10:59:57 -05:00
Ben Hilburn
4e2b1137d4
README: Quick update to the description
2015-07-27 10:45:41 -07:00
Ben Hilburn
c37e4a8fa0
Merge remote-tracking branch 'dritter/dritter/disable_rprompt'
...
Allows disabling of the right prompt
Conflicts:
powerlevel9k.zsh-theme
2015-07-26 16:22:29 -07:00
Ben Hilburn
961598e66b
Merge branch 'dritter-various-improvements'
2015-07-26 14:43:33 -07:00
Ben Hilburn
143aac50fb
README: Cleanup
2015-07-26 14:43:16 -07:00
Ben Hilburn
0654832da4
Merge remote-tracking branch 'dritter/dritter/various_improvements' into staging
2015-07-26 14:32:36 -07:00
Dominik Ritter
69096e02c9
Added a better example for the custom Time format.
2015-07-25 14:25:29 +02:00
Dominik Ritter
188970f11e
Added documentation for disable RPROMPT.
2015-07-25 11:22:51 +02:00
Dominik Ritter
e8dc33bb07
Added possibility to disable the RPROMPT completly.
2015-07-25 11:22:24 +02:00
Dominik Ritter
9789afd142
Added Troubleshooting-hint for wrong TERM.
2015-07-25 11:00:07 +02:00
Dominik Ritter
9e1f0639cf
Whitespace fixes.
2015-07-25 10:59:25 +02:00
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`.
2015-07-22 13:06:44 -07:00
Dominik Ritter
30c4acd249
Strip the whitespace of OSX wc with pure zsh. No need to install coreutils.
2015-07-20 23:37:57 +02:00
Ben Hilburn
7f83bac947
Revert "We don't need tr, as we strip whitespace directly with zsh."
...
This reverts commit 10c5b28859
2015-07-19 17:55:10 -07:00
Ben Hilburn
c853be57e7
README: markdown syntax derp
2015-07-19 12:42:00 -07:00
Ben Hilburn
71f5be368e
README: Updating introduction to the theme.
2015-07-19 12:40:59 -07:00
Ben Hilburn
3927f055fe
Merge remote-tracking branch 'dritter/dritter/minimize_dependencies'
...
Using the `translate` program does not appear to be necessary.
2015-07-19 12:29:07 -07:00
Ben Hilburn
ea2af79042
README: simple cleanup
2015-07-19 12:24:21 -07:00
Ben Hilburn
8e19cc05aa
Merge pull request #59 from dritter/dritter/multiline_improvements
...
Multiline icons are now customizable
2015-07-19 12:23:00 -07:00
Ben Hilburn
d17fecbf81
README: bit of cleanup in color customization docs
2015-07-19 12:20:04 -07:00
Ben Hilburn
97cd46a347
Merge pull request #58 from dritter/dritter/customizable_context
...
Made the `context` segment customizable.
2015-07-19 12:15:26 -07:00
Ben Hilburn
1f69d67c2a
Merging dritter/remote_icon_space_names
...
Optimizing VCS icon spacing for different configurations.
2015-07-19 12:11:43 -07:00
Dominik Ritter
cb20e0e0d9
Made Multiline-Icons customizable.
2015-07-19 14:57:17 +02:00
Dominik Ritter
3076c72f2e
Merge branch 'master' into dritter/multiline_improvements
2015-07-19 14:45:48 +02:00
Dominik Ritter
eed0c84273
Made the context segment customizable.
2015-07-19 14:32:13 +02:00
Dominik Ritter
b82e19f073
Merge branch 'master' into dritter/minimize_dependencies
2015-07-19 14:11:55 +02:00
Ben Hilburn
8358489470
README: Updating with minor fixes.
2015-07-12 18:10:33 -07:00
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'
2015-07-12 18:07:59 -07:00
Ben Hilburn
6144225330
Merging @dritter's Node.js segment support.
...
This is PR #53 .
Merge remote-tracking branch 'dritter/dritter/nvm'
2015-07-12 18:05:18 -07:00
Dominik Ritter
50bca4bf25
Merge branch 'master' into dritter/shorten_dir_path
2015-07-12 11:01:13 +02:00
Dominik Ritter
505a55b61c
Updated node-prompt.
2015-07-11 14:29:48 +02:00
Dominik Ritter
bc7c01648f
Merge branch 'master' into dritter/nvm
2015-07-11 14:26:05 +02:00
Ben Hilburn
79499dbb00
README: Fixing symbol table headers
2015-07-10 20:43:06 -07:00
Ben Hilburn
767d4c75b0
Merge branch 'dritter/developers_guide'
2015-07-10 20:39:56 -07:00
Ben Hilburn
3a857c276d
README: Moving Dev Guide to Github wiki
2015-07-10 20:39:27 -07:00
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 .
2015-07-10 20:29:31 -07:00
Ben Hilburn
48d4ebac10
Merge pull request #50 from dritter/dritter/vim_modelines_improvement
...
Add VIM default settings: "expandtab", encoding = "utf8"
2015-07-10 20:26:33 -07:00
Ben Hilburn
0d9fe3d60f
Merge pull request #49 from dritter/dritter/branch_icon_fixes
...
Fix the branch icon in the VCS segment.
Resolves bug #49 .
2015-07-10 20:24:33 -07:00
Ben Hilburn
7519b5292a
Merge Vagrant VM support for development.
2015-07-10 20:22:22 -07:00
