Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into next | Ben Hilburn | 2015-10-22 | 1 | -2/+2 |
|\ | |||||
| * | Merge pull request #123 from martinpelikan/master | Ben Hilburn | 2015-10-22 | 1 | -1/+1 |
| |\ | | | | | | | Fixes #122, SI prefixes should be evaluated as strings. | ||||
| | * | Fixes #122, SI prefixes should be evaluated as strings. | Martin Pelikan | 2015-10-18 | 1 | -1/+1 |
| | | | |||||
| * | | Rephrasing of error message when TERM not 256 color | Daniel Gordon | 2015-10-19 | 1 | -1/+1 |
| |/ | | | | | | | | | - Literal command to be added is highlighted in blue - Now beginners won't try to add an incorrect command to ~/.zshrc | ||||
* | | Merge pull request #126 from rjorgenson/next | Ben Hilburn | 2015-10-22 | 1 | -0/+74 |
|\ \ | | | | | | | added a prompt segment to display battery status on laptops | ||||
| * | | fixed some edge cases I ran into during usage of the linux segment | rjorgenson | 2015-10-19 | 1 | -2/+7 |
| | | | |||||
| * | | added time remaining support to battery segment on Linux | rjorgenson | 2015-10-19 | 1 | -0/+4 |
| | | | |||||
| * | | added Linux support to battery prompt segment | rjorgenson | 2015-10-19 | 1 | -15/+35 |
| | | | |||||
| * | | editor automatically removed whitespace | rjorgenson | 2015-10-18 | 1 | -1/+1 |
| | | | |||||
| * | | fixed output string color declaration | rjorgenson | 2015-10-18 | 1 | -1/+1 |
| | | | |||||
| * | | added battery prompt segment usable on OS X systems | rjorgenson | 2015-10-18 | 1 | -1/+46 |
| | | | |||||
* | | | Merge pull request #127 from dritter/go_prompt | Ben Hilburn | 2015-10-22 | 1 | -0/+10 |
|\ \ \ | | | | | | | | | Adding Go version segment. | ||||
| * | | | Merge branch 'next' into go_prompt | Dominik Ritter | 2015-10-19 | 1 | -57/+83 |
| |\| | | |||||
| * | | | Merge remote-tracking branch 'ben/next' into go_prompt | Dominik Ritter | 2015-10-16 | 1 | -2/+1 |
| |\ \ \ | | | |/ | | |/| | |||||
| * | | | Merge branch 'next' into go_prompt | Dominik Ritter | 2015-09-30 | 1 | -104/+158 |
| |\ \ \ | |||||
| * | | | | Added a segment that shows the current GO version number. | Dominik Ritter | 2015-09-21 | 1 | -0/+10 |
| | | | | | |||||
* | | | | | Merge branch 'next' into ram_prompt | Dominik Ritter | 2015-10-20 | 1 | -57/+83 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | Merge pull request #118 from dritter/whitespace_customization | Ben Hilburn | 2015-10-18 | 1 | -7/+9 |
| |\ \ \ \ | | | | | | | | | | | | | Made whitespaces between segment separators customizable | ||||
| | * | | | | Made whitespaces between segment separators customizable. | Dominik Ritter | 2015-10-16 | 1 | -7/+9 |
| | | |_|/ | | |/| | | |||||
| * | | | | Merge pull request #117 from dritter/vi_customizations | Ben Hilburn | 2015-10-18 | 1 | -2/+4 |
| |\ \ \ \ | | | | | | | | | | | | | Make the vi_mode segement more customizable. | ||||
| | * | | | | vi_mode segement more customizable. | Dominik Ritter | 2015-10-16 | 1 | -2/+4 |
| | |/ / / | |||||
| * | | | | Merge branch 'vcs_cleanup' of https://github.com/dritter/powerlevel9k into ↵ | Ben Hilburn | 2015-10-18 | 1 | -47/+45 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | dritter-vcs_cleanup | ||||
| | * | | | | Merge remote-tracking branch 'ben/next' into vcs_cleanup | Dominik Ritter | 2015-10-16 | 1 | -2/+1 |
| | |\| | | | |||||
| | * | | | | Cleanup of VCS-segment. Now `vcs_info` is only invoked, if the user ↵ | Dominik Ritter | 2015-10-11 | 1 | -47/+45 |
| | | |_|/ | | |/| | | | | | | | | | | | | configured to show the `vcs` segment. | ||||
| * | | | | Merge pull request #114 from alexlafroscia/add-nvm-prompt-segment | Ben Hilburn | 2015-10-18 | 1 | -0/+11 |
| |\ \ \ \ | | | | | | | | | | | | | Add nvm prompt segment | ||||
| | * | | | | Add NVM prompt segment | Alex LaFroscia | 2015-10-14 | 1 | -0/+11 |
| | | |/ / | | |/| | | | | | | | | | | | | Prints out the Node version that is currently active if it is different than the default version specified by NVM | ||||
| * | | | | Merge pull request #120 from partp/fix-virtualenv | Ben Hilburn | 2015-10-18 | 1 | -1/+1 |
| |\ \ \ \ | | | | | | | | | | | | | Fixes `VIRTUAL_ENV_DISABLE_PROMPT` condition | ||||
| | * | | | | Fixes `VIRTUAL_ENV_DISABLE_PROMPT` condition | Parth Panchal | 2015-10-17 | 1 | -1/+1 |
| | |/ / / | |||||
| * / / / | added prompt segment for todo.txt task number | rjorgenson | 2015-10-17 | 1 | -0/+13 |
| |/ / / | |||||
* | | | | Merge remote-tracking branch 'ben/next' into ram_prompt | Dominik Ritter | 2015-10-16 | 1 | -2/+1 |
|\| | | | |||||
| * | | | Quote value of IS_BSD_SED. | John Koelndorfer | 2015-10-06 | 1 | -2/+1 |
| |/ / | | | | | | | | | | | | | If this isn't quoted, in can bleed through to stdout in certain circumstances. | ||||
* | | | Merge branch 'ram_prompt' of github.com:dritter/powerlevel9k into ram_prompt | Dominik Ritter | 2015-10-01 | 1 | -25/+26 |
|\ \ \ | |||||
| * | | | Alphabetical order. | Dominik Ritter | 2015-09-26 | 1 | -43/+44 |
| | | | | |||||
| * | | | Corrected calculation of used swap under linux. | Dominik Ritter | 2015-09-26 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge branch 'next' into ram_prompt | Dominik Ritter | 2015-09-30 | 1 | -104/+158 |
|\ \ \ \ | |/ / / |/| / / | |/ / | |||||
| * | | Font Awesome fontconfig new icons (fixed errors) | v1rgul | 2015-09-29 | 1 | -2/+2 |
| | | | |||||
| * | | Font Awesome fontconfig new icons | v1rgul | 2015-09-29 | 1 | -25/+41 |
| | | | |||||
| * | | Minor comment addition for system load prompt segment. | Ben Hilburn | 2015-09-28 | 1 | -0/+1 |
| | | | |||||
| * | | Cleaning up comments around font icon settings. | Ben Hilburn | 2015-09-28 | 1 | -89/+87 |
| | | | |||||
| * | | Merge pull request #106 from V1rgul/master | Ben Hilburn | 2015-09-28 | 1 | -0/+28 |
| |\ \ | | | | | | | | | Added awesome-fontconfig support | ||||
| | * | | Added awesome fontconfig support | v1rgul | 2015-09-27 | 1 | -0/+28 |
| | | | | |||||
| | * | | Make docs reflect difference between status and longstatus | Gilad Goldberg | 2015-09-19 | 1 | -1/+1 |
| | | | | |||||
| | * | | Revert "Merge pull request #91 from tusharsrivastava/master" | Ben Hilburn | 2015-09-17 | 1 | -5/+5 |
| | | | | | | | | | | | | | | | | | | | | This reverts commit 2a2dfdfa295190892deb74207173e5b00af6561c, reversing changes made to 1390fbdea5b278474eafe889da327979654c0d99. | ||||
| * | | | Merge pull request #104 from dritter/vi_mode_cleanup | Ben Hilburn | 2015-09-28 | 1 | -10/+25 |
| |\ \ \ | | | | | | | | | | | VI-mode cleanup | ||||
| | * | | | Better compatibility with shellcheck.net. | Dominik Ritter | 2015-09-23 | 1 | -1/+6 |
| | | | | | |||||
| | * | | | KEYMAP may be "main" or "viins" in VI-Mode. | Dominik Ritter | 2015-09-23 | 1 | -2/+2 |
| | | | | | |||||
| | * | | | code more readable. | Dominik Ritter | 2015-09-22 | 1 | -6/+8 |
| | | | | | |||||
| | * | | | Made VI-Mode plugin working again. | Dominik Ritter | 2015-09-22 | 1 | -0/+8 |
| | | | | | |||||
| | * | | | Shellcheck-support for vi_mode segment & alphabetical order of prompts. | Dominik Ritter | 2015-09-21 | 1 | -10/+10 |
| | | |/ | | |/| | |||||
| * | | | Merge pull request #103 from dritter/status_segment_cleanup | Ben Hilburn | 2015-09-28 | 1 | -30/+24 |
| |\ \ \ | | | | | | | | | | | status vs longstatus cleanup |