|  Ben Hilburn | 1a05542901 | Merge pull request #208 from dritter/fix_joining Fix joining segments from #186 | 2016-02-06 11:52:55 -08:00 | 
				
					
						|  Dominik Ritter | e9da3d5146 | Fix joining segments | 2016-02-06 20:07:42 +01:00 | 
				
					
						|  Ben Hilburn | 9e191d4305 | Pull PR #204 into `next`. Introduces new VCS state, `untracked` | 2016-02-05 11:00:08 -08:00 | 
				
					
						|  Ben Hilburn | 4bbff138fb | Merging @theminor's changes from PR #204 | 2016-02-05 10:59:33 -08:00 | 
				
					
						|  Ben Hilburn | 4897c795fa | Merge branch 'master' into next | 2016-02-05 10:57:56 -08:00 | 
				
					
						|  Ben Hilburn | d5ac1735da | Merge pull request #207 from gitter-badger/gitter-badge Add a Gitter chat badge to README.md | 2016-02-05 13:56:29 -05:00 | 
				
					
						|  Ben Hilburn | dfd7ae1f1d | Merge pull request #205 from dritter/dir_delimiter Change default dir truncation delimitor to ellipsis | 2016-02-05 10:49:09 -05:00 | 
				
					
						|  The Gitter Badger | 43e6c80029 | Add Gitter badge | 2016-02-05 15:43:36 +00:00 | 
				
					
						|  Ben Hilburn | 4f4a15de82 | Merge pull request #198 from dritter/vcs_customizable VCS-hooks customizable | 2016-02-05 10:40:20 -05:00 | 
				
					
						|  Ben Hilburn | 25bf6d60a0 | Merge pull request #181 from dritter/split_up_ram_segment Split up `ram` segment into `ram` and `swap`. | 2016-02-05 10:37:28 -05:00 | 
				
					
						|  Ben Hilburn | 65e9438210 | Merge pull request #203 from dritter/beanstalk Reworked the AWS-Beanstalk segment | 2016-02-05 10:34:34 -05:00 | 
				
					
						|  Ben Hilburn | 6072f1e56c | Merge pull request #202 from dritter/join_conditional_segments Allows the use of `_join` on conditional segments. | 2016-02-05 10:33:12 -05:00 | 
				
					
						|  Dominik Ritter | 54254600d1 | Change default dir truncation delimitor to ellipsis | 2016-02-03 22:35:14 +01:00 | 
				
					
						|  John Minor | 177bfc9602 | update CHANGELOG re new UNTRACKED state in vcs segment | 2016-01-31 10:08:09 +00:00 | 
				
					
						|  John Minor | d7c26513c8 | Add "_UNTRACKED" option for _VCS to change colors - default yellow | 2016-01-27 22:52:48 +00:00 | 
				
					
						|  theminor | 3b7dfff7ea | Add VCS_WORKDIR_HALF_DIRTY vrbl for unstaged files | 2016-01-26 17:20:20 -05:00 | 
				
					
						|  Dominik Ritter | 15665a4f95 | Joining conditional segments now work as expected. If between the last printed segment is a full but conditional segment, the joined one gets
