aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into nextBen Hilburn2017-11-101-1/+1
|\
| * Merge pull request #667 from akranga/masterBen Hilburn2017-11-101-1/+1
| |\ | | | | | | Add support for both AWS_PROFILE and AWS_DEFAULT_PROFILE
| | * Add support for both AWS_PROFILE and AWS_DEFAULT_PROFILEAntons Kranga2017-11-071-1/+1
| |/
* | Merge pull request #666 from ParthKolekar/patch-1Ben Hilburn2017-11-102-1/+3
|\ \ | | | | | | Allow showing the number of jobs even if there is <= 1 job present.
| * | Updating variable name for always showing jobs countBen Hilburn2017-11-101-2/+2
| | |
| * | Minor README cleanupBen Hilburn2017-11-101-1/+1
| | |
| * | Update README.mdParth Kolekar2017-11-051-0/+1
| | |
| * | Update powerlevel9k.zsh-themeParth Laxmikant Kolekar2017-11-051-1/+2
| |/ | | | | Allow showing the number of jobs even if there is <= 1 job present.
* | Merge branch 'master' into nextBen Hilburn2017-11-022-4/+5
|\|
| * Merge pull request #660 from brianmoran/ISS-650-pythonpath-in-promptBen Hilburn2017-11-021-1/+1
| |\ | | | | | | ISS-650 Fix PYTHONPATH appearing in prompt
| | * ISS-650 Fix PYTHONPATH appearing in promptBrian Moran2017-10-271-1/+1
| | | | | | | | | | | | | | | - Modify prompt_dir function to set current_path based on pwd and replace $HOME with ~
| * | Merge pull request #663 from MarcHauptmann/masterBen Hilburn2017-11-021-1/+2
| |\ \ | | | | | | | | declared variables as 'local'
| | * | declared variables as 'local'Marc Hauptmann2017-10-311-1/+2
| |/ / | | | | | | | | | Prevents warning messages from zsh
| * | Merge pull request #656 from ylluminarious/remove-weird-glyphsBen Hilburn2017-10-271-2/+2
| |\ \ | | | | | | | | remove weird glyphs in README.md
| | * | remove weird glyphs in README.mdGeorge D. Plymale II2017-10-241-2/+2
| |/ /
* | | Merge pull request #661 from derekbassett/fix/kubernetes-promptBen Hilburn2017-11-022-18/+36
|\ \ \ | | | | | | | | Fix/kubernetes prompt
| * | | Fix to unit tests. Also removed unneeded extra call to kubectl.Derek Bassett2017-10-272-13/+29
| | | |
| * | | Added functionality to parse the current namespace regardless of config settingsJordan Taylor2017-10-191-8/+10
|/ / /
* | | Merge branch 'master' into nextBen Hilburn2017-10-183-2/+10
|\| |
| * | Merge pull request #651 from claycephas/more-documentationBen Hilburn2017-10-182-0/+4
| |\ \ | | | | | | | | Add documentation for VCS hooks config
| | * | Add documentation for VCS hooks configClay Anderson2017-10-171-0/+3
| | | |
| | * | Add *.swp to ignoreClay Anderson2017-10-171-0/+1
| | | |
| * | | Merge pull request #647 from sbutler2901/masterBen Hilburn2017-10-181-1/+5
| |\ \ \ | | | | | | | | | | OSX bug fix for prompt_public_ip
| | * | | Bug fix for prompt_public_ip. The OSX date command does not have the -r ↵sbutler29012017-10-121-1/+5
| | |/ / | | | | | | | | | | | | option for getting the last modification time of a file. The stat command is being used instead
| * | | Merge pull request #643 from terencode/patch-1Ben Hilburn2017-10-181-1/+1
| |\ \ \ | | |/ / | |/| | Fix incomplete vpn segment name
| | * | Fix incomplete vpn segment nameTérence Clastres2017-10-071-1/+1
| |/ / | | | | | | The segment function is called *prompt_vpn_ip()* thus the segment needs to be called "vpn_ip".
* | | Merge branch 'master' into nextBen Hilburn2017-10-071-3/+3
|\| |
| * | Fixing `vcs.spec` tests after adding space.Ben Hilburn2017-10-071-3/+3
| | |
* | | Adding `SIG` to signal name, removing `-` sign.Ben Hilburn2017-10-071-1/+1
| | |
* | | Merge branch 'master' into nextBen Hilburn2017-10-072-8/+8
|\| |
| * | Adding a space after VCS_BRANCH_ICON by defaultBen Hilburn2017-10-071-3/+3
| | |
| * | Merge pull request #640 from simonvpe/masterBen Hilburn2017-10-071-1/+1
| |\ \ | | | | | | | | Corrected awesome-fontconfig lock icon
| | * | Corrected awesome-fontconfig lock iconSimon Pettersson2017-10-051-1/+1
| | | |
| * | | Merge pull request #636 from ZeGentzy/masterBen Hilburn2017-10-071-4/+4
| |\ \ \ | | |/ / | |/| | Fixes issue #619
| | * | These probably have similar bugsHal Gentz2017-09-291-3/+3
| | | | | | | | | | | | | | | | Signed-off-by: Hal Gentz <zegentzy@protonmail.com>
| | * | Fixes issue #619Hal Gentz2017-09-291-1/+1
| |/ / | | | | | | | | | Signed-off-by: Hal Gentz <zegentzy@protonmail.com>
* | | Merge pull request #638 from TimothyEarley/dropbox-integrationBen Hilburn2017-10-073-0/+25
|\ \ \ | | | | | | | | Added Dropbox segment
| * | | Updating Dropbox icon for non-awesome fontsBen Hilburn2017-10-071-1/+4
| | | |
| * | | Don't show when dropbox is not runningTimothy Earley2017-10-021-2/+2
| | | |
| * | | Added dropbox segmentTimothy Earley2017-10-013-0/+22
|/ / /
* | | Merge branch 'master' into nextBen Hilburn2017-09-292-25/+32
|\| |
| * | Merge pull request #616 from trashbat/patch-2Ben Hilburn2017-09-291-1/+1
| |\ \ | | | | | | | | Changed "less than" to "fewer than".
| | * | Changed "less than" to "fewer than".trashbat2017-09-051-1/+1
| | | |
| * | | Merge pull request #611 from Typositoire/fix/prompt_kubecontextlocal1Ben Hilburn2017-09-291-1/+1
| |\ \ \ | | |/ / | |/| | Fix prompt_kubecontext:local:1: not valid in this context: Version:
| | * | Fix prompt_kubecontext:local:1: not valid in this context: Version:Yann David2017-08-311-1/+1
| |/ /
| * | Merge pull request #608 from tippl/fix_load_segmentBen Hilburn2017-08-281-21/+28
| |\ \ | | | | | | | | Fix average selection in load segment.
| | * | Fix average selection in load segment.Richard Tippl2017-08-271-21/+28
| |/ / | | | | | | | | | | | | | | | | | | Removed duplicate code selecting which load average to use. Fixed load average selection being in OSX/BSD part of if, making it not work on non OSX/BSD systems. Optimized actually getting the load average.
| * / README: Quick typo fix.Ben Hilburn2017-08-271-1/+1
| |/
| * README: Quick fix to MD formattingBen Hilburn2017-08-261-1/+1
| |
* | Merge pull request #610 from sjoeboo/rbenv_alwaysBen Hilburn2017-09-292-6/+10
|\ \ | | | | | | Add ability to always show rbenv prompt
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-21 00:00:10 +0300