summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #912 from brandon14/laravel_pormpt_fixBen Hilburn2018-07-232-9/+9
|\ | | | | [Bugfix] Fix error in laravel_version when artisan is not present
| * Missed a parenthesis here.Brandon Clothier2018-07-231-1/+1
| |
| * Drop grep usage in favor of zsh regex testBrandon Clothier2018-07-181-2/+2
| |
| * Fix error in laravel_version when artisan is not presentBrandon Clothier2018-07-152-8/+8
| |
* | Merge pull request #915 from onaforeignshore/fix_truncate_to_uniqueBen Hilburn2018-07-191-17/+29
|\ \ | | | | | | [Bugfix] Fix for "truncate_to_unique" strategy
| * | truncate_to_unique - simplified the codeChristo Kotze2018-07-181-44/+23
| | |
| * | Changed getUniqueHomeFolder to use $HOMEChristo Kotze2018-07-181-3/+2
| | | | | | | | | | | | | | | It is a Posix specification that $HOME be set, so we can use that. See http://pubs.opengroup.org/onlinepubs/009695399/basedefs/xbd_chap08.html
| * | Fix for "truncate_to_unique" strategyChristo Kotze2018-07-171-4/+38
| |/
* | Merge pull request #916 from AlexaraWu/patch/pyenvBen Hilburn2018-07-181-1/+5
|\ \ | | | | | | Additional fix to `pyenv` segment
| * | Fix `pyenv` segmentAlexara Wu2018-07-171-1/+5
|/ /
* | Merge pull request #900 from AlexaraWu/patch/pyenvBen Hilburn2018-07-162-11/+29
|\ \ | |/ |/| Fix `pyenv` segment
| * Improve conditions in `rbenv` & `pyenv`Alexara Wu2018-07-141-2/+2
| |
| * Improve `rbenv` as wellAlexara Wu2018-07-141-17/+12
| |
| * Improve command checkAlexara Wu2018-07-141-2/+2
| |
| * Fix `pyenv` segmentAlexara Wu2018-07-112-6/+29
| |
* | Merge pull request #905 from ↵Ben Hilburn2018-07-132-4/+2
|\ \ | | | | | | | | | | | | robobenklein/robobenklein/defined-variable-performance-hotfix [performance] Defined function 2-20 times speedup
| * | Replace `typeset` check with shellvar flagBen Klein2018-07-121-3/+1
| | | | | | | | | | | | More performance without changing functionality.
| * | Replace [[-v with `defined`Ben Klein2018-07-111-1/+1
| |/ | | | | | | For zsh 5.1 compatibility.
* | Merge pull request #902 from dritter/fix_context_readmeBen Hilburn2018-07-131-0/+11
|\ \ | | | | | | Add new states to context segment in README
| * | Update to `context` segment READMEBen Hilburn2018-07-131-6/+6
| | | | | | | | | Just some minor spelling fixes.
| * | Add new states to context segment in READMEDominik Ritter2018-07-121-0/+11
| |/
* | Merge pull request #904 from dritter/fix_statusBen Hilburn2018-07-133-1/+93
|\ \ | |/ |/| FIx status segment
| * Add tests for status segmentDominik Ritter2018-07-132-0/+86
| |
| * FIx status segmentDominik Ritter2018-07-121-1/+7
|/
* Fix kubernetes segmentDominik Ritter2018-07-091-1/+1
|
* Merge branch 'master' into nextBen Hilburn2018-07-091-1/+1
|\
| * Merge pull request #891 from krmcbride/patch-1Ben Hilburn2018-07-071-1/+1
| |\ | | | | | | kubecontext: fix context, namespace comparison
| | * kubecontext: fix context, namespace comparisonKevin McBride2018-07-021-1/+1
| |/
* | Merge pull request #888 from blackb1rd/Fix_os_detection_for_MSYS2Ben Hilburn2018-07-071-1/+1
|\ \ | | | | | | Fix os detection for MSYS
| * | Fix os detection for MSYS2blackb1rd2018-06-301-1/+1
| | |
* | | Merge pull request #886 from dritter/github_templatesBen Hilburn2018-07-062-0/+67
|\ \ \ | |/ / |/| | Add GitHub templates
| * | Update PR TemplateBen Hilburn2018-07-061-14/+32
| | | | | | | | | Adding more detail to the PR template first created by @dritter!
| * | Updating the Issue TemplateBen Hilburn2018-07-061-15/+33
| | | | | | | | | Building on the issue template from @dritter.
| * | Add link to troubleshooting guide in issue templateDominik Ritter2018-06-291-0/+3
| | |
| * | Add github templates for issue reports and new pull requestsDominik Ritter2018-06-292-0/+28
| | |
* | | Updating CHANGELOG for v0.6.5Ben Hilburn2018-06-291-1/+21
|/ /
* | Merge pull request #859 from dritter/staging_065Ben Hilburn2018-06-2515-107/+462
|\ \ | | | | | | Merging the staging branch for 0.6.5!
| * | Fix java_version segmentDominik Ritter2018-06-201-1/+6
| | |
| * | Fix testsDominik Ritter2018-06-201-1/+1
| | |
| * | Merge remote-tracking branch 'softmoth/clean-right-margin' into staging_065Dominik Ritter2018-06-201-1/+10
| |\ \
| | * | Hide one-space indent at right marginTim Smith2018-06-151-1/+10
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ZSH displays the right prompt indented one space from the right margin. This can be tweaked with ZLE_RPROMPT_INDENT=0, but that makes display problems very likely and I don't recommend it. But all is not lost. The %E prompt format does continue the current background color through that last indent space. So it can *look* like our prompt goes right up to the margin, if: 1) We remove the trailing space from the last segment, and 2) We add %E before clearing the background color
| * | Use cog glyph on all modesDominik Ritter2018-06-171-4/+4
| | |
| * | Mute errors when asking for java versionDominik Ritter2018-06-171-1/+1
| | |
| * | Fix variable in READMEDominik Ritter2018-06-111-1/+3
| | | | | | | | | | | | | | | - Fix the variable name for the VCS shorten strategy. - Add a heading for VCS truncation.
| * | Fix `rbenv` segment after mergeDominik Ritter2018-06-091-1/+2
| | |
| * | Fix travis buildDominik Ritter2018-06-073-3/+4
| | |
| * | Add tests for laravel version segment to travisDominik Ritter2018-06-072-0/+70
| | |
| * | Add a Laravel version segmentDominik Ritter2018-06-074-0/+24
| | |
| * | Merge remote-tracking branch 'ytang/fix-icons-cut-off' into staging_065Dominik Ritter2018-06-077-22/+26
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts were: - test/segments/command_execution_time.spec and test/segments/go_version.spec: All conflicts come from renaming color names on next (#703) and adding a whitespace to the Visual Identifier (#854) on master.
| | * | Add comments about the whitespace and coloringYang Tang2018-06-011-2/+6
| | | |