summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #214 from dritter/fix_vcs_foreground_colorBen Hilburn2016-02-262-20/+25
|\
| * Clean up states in VCS segmentDominik Ritter2016-02-261-5/+13
| * Fix dynamic coloring of VCS segmentDominik Ritter2016-02-182-15/+12
* | Merge pull request #216 from natemccurdy/issues/215Ben Hilburn2016-02-212-2/+19
|\ \ | |/ |/|
| * Improve the rbenv prompt by using `version-name`Nate McCurdy2016-02-202-2/+19
* | 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
|\ \ | |/ |/|
| * Fix go testDominik Ritter2016-02-171-1/+1
| * 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
| * Add tests for visual identifiersDominik Ritter2016-02-131-0/+36
| * Add tests for functions/colors.zshDominik Ritter2016-02-122-0/+43
| * Add tests for functions/utilities.zshDominik Ritter2016-02-121-0/+86
| * Add documentation for printSizeHumanReadableDominik Ritter2016-02-121-0/+3
| * Add unit tests for printSizeHumanReadableDominik Ritter2016-02-122-0/+23
| * Load submodules from HTTPSDominik Ritter2016-02-121-1/+1
| * Install ZSH on Travis-CIDominik Ritter2016-02-121-5/+18
| * Add Unit-TestsDominik Ritter2016-02-124-0/+60
* | Merge pull request #211 from Falkor/feature/better_dirty_checkBen Hilburn2016-02-091-1/+5
|\ \
| * | mention to git_compare_versionSebastien Varrette2016-02-091-1/+1
| * | correct half-dirty detection -- restrict to untracked filesSebastien Varrette2016-02-091-1/+1
| * | dirty check even in subdirsSebastien Varrette2016-02-081-1/+5
|/ /
* | Merge pull request #208 from dritter/fix_joiningBen Hilburn2016-02-061-2/+2
|\ \ | |/ |/|
| * Fix joining segmentsDominik Ritter2016-02-061-2/+2
|/
* Pull PR #204 into `next`. Introduces new VCS state, `untracked`Ben Hilburn2016-02-053-5/+33
|\
| * Merging @theminor's changes from PR #204Ben Hilburn2016-02-053-5/+33
|/|
| * update CHANGELOG re new UNTRACKED state in vcs segmentJohn Minor2016-01-311-0/+19
| * Add "_UNTRACKED" option for _VCS to change colors - default yellowJohn Minor2016-01-281-2/+8
| * Add VCS_WORKDIR_HALF_DIRTY vrbl for unstaged filestheminor2016-01-271-1/+3
* | Merge branch 'master' into nextBen Hilburn2016-02-054-0/+19
|\ \
| * \ Merge pull request #207 from gitter-badger/gitter-badgeBen Hilburn2016-02-051-0/+2
| |\ \
| | * | Add Gitter badgeThe Gitter Badger2016-02-051-0/+2
| |/ /
| * | Merge pull request #203 from dritter/beanstalkBen Hilburn2016-02-054-0/+19
| |\ \ | | |/ | |/|
| | * Added changelog entry.Dominik Ritter2016-01-231-0/+6
| | * Reworked the AWS Elastic Beanstalk segment.Dominik Ritter2016-01-231-3/+4
| | * More space for the Beanstalk-Icon.Dominik Ritter2016-01-231-3/+3
| | * Added documentation for the AWS Beanstalk segment.Dominik Ritter2016-01-231-0/+1
| | * Adding command prompt for AWS Elastic Beanstalk environment name.James Bowman2016-01-232-0/+11
| |/
* | Merge pull request #205 from dritter/dir_delimiterBen Hilburn2016-02-051-1/+1
|\ \
| * | Change default dir truncation delimitor to ellipsisDominik Ritter2016-02-041-1/+1
| |/
* | Merge pull request #198 from dritter/vcs_customizableBen Hilburn2016-02-051-2/+4
|\ \
| * | Made the VCS-hooks customizable.Dominik Ritter2016-01-231-2/+4
| |/
* | Merge pull request #181 from dritter/split_up_ram_segmentBen Hilburn2016-02-054-47/+47
|\ \