promoted.
This fixes #186 | 2016-01-23 01:45:39 +01:00 | 
				
					
						|  Dominik Ritter | ed28b8d26f | Use explicit word splitting. No need to set SH_WORD_SPLIT | 2016-01-23 01:45:39 +01:00 | 
				
					
						|  Dominik Ritter | cd78c66997 | First try: Now joined segments are promoted to "full" segments, if their predecessor was conditional and had no output. | 2016-01-23 01:45:39 +01:00 | 
				
					
						|  Dominik Ritter | 930ae170a4 | Made the VCS-hooks customizable. | 2016-01-23 01:44:22 +01:00 | 
				
					
						|  Dominik Ritter | 45184839f3 | Added changelog entry. | 2016-01-23 01:39:50 +01:00 | 
				
					
						|  Dominik Ritter | eba3a3ca95 | Reworked the AWS Elastic Beanstalk segment. | 2016-01-23 01:35:53 +01:00 | 
				
					
						|  Dominik Ritter | 6763826c4e | More space for the Beanstalk-Icon. | 2016-01-23 01:34:48 +01:00 | 
				
					
						|  Dominik Ritter | a6174e31ea | Added documentation for the AWS Beanstalk segment. | 2016-01-23 01:34:48 +01:00 | 
				
					
						|  James Bowman | af119c9406 | Adding command prompt for AWS Elastic Beanstalk environment name. | 2016-01-23 01:34:01 +01:00 | 
				
					
						|  Dominik Ritter | 6aadf76397 | Split up `ram` segment into `ram` and `swap`. | 2016-01-23 01:27:05 +01:00 | 
				
					
						|  Ben Hilburn | 472fb6f674 | README: Arrghhhhh. Newlines in tables breaking things. | 2016-01-22 16:12:20 -08:00 | 
				
					
						|  Ben Hilburn | bd88fe9637 | README: Documenting new background_jobs feature | 2016-01-22 16:11:41 -08:00 | 
				
					
						|  Ben Hilburn | f58da93481 | README: Updating language about ZSH frameworks | 2016-01-22 16:06:08 -08:00 | 
				
					
						|  Dominik Ritter | c379cf2657 | Syntax fix. | 2016-01-22 19:52:00 +01:00 | 
				
					
						|  Ben Hilburn | 657a097ef0 | Merge pull request #201 from Kayant/zsh-frameworks Add more ZSH framework instructions | 2016-01-21 19:02:01 -08:00 | 
				
					
						|  Ben Hilburn | 8172425cd2 | Merge pull request #200 from V1rgul/next background_jobs segment : add number of jobs if >1 | 2016-01-21 18:59:37 -08:00 | 
				
					
						|  v1rgul | ce72ca3a16 | add background_jobs change in changelog | 2016-01-22 02:11:25 +01:00 | 
				
					
						|  v1rgul | 29b346930b | fix wc glitch on OSX | 2016-01-22 01:56:43 +01:00 | 
				
					
						|  Anthony | 684291e734 | Fix spacing derp | 2016-01-21 21:33:56 +00:00 | 
				
					
						|  Kayant | 193e19f597 | Add more ZSH framework instructions *Zgen
*Antibody
*ZPM
*ZIM | 2016-01-20 13:58:30 +00:00 | 
				
					
						|  v1rgul | 11d00ce713 | background_jobs: show number if verbose | 2016-01-18 05:11:05 +01:00 | 
				
					
						|  V1rgul | a0c664b174 | Merge pull request #1 from bhilburn/next Merge original repo | 2016-01-18 05:09:19 +01:00 | 
				
					
						|  Kayant | 0b1849d034 | Improve zsh framework install description and add zplug | 2016-01-17 19:18:43 +00:00 | 
				
					
						|  Ben Hilburn | 67895cc5da | README: Added a tl;dr | 2016-01-17 10:04:27 -08:00 | 
				
					
						|  Ben Hilburn | 24e7ee75fe | Merge pull request #197 from dritter/changelog_additions Changelog entries added for 'HOME_SUBFOLDER' state of the `dir` segment. | 2016-01-17 10:01:15 -08:00 | 
				
					
						|  Dominik Ritter | 13b7d26e76 | Changelog entries added for 'HOME_SUBFOLDER' state of the `dir` segment. | 2016-01-17 15:05:34 +01:00 | 
				
					
						|  Ben Hilburn | dc4871f1a0 | README: Minor cleanups | 2016-01-16 20:02:10 -08:00 | 
				
					
						|  Ben Hilburn | 02cb0fd88f | README: Turns out you can't linebreak in tables. | 2016-01-16 19:59:39 -08:00 | 
				
					
						|  Ben Hilburn | 8a3c16ae24 | README: Trying out tables to describe variables. | 2016-01-16 19:56:27 -08:00 | 
				
					
						|  Ben Hilburn | 273bcaed55 | Merge pull request #196 from rjorgenson/next added space to end of RVM icon | 2016-01-16 17:10:01 -08:00 | 
				
					
						|  rjorgenson | f1486620e7 | added space to end of RVM icon | 2016-01-16 18:03:31 -07:00 | 
				
					
						|  Ben Hilburn | bc1af0d733 | Merge pull request #195 from dritter/minor_improvements Minor improvements to README `dir` section | 2016-01-16 16:52:14 -08:00 | 
				
					
						|  Dominik Ritter | 01e4e8d324 | Added "visual identifier" concept to `icons_test` segment. | 2016-01-17 01:02:03 +01:00 | 
				
					
						|  Dominik Ritter | 701053aa73 | Improved dir icon descriptions. | 2016-01-17 01:01:39 +01:00 |