aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into pr/merge-masterChristian Höltje2017-07-134-3/+55
|\
| * Adding Code of ConductBen Hilburn2017-07-121-0/+46
| | | | | | Slightly modified version of Contributors Covenant.
| * Merge pull request #547 from D-side/patch-1Ben Hilburn2017-07-121-1/+1
| |\ | | | | | | Fixed RVM segment for usernames with dashes
| | * Fixed RVM segment for usernames with dashesPavel Peganov2017-06-111-1/+1
| |/ | | | | Having a username with a dash, such as mine, `d-side`, currently results in RVM segment displaying the wrong thing, e. g. `side/.rvm/rubies/ruby`. This fixes the issue.
| * Merge pull request #535 from zikes/go_iconBen Hilburn2017-05-283-2/+8
| |\ | | | | | | Add Gopher icon to go_version segment
| | * set GO_ICON manually in testJason Hutchinson2017-05-261-2/+3
| | |
| | * update testJason Hutchinson2017-05-261-1/+2
| | |
| | * add Gopher icon to go_version segmentJason Hutchinson2017-05-262-1/+5
| |/
* | Merge pull request #567 from docwhat/pr/dockerBen Hilburn2017-07-1236-3/+534
|\ \ | | | | | | test-in-docker: quickly test frameworks in docker
| * | test-in-docker: Support for multiple ZSH versionsChristian Höltje2017-07-1217-66/+264
| | | | | | | | | | | | | | | -z --zsh can specify one of the versions of ZSH we can get from centos and ubuntu
| * | test-in-docker: quickly test frameworks in dockerChristian Höltje2017-07-1233-3/+336
| | | | | | | | | | | | | | | | | | | | | | | | | | | This adds `./test-in-docker` for quickly playing with various frameworks. All the containers are based off Ubuntu 14.04 which has ZSH 5.0.2. Thanks to @dritter for figuring out all the framework installation methods.
* | | Merge pull request #562 from docwhat/pr/cleanup-directory-detectionBen Hilburn2017-07-121-42/+25
|\ \ \ | | | | | | | | Cleaned up installation directory detection
| * | | Cleaned up installation directory detectionChristian Höltje2017-07-121-42/+25
| |/ / | | | | | | | | | | | | | | | | | | | | | - Used ZSH built-in magic to get the installation directory. - Works with symlinks. - No longer calls out to external program 'dirname'. - Fixed issue with spaces in the path. - No longer leak the variables 'filename' and 'script_location'.
* | | Merge pull request #554 from derekbassett/Prompt_Hang_Kubecontext_MinikubeBen Hilburn2017-07-121-1/+1
|\ \ \ | |/ / |/| | Fixed prompt hangs on kubectl version command
| * | Resolves issue #553 where prompt hangs on kubectl version.Derek Bassett2017-06-261-1/+1
|/ /
* | Fixes for README and CHANGELOG re: `vpn` segment.Ben Hilburn2017-06-022-2/+2
| |
* | Updating CHANGELOG with new `vpn` segmentBen Hilburn2017-06-021-0/+4
| |
* | Merge pull request #539 from golgoth31/nextBen Hilburn2017-06-023-6/+30
|\ \ | | | | | | add vpn ip to prompt
| * \ Merge branch 'next' into nextBen Hilburn2017-06-026-0/+126
| |\ \ | |/ / |/| |
* | | Updating README and CHANGELOGBen Hilburn2017-06-022-0/+23
| | |
* | | add kubecontext test spec file to travis buildJordan Taylor2017-05-281-0/+1
| | |
* | | add testsJason Hutchinson2017-05-261-0/+80
| | |
* | | empty namespace value is 'default'Jason Hutchinson2017-05-261-0/+4
| | |
* | | fix variable name typoJason Hutchinson2017-05-261-2/+2
| | |
* | | use p9k print_icon for kubecontext segmentJason Hutchinson2017-05-262-1/+5
| | |
* | | added the current context prompt for your kubectl configJordan Taylor2017-05-261-0/+14
| | |
| * | add vpn ip to promptDavid Sabatie2017-05-313-6/+30
|/ /
* | Merge branch 'master' into nextBen Hilburn2017-05-252-2/+48
|\|
| * Merge pull request #473 from zikes/patch-1Ben Hilburn2017-05-232-2/+48
| |\ | | | | | | Only show go_version segment if inside GOPATH
| | * test that go_segment prints nothing if GOPATH is not setJason Hutchinson2017-04-191-0/+23
| | |
| | * test that go_segment prints nothing if GOPATH is set but is not a subset of PWDJason Hutchinson2017-04-191-0/+11
| | |
| | * update go mock to allow for both version and env sub-commandsJason Hutchinson2017-04-191-1/+8
| | |
| | * ensure go_version segment prints if PWD is subset of non-empty GOPATHJason Hutchinson2017-04-191-0/+3
| | |
| | * Redirect stderr for GOPATH check to /dev/nullJason Hutchinson2017-04-131-1/+1
| | | | | | | | | Accounts for instances where `go` binary is not installed.
| | * only show go_version segment if inside GOPATHJason Hutchinson2017-04-071-1/+3
| | | | | | | | | As of Go v1.8 GOPATH need not be set, as it will default to $HOME/go. By using `go env GOPATH` to retrieve the value first, this technique will work regardless of whether GOPATH is currently set by the user.
* | | Moving some parts of README to the Wiki.Ben Hilburn2017-05-251-30/+17
| | |
* | | Merge branch 'host_user' of https://github.com/onaforeignshore/powerlevel9k ↵Ben Hilburn2017-05-252-4/+4
|\ \ \ | | | | | | | | | | | | into onaforeignshore-host_user
| * | | updated to fix copy/pasteChristo Kotze2017-05-231-2/+2
| | | |
| * | | updated render check logicChristo Kotze2017-05-231-2/+2
| | | |
* | | | Merge branch 'host_user' of https://github.com/onaforeignshore/powerlevel9k ↵Ben Hilburn2017-05-233-0/+114
|\| | | | | | | | | | | | | | | into onaforeignshore-host_user
| * | | Revised User segment in README.mdChristo Kotze2017-04-271-0/+6
| | | |
| * | | Removed POWERLEVEL9K_ALWAYS_SHOW_CONTEXTChristo Kotze2017-04-271-2/+2
| | | |
| * | | host and user segmentsChristo Kotze2017-04-203-1/+109
| | | |
* | | | Merge branch 'next' of github.com:bhilburn/powerlevel9k into nextBen Hilburn2017-05-231-7/+10
|\ \ \ \
| * \ \ \ Merge pull request #531 from shibumi/nextBen Hilburn2017-05-231-2/+2
| |\ \ \ \ | | | | | | | | | | | | swapped colors for virtualization detection
| | * | | | swapped colors for virtualization detection, black on yellow was pain for ↵Christian Rebischke2017-05-211-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | the eyes
| * | | | | Merge pull request #526 from docwhat/pr/nvm-currentBen Hilburn2017-05-231-5/+8
| |\ \ \ \ \ | | | | | | | | | | | | | | nvm: improve default detection
| | * | | | | nvm: improve default detectionChristian Höltje2017-05-131-5/+8
| | |/ / / / | | | | | | | | | | | | | | | | | | This is also (marginally) faster than before.
* | | | | | Merge branch 'master' into nextBen Hilburn2017-05-231-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | / / | | |_|/ / | |/| | |
| * | | | Merge branch 'moxon6-master'Ben Hilburn2017-05-231-1/+1
| |\ \ \ \