summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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 a Gitter chat badge to README.md
| | * Add Gitter badgeThe Gitter Badger2016-02-051-0/+2
| |/
| * Merge pull request #203 from dritter/beanstalkBen Hilburn2016-02-054-0/+19
| |\ | | | | | | Reworked the AWS-Beanstalk segment
| | * 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 ellipsis
| * | 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
|\ \ | | | | | | VCS-hooks customizable
| * | 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
|\ \ | | | | | | Split up `ram` segment into `ram` and `swap`.
| * | Split up `ram` segment into `ram` and `swap`.Dominik Ritter2016-01-234-47/+47
| |/
* | Merge pull request #202 from dritter/join_conditional_segmentsBen Hilburn2016-02-052-27/+91
|\ \ | |/ |/| Allows the use of `_join` on conditional segments.
| * Joining conditional segments now work as expected. If between the lastDominik Ritter2016-01-232-44/+82
| | | | | | | | | | | | printed segment is a full but conditional segment, the joined one gets promoted. This fixes #186
| * Use explicit word splitting. No need to set SH_WORD_SPLITDominik Ritter2016-01-231-4/+4
| |
| * First try: Now joined segments are promoted to "full" segments, if theirDominik Ritter2016-01-231-4/+30
|/ | | | predecessor was conditional and had no output.
* README: Arrghhhhh. Newlines in tables breaking things.Ben Hilburn2016-01-231-3/+1
|
* README: Documenting new background_jobs featureBen Hilburn2016-01-231-1/+9
|
* README: Updating language about ZSH frameworksBen Hilburn2016-01-231-3/+5
|
* Syntax fix.Dominik Ritter2016-01-221-1/+1
|
* Merge pull request #201 from Kayant/zsh-frameworksBen Hilburn2016-01-221-3/+2
|\ | | | | Add more ZSH framework instructions
| * Fix spacing derpAnthony2016-01-221-1/+1
| |
| * Add more ZSH framework instructionsKayant2016-01-201-2/+2
| | | | | | | | | | | | | | *Zgen *Antibody *ZPM *ZIM
| * Improve zsh framework install description and add zplugKayant2016-01-171-3/+2
| |
* | Merge pull request #200 from V1rgul/nextBen Hilburn2016-01-222-2/+15
|\ \ | |/ |/| background_jobs segment : add number of jobs if >1
| * add background_jobs change in changelogv1rgul2016-01-221-0/+7
| |
| * fix wc glitch on OSXv1rgul2016-01-221-1/+1
| |
| * background_jobs: show number if verbosev1rgul2016-01-181-2/+8
| |
| * Merge pull request #1 from bhilburn/nextV1rgul2016-01-187-1013/+1393
| |\ | |/ |/| Merge original repo
* | README: Added a tl;drBen Hilburn2016-01-171-3/+6
| |
* | Merge pull request #197 from dritter/changelog_additionsBen Hilburn2016-01-171-0/+11
|\ \ | | | | | | Changelog entries added for 'HOME_SUBFOLDER' state of the `dir` segment.
| * | Changelog entries added for 'HOME_SUBFOLDER' state of the `dir` segment.Dominik Ritter2016-01-171-0/+11
|/ /
* | README: Minor cleanupsBen Hilburn2016-01-171-5/+4
| |
* | README: Turns out you can't linebreak in tables.Ben Hilburn2016-01-171-15/+5
| |
* | README: Trying out tables to describe variables.Ben Hilburn2016-01-171-91/+97
| |
* | Merge pull request #196 from rjorgenson/nextBen Hilburn2016-01-171-2/+2
|\ \ | | | | | | added space to end of RVM icon
| * | added space to end of RVM iconrjorgenson2016-01-171-2/+2
|/ /
* | Merge pull request #195 from dritter/minor_improvementsBen Hilburn2016-01-172-4/+4
|\ \ | | | | | | Minor improvements to README `dir` section
| * | Added "visual identifier" concept to `icons_test` segment.Dominik Ritter2016-01-171-1/+1
| | |
| * | Improved dir icon descriptions.Dominik Ritter2016-01-171-3/+3
|/ /
* | Merge pull request #193 from rjorgenson/nextBen Hilburn2016-01-161-1/+1
|\ \ | | | | | | fixing segment call for new state implementation in prompt_load
| * | fixing segment call for new state implementation in prompt_loadrjorgenson2016-01-161-1/+1
|/ /
* | Merge pull request #191 from rjorgenson/nextBen Hilburn2016-01-161-1/+2
|\ \ | | | | | | added check for nvm command before running
| * | fixed conditional statementRobert Jorgenson2016-01-151-1/+1
| | |
| * | reworked nvm checkRobert Jorgenson2016-01-151-7/+6
| | | | | | | | | Now the prompt segment just returns without doing anything if nvm is not present.
| * | don't output segment if node_version was not populatedRobert Jorgenson2016-01-151-1/+1
| | |
| * | fixed called to ioreg on OS X machinesrjorgenson2016-01-141-1/+1
| | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-20 16:51:52 +0300