Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #214 from dritter/fix_vcs_foreground_color | Ben Hilburn | 2016-02-26 | 2 | -20/+25 |
|\ | | | | | Allowing VCS Foreground Color to be over-rideable. | ||||
| * | Clean up states in VCS segment | Dominik Ritter | 2016-02-26 | 1 | -5/+13 |
| | | |||||
| * | Fix dynamic coloring of VCS segment | Dominik Ritter | 2016-02-18 | 2 | -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/215 | Ben Hilburn | 2016-02-21 | 2 | -2/+19 |
|\ \ | |/ |/| | Improve the rbenv prompt by using `version-name` | ||||
| * | Improve the rbenv prompt by using `version-name` | Nate McCurdy | 2016-02-20 | 2 | -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 Hilburn | 2016-02-18 | 2 | -3/+9 |
| | | |||||
* | | README: Adding Travis-CI status to README | Ben Hilburn | 2016-02-18 | 1 | -0/+1 |
| | | |||||
* | | Merge pull request #212 from dritter/unit_testing | Ben Hilburn | 2016-02-18 | 12 | -1/+492 |
|\ \ | |/ |/| | Adding Unit Tests, supported by Travis-CI | ||||
| * | Fix go test | Dominik Ritter | 2016-02-17 | 1 | -1/+1 |
| | | | | | | | | If no GO is available, there should be no output. | ||||
| * | Add tests for `go_version` | Dominik Ritter | 2016-02-15 | 2 | -0/+41 |
| | | |||||
| * | Add tests for `rust_version` | Dominik Ritter | 2016-02-15 | 2 | -0/+41 |
| | | |||||
| * | Add documentation for Unit Tests | Dominik Ritter | 2016-02-13 | 1 | -0/+14 |
| | | |||||
| * | Run tests on trusty, where ZSH 5.0.2 is available | Dominik Ritter | 2016-02-13 | 1 | -1/+1 |
| | | |||||
| * | Add tests for the dir segment | Dominik Ritter | 2016-02-13 | 2 | -0/+119 |
| | | |||||
| * | Avoid color warning on travis | Dominik Ritter | 2016-02-13 | 1 | -0/+1 |
| | | |||||
| * | Add test for overwriting icons | Dominik Ritter | 2016-02-13 | 1 | -0/+10 |
| | | |||||
| * | Improve isolation of tests | Dominik Ritter | 2016-02-13 | 3 | -3/+4 |
| | | |||||
| * | Add tests for visual identifiers | Dominik Ritter | 2016-02-13 | 1 | -0/+36 |
| | | |||||
| * | Add tests for functions/colors.zsh | Dominik Ritter | 2016-02-12 | 2 | -0/+43 |
| | | |||||
| * | Add tests for functions/utilities.zsh | Dominik Ritter | 2016-02-12 | 1 | -0/+86 |
| | | | | | | | | | | In particular: `defined`, `set_default`, `getRelevantItem` and `segmentShouldBeJoined` | ||||
| * | Add documentation for printSizeHumanReadable | Dominik Ritter | 2016-02-12 | 1 | -0/+3 |
| | | |||||
| * | Add unit tests for printSizeHumanReadable | Dominik Ritter | 2016-02-12 | 2 | -0/+23 |
| | | |||||
| * | Load submodules from HTTPS | Dominik Ritter | 2016-02-12 | 1 | -1/+1 |
| | | |||||
| * | Install ZSH on Travis-CI | Dominik Ritter | 2016-02-12 | 1 | -5/+18 |
| | | |||||
| * | Add Unit-Tests | Dominik Ritter | 2016-02-12 | 4 | -0/+60 |
| | | | | | | | | | | Add unittests via shunit2 (https://github.com/kward/shunit2), that integrate with travis-ci.org. | ||||
* | | Merge pull request #211 from Falkor/feature/better_dirty_check | Ben Hilburn | 2016-02-09 | 1 | -1/+5 |
|\ \ | | | | | | | VCS dirty check even in subdirs | ||||
| * | | mention to git_compare_version | Sebastien Varrette | 2016-02-09 | 1 | -1/+1 |
| | | | | | | | | | | | | Signed-off-by: Sebastien Varrette <Sebastien.Varrette@uni.lu> | ||||
| * | | correct half-dirty detection -- restrict to untracked files | Sebastien Varrette | 2016-02-09 | 1 | -1/+1 |
| | | | | | | | | | | | | Signed-off-by: Sebastien Varrette <Sebastien.Varrette@uni.lu> | ||||
| * | | dirty check even in subdirs | Sebastien Varrette | 2016-02-08 | 1 | -1/+5 |
|/ / | | | | | | | Signed-off-by: Sebastien Varrette <Sebastien.Varrette@uni.lu> | ||||
* | | Merge pull request #208 from dritter/fix_joining | Ben Hilburn | 2016-02-06 | 1 | -2/+2 |
|\ \ | |/ |/| | Fix joining segments from #186 | ||||
| * | Fix joining segments | Dominik Ritter | 2016-02-06 | 1 | -2/+2 |
|/ | |||||
* | Pull PR #204 into `next`. Introduces new VCS state, `untracked` | Ben Hilburn | 2016-02-05 | 3 | -5/+33 |
|\ | |||||
| * | Merging @theminor's changes from PR #204 | Ben Hilburn | 2016-02-05 | 3 | -5/+33 |
|/| | |||||
| * | update CHANGELOG re new UNTRACKED state in vcs segment | John Minor | 2016-01-31 | 1 | -0/+19 |
| | | |||||
| * | Add "_UNTRACKED" option for _VCS to change colors - default yellow | John Minor | 2016-01-28 | 1 | -2/+8 |
| | | |||||
| * | Add VCS_WORKDIR_HALF_DIRTY vrbl for unstaged files | theminor | 2016-01-27 | 1 | -1/+3 |
| | | |||||
* | | Merge branch 'master' into next | Ben Hilburn | 2016-02-05 | 4 | -0/+19 |
|\ \ | |||||
| * \ | Merge pull request #207 from gitter-badger/gitter-badge | Ben Hilburn | 2016-02-05 | 1 | -0/+2 |
| |\ \ | | | | | | | | | Add a Gitter chat badge to README.md | ||||
| | * | | Add Gitter badge | The Gitter Badger | 2016-02-05 | 1 | -0/+2 |
| |/ / | |||||
| * | | Merge pull request #203 from dritter/beanstalk | Ben Hilburn | 2016-02-05 | 4 | -0/+19 |
| |\ \ | | |/ | |/| | Reworked the AWS-Beanstalk segment | ||||
| | * | Added changelog entry. | Dominik Ritter | 2016-01-23 | 1 | -0/+6 |
| | | | |||||
| | * | Reworked the AWS Elastic Beanstalk segment. | Dominik Ritter | 2016-01-23 | 1 | -3/+4 |
| | | | |||||
| | * | More space for the Beanstalk-Icon. | Dominik Ritter | 2016-01-23 | 1 | -3/+3 |
| | | | |||||
| | * | Added documentation for the AWS Beanstalk segment. | Dominik Ritter | 2016-01-23 | 1 | -0/+1 |
| | | | |||||
| | * | Adding command prompt for AWS Elastic Beanstalk environment name. | James Bowman | 2016-01-23 | 2 | -0/+11 |
| |/ | |||||
* | | Merge pull request #205 from dritter/dir_delimiter | Ben Hilburn | 2016-02-05 | 1 | -1/+1 |
|\ \ | | | | | | | Change default dir truncation delimitor to ellipsis | ||||
| * | | Change default dir truncation delimitor to ellipsis | Dominik Ritter | 2016-02-04 | 1 | -1/+1 |
| |/ | |||||
* | | Merge pull request #198 from dritter/vcs_customizable | Ben Hilburn | 2016-02-05 | 1 | -2/+4 |
|\ \ | | | | | | | VCS-hooks customizable | ||||
| * | | Made the VCS-hooks customizable. | Dominik Ritter | 2016-01-23 | 1 | -2/+4 |
| |/ | |||||
* | | Merge pull request #181 from dritter/split_up_ram_segment | Ben Hilburn | 2016-02-05 | 4 | -47/+47 |
|\ \ | | | | | | | Split up `ram` segment into `ram` and `swap`. |