aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* DETACHED_HEAD handlingNiccolò Maggioni2016-03-221-0/+2
|
* Git tag not replacing branchNiccolò Maggioni2016-03-221-1/+1
|
* Merge pull request #230 from sabricot/docker_machineBen Hilburn2016-03-223-1/+14
|\ | | | | Add a new segment for current active docker machine
| * Fix typo about docker in READMEsabricot2016-03-061-1/+1
| |
| * Add a docker machine segmentsabricot2016-03-063-1/+14
| |
* | Merge pull request #233 from wadkar/nvm_return_if_noneBen Hilburn2016-03-221-1/+1
|\ \ | |/ |/| Fix NVM prompt to return if not used
| * Combine two checks into oneSudarshan Wadkar2016-03-171-2/+1
| |
| * Fix NVM prompt to return if not usedSudarshan Wadkar2016-03-151-0/+1
| | | | | | | | | | | | | | | | | | | | This commit changes nvm prompt setup to return immediately if no node version is installed/available. Currently, prompt complains for lack of global node version. Specifically, if you install nvm (from brew or manually) and do not have global node installed (or set), then the prompt should not set or show anything. This commit ensures this by immediately returning if `nvm current` returns "none".
* | readme: more touchup to the segment listBen Hilburn2016-03-061-2/+4
| |
* | readme: add horizontal barBen Hilburn2016-03-061-0/+2
| |
* | readme: code-as-links transition in segment listBen Hilburn2016-03-061-30/+30
| |
* | readme: testing code-as-link in MD codeBen Hilburn2016-03-061-2/+2
| |
* | readme: re-organizing the segment listBen Hilburn2016-03-051-20/+35
| |
* | Merge pull request #228 from wadkar/next_chruby_promptBen Hilburn2016-03-052-1/+13
|\| | | | | Add chruby prompt segment.
| * Update README.md with `chruby` prompt infoSudarshan Wadkar2016-03-051-1/+2
| |
| * [WIP] Rebase to origin:next branchSudarshan Wadkar2016-03-041-0/+11
|/
* Fixing #217, also making the `actionformats` color configurable in VCS segment.Ben Hilburn2016-03-041-3/+4
|\
| * Fixed actionformat color codingBen Hilburn2016-03-041-2/+1
| |
| * trying to debug color code that won't deref in `vcs_states`Ben Hilburn2016-03-041-3/+5
|/
* Merge branch 'master' into next. Fixes Symfony typo in README.Ben Hilburn2016-03-031-3/+9
|\
| * Merge pull request #223 from B-Galati/patch-1Ben Hilburn2016-03-021-3/+3
| |\ | | | | | | Fix typo about Symfony2 in README
| | * Fix typo about Symfony2 in READMEBenoit GALATI2016-03-021-3/+3
| |/
* | Merge pull request #221 from dritter/fix_vcs_testBen Hilburn2016-02-271-1/+5
|\ \ | | | | | | Fix VCS Travis Test for git version
| * | Fix testDominik Ritter2016-02-261-1/+5
|/ /
* | Merge pull request #220 from dritter/rename_vcs_default_stateBen Hilburn2016-02-265-4/+92
|\ \ | | | | | | Rename vcs default state
| * | Fix untracked state of the vcs segmentDominik Ritter2016-02-261-1/+1
| | |
| * | Add tests for dynamic color overriding of vcs segmentDominik Ritter2016-02-262-0/+78
| | |
| * | Rename VCS default state to `clean`Dominik Ritter2016-02-262-3/+13
| | |
* | | Merge pull request #219 from rmad17/nodeenv-supportBen Hilburn2016-02-262-0/+10
|\ \ \ | |/ / |/| | Adding `nodeenv` segment.
| * | Updated READMErmad172016-02-261-0/+1
| | |
| * | Fixed name issuermad172016-02-261-3/+3
| | |
| * | Added nodeenv supportrmad172016-02-261-16/+8
| | |
| * | Nodeenv workrmad172016-02-261-0/+17
| |/
* | Merge pull request #214 from dritter/fix_vcs_foreground_colorBen Hilburn2016-02-262-20/+25
|\ \ | | | | | | Allowing VCS Foreground Color to be over-rideable.
| * | Clean up states in VCS segmentDominik Ritter2016-02-261-5/+13
| | |
| * | Fix dynamic coloring of VCS segmentDominik Ritter2016-02-182-15/+12
| | | | | | | | | | | | | | | | | | The VCS segment had a lot of own color definitions. Now they are all gone, so that the only color definitions are when the segment gets printed.
* | | Merge pull request #216 from natemccurdy/issues/215Ben Hilburn2016-02-212-2/+19
|\ \ \ | |/ / |/| | Improve the rbenv prompt by using `version-name`
| * | Improve the rbenv prompt by using `version-name`Nate McCurdy2016-02-202-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior to this, the rbenv prompt only showed something if the $RBENV_VERSION environment variable was set. This was not a complete solution because rbenv can be configured locally, per directory, with dotfiles. When using dotfiles, the $RBENV_VERSION variables is not set. This fixes the issue by taking the output of the `rbenv version-name` command which shows the real rbenv version being used based on any of the 4 ways to change rbenv as shown here: https://github.com/rbenv/rbenv#choosing-the-ruby-version If the current version of Ruby being used is the same as the global Ruby, nothing is shown. This commit also adds documentation to the README that describes the prompt. Fixes issue #215
* | | Reflect submodule status in VCS prompty by default.Ben Hilburn2016-02-182-3/+9
| | |
* | | README: Adding Travis-CI status to READMEBen Hilburn2016-02-181-0/+1
| | |
* | | Merge pull request #212 from dritter/unit_testingBen Hilburn2016-02-1812-1/+492
|\ \ \ | |/ / |/| | Adding Unit Tests, supported by Travis-CI
| * | Fix go testDominik Ritter2016-02-171-1/+1
| | | | | | | | | | | | If no GO is available, there should be no output.
| * | Add tests for `go_version`Dominik Ritter2016-02-152-0/+41
| | |
| * | Add tests for `rust_version`Dominik Ritter2016-02-152-0/+41
| | |
| * | Add documentation for Unit TestsDominik Ritter2016-02-131-0/+14
| | |
| * | Run tests on trusty, where ZSH 5.0.2 is availableDominik Ritter2016-02-131-1/+1
| | |
| * | Add tests for the dir segmentDominik Ritter2016-02-132-0/+119
| | |
| * | Avoid color warning on travisDominik Ritter2016-02-131-0/+1
| | |
| * | Add test for overwriting iconsDominik Ritter2016-02-131-0/+10
| | |
| * | Improve isolation of testsDominik Ritter2016-02-133-3/+4
| | |