Commit Graph

3300 Commits (ed16e4e481d0accf7d47bbfa52bf0cf1705815c7)
 

Author SHA1 Message Date
Dominik Ritter 5a6b6ef604 Merge branch 'master' into dritter/os_detection 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
Ben Hilburn 0395709fa0 Merge remote-tracking branch 'dritter/dritter/os_detection' 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
Dominik Ritter 2bc3b09963 Implemented different ways to truncate the directory path. 9 years ago
Dominik Ritter 2b00d09bfb Added documentation. 9 years ago
Dominik Ritter 84dfa02a89 Updated the os-icon prompt to newest coding guidelines. 9 years ago
Dominik Ritter 880a715b9c Merge branch 'master' into dritter/os_detection 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
Dominik Ritter 114470ea43 simple-mode deactivated. With that option on, vcs_info doesn't detect the repository state correctly. 9 years ago
Dominik Ritter 59cd8a71fa When opening this file in VIM set "expanded tabs"-option and set encoding to "utf8". 9 years ago
Dominik Ritter 0226f871f6 Fix the branch icon and whitespaces in the vcs segment. 9 years ago
Dominik Ritter 008512cc79 Merge branch 'master' into dritter/developers_guide 9 years ago
Ben Hilburn 772c9ab85d README: Updating for branch icon, ToC 9 years ago
Ben Hilburn b455526ecc Merge pull request #46 from dritter/dritter/branch_icon
Add flag to enable / disable branch icon in VCS prompt. Defaults to `off`.
9 years ago
Ben Hilburn 4bbbefd500 Merge pull request #45 from dritter/dritter/symfony2_version
Added a segment that shows the Symfony2 version number.
9 years ago
Ben Hilburn c4cac7eaa8 Merge pull request #44 from dritter/dritter/vagrant-vm
Fixed oh-my-zsh test installation in vagrant VM.
9 years ago