summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #90 from dritter/icon_protection2Ben Hilburn2015-09-161-57/+60
|\
| * Merge remote-tracking branch 'ben/next' into icon_protection2Dominik Ritter2015-09-141-2/+29
| |\ | |/ |/|
* | Merge pull request #87 from dritter/improve_same_color_segmentsBen Hilburn2015-09-131-2/+29
|\ \
| * | The foreground color of the `longstatus` segment should be white.Dominik Ritter2015-09-041-1/+1
| * | In case that two subsequent segments have the same background color, now a sm...Dominik Ritter2015-09-041-1/+28
| | * The longstatus-Segment should deactivate the foreground color after it is fin...Dominik Ritter2015-09-081-4/+4
| | * Better structure: The right prompt should deactivate the foreground color, af...Dominik Ritter2015-09-081-2/+2
| | * Added documentation.Dominik Ritter2015-09-081-3/+3
| | * Character protection if the user set LANG=C.Dominik Ritter2015-09-081-46/+49
| |/ |/|
* | Merge pull request #80 from dritter/dritter/icon_customization_documentationBen Hilburn2015-09-062-0/+9
|\ \
| * | Merge remote-tracking branch 'ben/next' into dritter/icon_customization_docum...Dominik Ritter2015-09-041-75/+69
| |\|
| * | Added documentation and a little helper function for icon customization.Dominik Ritter2015-08-292-0/+9
* | | Merge branch 'next' of github.com:bhilburn/powerlevel9k into nextBen Hilburn2015-09-062-0/+11
|\ \ \
| * \ \ Merge pull request #89 from dritter/php_version_segmentBen Hilburn2015-09-062-0/+11
| |\ \ \
| | * | | Added a segment that shows the PHP version.Dominik Ritter2015-09-052-0/+11
| | | |/ | | |/|
* | | | Merge branch 'dritter-dritter/system_stats' into nextBen Hilburn2015-09-062-11/+147
|\ \ \ \ | |/ / / |/| | |
| * | | Merging @dritter's new system stats segments.Ben Hilburn2015-09-062-11/+147
|/| | |
| * | | Display of free RAM is now configurable.Dominik Ritter2015-09-041-7/+16
| * | | Use the new `defined` function to test if a network interface was specified.Dominik Ritter2015-09-041-8/+8
| * | | Merge remote-tracking branch 'ben/next' into dritter/system_statsDominik Ritter2015-09-041-75/+67
| |\| |
| * | | Merge remote-tracking branch 'ben/master' into dritter/system_statsDominik Ritter2015-09-041-2/+4
| |\ \ \
| * | | | Under OSX the output of `sysctl vm.loadavg` may be localized. With german loc...Dominik Ritter2015-08-311-1/+4
| * | | | Merge remote-tracking branch 'ben/next' into dritter/system_statsDominik Ritter2015-08-290-0/+0
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Added documentation for the ip segment.Dominik Ritter2015-08-291-0/+10
| * | | | Reworked the IP segment. It now tries to get a IP address from all up network...Dominik Ritter2015-08-291-6/+47
| * | | | Bugfix: load segment changes the color reliably and is customizable.Dominik Ritter2015-08-271-6/+9
| * | | | IP is now customizable. By default we try to get the ip of `en1` (on OSX) and...Dominik Ritter2015-08-261-8/+9
| * | | | Grep statement simplified.Dominik Ritter2015-08-261-1/+1
| * | | | Better descriptions for Stats and Network segements.Dominik Ritter2015-08-261-3/+3
| * | | | Added Documentation.Dominik Ritter2015-08-261-0/+2
| * | | | Added a segment that displays the current IP address.Dominik Ritter2015-08-261-0/+14
| * | | | Added a new Icon to the dir-segment.Dominik Ritter2015-08-261-1/+3
| * | | | Added a segment that displays the 5 min load average and the free RAM.Dominik Ritter2015-08-261-0/+53
| * | | | Moved `print_icon` to top in its own section "utility functions".Dominik Ritter2015-08-261-11/+15
| * | | | Better Icons for Apple and Linux.Dominik Ritter2015-08-261-2/+2
| * | | | Merge branch 'dritter/improve_shorten_dir_length' into dritter/system_statsDominik Ritter2015-08-262-13/+66
| |\ \ \ \
* | \ \ \ \ Merge pull request #85 from dritter/home_icon_whitespace_quickfixBen Hilburn2015-09-061-2/+2
|\ \ \ \ \ \
| * | | | | | Whitespaces should belong to the Icon as they form an entity. Therefore the h...Dominik Ritter2015-09-041-2/+2
| | |_|_|_|/ | |/| | | |
* | | | | | Resolving conflicts from PR #86Ben Hilburn2015-09-062-235/+304
|\ \ \ \ \ \
| * \ \ \ \ \ Merge pull request #86 from dritter/color_warningBen Hilburn2015-09-061-0/+8
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Display a warning message, if the terminal supports less than 256 colors.Dominik Ritter2015-09-041-0/+8
| |/ / / / /
| * | | | | Theme code: Cleanup of commentsBen Hilburn2015-09-031-44/+28
| * | | | | Merge branch 'master' into nextBen Hilburn2015-09-031-2/+4
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | Merge branch 'jkoelndorfer-undef-var' into nextBen Hilburn2015-09-031-32/+40
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Use defined to check if ICON_USER_VARIABLE is defined.John Koelndorfer2015-09-021-1/+1
| | * | | | Use defined to set right, left prompt elements.John Koelndorfer2015-09-021-6/+2
| | * | | | Use set_default to set VCS foreground and dark foreground.John Koelndorfer2015-09-021-25/+17
| | * | | | Implement defined, set_default functions.John Koelndorfer2015-09-021-0/+20
| |/ / / /
| * | | | Merge 'dritter/improve_shorten_dir_length' into nextBen Hilburn2015-08-282-21/+80
| |\ \ \ \
| | * | | | Added a new Icon to the dir-segment.Dominik Ritter2015-08-271-1/+3