4211 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Dominik Ritter	23f86afeb3	Merge branch 'next' into color_detection	2015-10-22 10:10:15 +02:00
Ben Hilburn	e8771a7039	Merge branch 'master' into next	2015-10-21 16:59:59 -07:00
Ben Hilburn	b2e6beec51	Merge pull request #123 from martinpelikan/master ... Fixes #122, SI prefixes should be evaluated as strings.	2015-10-21 16:54:10 -07:00
Ben Hilburn	84681d4cc1	Merge pull request #126 from rjorgenson/next ... added a prompt segment to display battery status on laptops	2015-10-21 16:53:32 -07:00
Ben Hilburn	981c85af39	Merge pull request #127 from dritter/go_prompt ... Adding Go version segment.	2015-10-21 16:51:44 -07:00
Ben Hilburn	43d8b34a21	Merge pull request #128 from DanielGGordon/master ... Rephrasing of error message when TERM not 256 color	2015-10-21 16:50:38 -07:00
Ben Hilburn	15670379ed	Merge pull request #129 from dritter/ram_prompt ... Breaking RAM and Swap out of load segment into their own segment.	2015-10-21 16:50:03 -07:00
Dominik Ritter	09bd1f6182	Added documentation.	2015-10-20 00:37:17 +02:00
Dominik Ritter	d13d9565bc	Merge branch 'next' into ram_prompt	2015-10-20 00:25:16 +02:00
Daniel Gordon	fa85a5158f	Rephrasing of error message when TERM not 256 color ... - Literal command to be added is highlighted in blue - Now beginners won't try to add an incorrect command to ~/.zshrc	2015-10-19 13:02:24 -05:00
Dominik Ritter	e94394bc67	Merge branch 'next' into go_prompt	2015-10-19 17:39:43 +02:00
Dominik Ritter	5addfdc9e0	Moved utility-functions to "functions/power-utilities.zsh".	2015-10-19 17:37:18 +02:00
rjorgenson	3e828cbaa4	fixed some edge cases I ran into during usage of the linux segment	2015-10-18 21:03:47 -07:00
rjorgenson	ff3f6b8e83	added time remaining support to battery segment on Linux	2015-10-18 19:48:45 -07:00
rjorgenson	3b2971b344	erroneous whitespace commit undone	2015-10-18 16:32:20 -07:00
rjorgenson	fb6738967e	added Linux support to battery prompt segment	2015-10-18 16:30:16 -07:00
rjorgenson	2e406a5bdf	editor automatically removed whitespace	2015-10-18 11:05:37 -07:00
rjorgenson	118008c402	fixed output string color declaration	2015-10-18 11:01:52 -07:00
rjorgenson	acf5e97756	added battery prompt segment usable on OS X systems	2015-10-18 10:55:37 -07:00
Dominik Ritter	c10cbabb9e	Merge branch 'next' into color_detection	2015-10-18 19:43:41 +02:00
Martin Pelikan	8e458e5e9a	Fixes #122, SI prefixes should be evaluated as strings.	2015-10-18 00:11:24 -07:00
Ben Hilburn	d46634a0a7	Merge branch 'master' into next	2015-10-17 21:46:09 -07:00
Ben Hilburn	38bccd1340	README: Updating second image to use @natemccurdy awesome gif.	2015-10-17 21:45:00 -07:00
Ben Hilburn	ce1ea04c13	Merge pull request #118 from dritter/whitespace_customization ... Made whitespaces between segment separators customizable	2015-10-17 20:33:16 -07:00
Ben Hilburn	ee8c59806e	README: Updating the docs about vi_mode segment.	2015-10-17 20:29:07 -07:00
Ben Hilburn	34add8aedf	Merge pull request #117 from dritter/vi_customizations ... Make the vi_mode segement more customizable.	2015-10-17 20:19:53 -07:00
Ben Hilburn	c6f8184585	Merge branch 'dritter-vcs_cleanup' into next	2015-10-17 20:17:42 -07:00
Ben Hilburn	01b158c020	Merge branch 'vcs_cleanup' of https://github.com/dritter/powerlevel9k into dritter-vcs_cleanup	2015-10-17 20:16:02 -07:00
Ben Hilburn	d459ec0983	Merge pull request #114 from alexlafroscia/add-nvm-prompt-segment ... Add nvm prompt segment	2015-10-17 20:12:38 -07:00
Ben Hilburn	9f92995f61	Merge pull request #120 from partp/fix-virtualenv ... Fixes `VIRTUAL_ENV_DISABLE_PROMPT` condition	2015-10-17 20:11:08 -07:00
Ben Hilburn	95d8b62e65	README: changing name of todo.txt segment to todo	2015-10-17 20:08:22 -07:00
rjorgenson	2a6be9dc40	reverting unnoticed white space change	2015-10-17 11:32:59 -07:00
rjorgenson	5add0daad0	added prompt segment for todo.txt task number	2015-10-17 11:30:55 -07:00
Parth Panchal	ae035e537a	Fixes VIRTUAL_ENV_DISABLE_PROMPT condition	2015-10-17 23:17:40 +05:30
Dominik Ritter	b04fae9173	Made whitespaces between segment separators customizable.	2015-10-16 20:42:21 +02:00
Dominik Ritter	86b460f06b	vi_mode segement more customizable.	2015-10-16 20:16:31 +02:00
Dominik Ritter	ab3577a795	Merge remote-tracking branch 'ben/next' into go_prompt	2015-10-16 19:55:44 +02:00
Dominik Ritter	cd7e8bea61	Merge remote-tracking branch 'ben/next' into ram_prompt	2015-10-16 19:54:13 +02:00
Dominik Ritter	5a0f330cd7	Merge remote-tracking branch 'ben/next' into color_detection	2015-10-16 19:51:04 +02:00
Dominik Ritter	3bb8cd4593	Merge remote-tracking branch 'ben/next' into vcs_cleanup	2015-10-16 19:47:30 +02:00
Alex LaFroscia	d5ffa502e2	Add note about NVM to the readme	2015-10-13 19:17:08 -04:00
Alex LaFroscia	7e6339ec27	Add NVM prompt segment ... Prints out the Node version that is currently active if it is different than the default version specified by NVM	2015-10-13 19:08:36 -04:00
Dominik Ritter	f7e1f64b4c	Added handling for bright colors.	2015-10-13 23:42:46 +02:00
Ben Hilburn	62dee9824b	Merge branch 'readme-v2' into next	2015-10-12 15:01:52 -07:00
Ben Hilburn	941379d71c	README: one more wiki link to ToC	2015-10-12 15:00:17 -07:00
Ben Hilburn	9d8ab6f667	README: Add link to Wiki at end of README	2015-10-12 14:58:51 -07:00
Ben Hilburn	0b6b6de8e1	README: Cleaning up ToC	2015-10-12 14:57:18 -07:00
Ben Hilburn	5714581e13	README: Final cleanup	2015-10-12 14:53:17 -07:00
Ben Hilburn	625b584ddd	README: Moving styling to the wiki	2015-10-12 14:49:12 -07:00
Ben Hilburn	b6d1cd109e	README: I'm good at markdown	2015-10-12 14:35:22 -07:00