Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dritter-vcs_cleanup' into next | Ben Hilburn | 2015-10-18 | 1 | -47/+45 |
|\ | |||||
| * | 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 | 2 | -430/+95 |
| |\ | |||||
| * | | 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 | 2 | -0/+12 |
|\ \ \ | | | | | | | | | Add nvm prompt segment | ||||
| * | | | Add note about NVM to the readme | Alex LaFroscia | 2015-10-14 | 1 | -0/+1 |
| | | | | |||||
| * | | | 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 |
| |/ / | |||||
* | | | README: changing name of `todo.txt` segment to `todo` | Ben Hilburn | 2015-10-18 | 1 | -1/+1 |
| | | | |||||
* | | | reverting unnoticed white space change | rjorgenson | 2015-10-17 | 1 | -1/+1 |
| | | | |||||
* | | | added prompt segment for todo.txt task number | rjorgenson | 2015-10-17 | 2 | -1/+15 |
|/ / | |||||
* | | Merge branch 'readme-v2' into next | Ben Hilburn | 2015-10-13 | 1 | -428/+94 |
|\ \ | |||||
| * | | README: one more wiki link to ToC | Ben Hilburn | 2015-10-13 | 1 | -0/+2 |
| | | | |||||
| * | | README: Add link to Wiki at end of README | Ben Hilburn | 2015-10-13 | 1 | -0/+6 |
| | | | |||||
| * | | README: Cleaning up ToC | Ben Hilburn | 2015-10-13 | 1 | -5/+6 |
| | | | |||||
| * | | README: Final cleanup | Ben Hilburn | 2015-10-13 | 1 | -5/+5 |
| | | | |||||
| * | | README: Moving styling to the wiki | Ben Hilburn | 2015-10-13 | 1 | -121/+8 |
| | | | |||||
| * | | README: I'm good at markdown | Ben Hilburn | 2015-10-13 | 1 | -3/+3 |
| | | | |||||
| * | | README: Adding ToC | Ben Hilburn | 2015-10-13 | 1 | -0/+6 |
| | | | |||||
| * | | README: Fixing install instruction bullets | Ben Hilburn | 2015-10-13 | 1 | -0/+1 |
| | | | |||||
| * | | README: cleanup | Ben Hilburn | 2015-10-13 | 1 | -29/+7 |
| | | | |||||
| * | | README: Fixing some segment links | Ben Hilburn | 2015-10-13 | 1 | -9/+9 |
| | | | |||||
| * | | README: Creating links for each segment section | Ben Hilburn | 2015-10-13 | 1 | -60/+18 |
| | | | |||||
| * | | README: moving lots of information to the Wiki | Ben Hilburn | 2015-10-13 | 1 | -244/+71 |
| |/ | |||||
* | | Merge pull request #109 from jkoelndorfer/next | Ben Hilburn | 2015-10-12 | 1 | -2/+1 |
|\ \ | |/ |/| | Fixing issue where BSD detection can bleed info to stdout. | ||||
| * | 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 pull request #108 from V1rgul/next | Ben Hilburn | 2015-09-29 | 1 | -25/+41 |
|\ | | | | | Added awesome fontconfig for next icons | ||||
| * | 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 | 2 | -0/+33 |
|\ | | | | | Added awesome-fontconfig support | ||||
| * | Added awesome fontconfig support | v1rgul | 2015-09-27 | 2 | -0/+33 |
| | | |||||
* | | Merge pull request #104 from dritter/vi_mode_cleanup | Ben Hilburn | 2015-09-28 | 2 | -11/+46 |
|\ \ | | | | | | | 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 |
| | | | |||||
| * | | Added documentation. | Dominik Ritter | 2015-09-22 | 1 | -1/+21 |
| | | | |||||
| * | | 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 | 2 | -32/+32 |
|\ \ \ | | | | | | | | | status vs longstatus cleanup | ||||
| * | | | There is now no difference between longstatus and status any more. Just use ↵ | Dominik Ritter | 2015-09-20 | 2 | -32/+32 |
| |/ / | | | | | | | | | | | | | | | | status, and if you just want to display it conditionally set POWERLEVEL9K_STATUS_VERBOSE=false. Also here I unified the use of named color codes to make the subsegment-display work. | ||||
* | | | Merge pull request #102 from dritter/flat_subsegments | Ben Hilburn | 2015-09-28 | 1 | -0/+2 |
|\ \ \ | |/ / |/| | | Added subsegments in flat-mode. | ||||
| * | | Added subsegments in flat-mode. | Dominik Ritter | 2015-09-20 | 1 | -0/+2 |
|/ / | |||||
* | | Merge branch 'master' into next | Ben Hilburn | 2015-09-20 | 1 | -2/+3 |
|\| | |||||
| * | Merge pull request #99 from giladgo/master | Ben Hilburn | 2015-09-20 | 2 | -3/+4 |
| |\ | | | | | | | README: propely reflect difference between status and longstatus | ||||
| | * | Make docs reflect difference between status and longstatus | Gilad Goldberg | 2015-09-19 | 2 | -3/+4 |
| |/ | |||||
| * | 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 #98 from christian-schulze/vi-mode-segment | Ben Hilburn | 2015-09-20 | 2 | -0/+11 |
|\ \ | | | | | | | Add vi-mode segment |