Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #496 from belak/options-oddities | Ben Hilburn | 2017-04-20 | 1 | -6/+10 |
|\ | | | | | Fix some oddities with prompt options | ||||
| * | Stop setting options in prompt setup which are thrown away | Kaleb Elwert | 2017-04-20 | 1 | -8/+6 |
| | | |||||
| * | Add prompt_opts to prompt setup function | Kaleb Elwert | 2017-04-20 | 1 | -0/+6 |
|/ | |||||
* | Merge branch 'master' into next | Ben Hilburn | 2017-04-19 | 0 | -0/+0 |
|\ | |||||
| * | Revert "Merge branch 'fix-pw3nage-exploit' of ↵ | Ben Hilburn | 2017-04-19 | 1 | -5/+5 |
| | | | | | | | | | | | | | | https://github.com/belak/powerlevel9k into belak-fix-pw3nage-exploit" This reverts commit ae259ff5940420389c6f7175d6f5a844362b56ae, reversing changes made to 01a5c6a3a10ff1fea9782607a431ac07652546dc. | ||||
| * | Merge branch 'fix-pw3nage-exploit' of https://github.com/belak/powerlevel9k ↵ | Ben Hilburn | 2017-04-19 | 1 | -5/+5 |
| |\ | | | | | | | | | | into belak-fix-pw3nage-exploit | ||||
| | * | Fix double expansion of prompt variables | Kaleb Elwert | 2017-04-19 | 1 | -5/+5 |
| | | | |||||
* | | | Fix double expansion of prompt variables | Kaleb Elwert | 2017-04-19 | 1 | -5/+5 |
| | | | |||||
* | | | Merge pull request #484 from shibumi/svn-debugging | Ben Hilburn | 2017-04-19 | 1 | -0/+6 |
|\ \ \ | | | | | | | | | [SVN] removed %b identifier to fix color encoding | ||||
| * | | | [SVN] removed %b identifier to fix color encoding | Christian Rebischke | 2017-04-16 | 1 | -0/+6 |
| | | | | |||||
* | | | | Merge branch 'master' into next | Ben Hilburn | 2017-04-19 | 2 | -2/+2 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Merge pull request #483 from changyuheng/pr-status-tick-color | Ben Hilburn | 2017-04-19 | 1 | -1/+1 |
| |\ \ \ | | |_|/ | |/| | | Set tick to color name green instead of color code | ||||
| | * | | Set tick to color name green instead of color code | Henry Chang | 2017-04-16 | 1 | -1/+1 |
| |/ / | | | | | | | | | | | | | So the tick will not be too bright in light background color scheme such as Solarized Light. | ||||
| * | | Merge pull request #466 from bhilburn/nerdfont-complete | Ben Hilburn | 2017-04-07 | 1 | -1/+1 |
| |\ \ | | | | | | | | | Changing name of nerdfont option per #458 | ||||
| | * | | Changing name of nerdfont option per #458 | Ben Hilburn | 2017-04-04 | 1 | -1/+1 |
| |/ / | |||||
* | | | Converting timer start time to hex | Ben Hilburn | 2017-04-19 | 2 | -3/+2 |
| | | | |||||
* | | | Improve logic | guixxx | 2017-04-19 | 1 | -9/+8 |
| | | | |||||
* | | | Adds useful comment | guixxx | 2017-04-19 | 1 | -0/+2 |
| | | | |||||
* | | | Adds Android icon/battery plugin support | guixxx | 2017-04-19 | 3 | -3/+25 |
| |/ |/| | | | | | Plus fixes bhilburn/powerlevel9k#479, which was causing integer overflow on 32-bit CPUs | ||||
* | | Merge pull request #461 from julienfalque/dir-home | Ben Hilburn | 2017-04-13 | 2 | -0/+11 |
|\ \ | |/ |/| | Make home shorthand configurable for dir prompt | ||||
| * | Make home abbreviation configurable for dir prompt | Julien Falque | 2017-04-04 | 2 | -0/+11 |
|/ | |||||
* | Updating README to use @V1rgul's screenshot. | Ben Hilburn | 2017-04-04 | 1 | -2/+2 |
| | | | Per #370 | ||||
* | Merge pull request #463 from liblit/handle-echotc-Co-failure | Ben Hilburn | 2017-04-04 | 1 | -2/+2 |
|\ | | | | | Gracefully handle `echotc Co` failure | ||||
| * | Gracefully handle `echotc Co` failure | Ben Liblit | 2017-04-01 | 1 | -2/+2 |
|/ | | | | | | | | | | | In Emacs, `M-x shell` creates a shell buffer with very rudimentary terminal capabilities. `$TERM` is set to `dumb`, and `echotc Co` fails after printing `echotc: no such capability: Co` to standard error. If our goal was to determine whether the terminal supports 256 colors, we really have no information to go on. I recommend that we trust the user and hope for the best. That means we should (1) discard any `echotc Co` error output, and (2) forego the warning message about having fewer than 256 colors if `echotc Co` failed. | ||||
* | Fixing Link to Step 2 of Installation Guide | Ben Hilburn | 2017-03-21 | 1 | -1/+1 |
| | |||||
* | Updating CHANGELOG for v0.6.2 release. | Ben Hilburn | 2017-03-21 | 1 | -1/+7 |
| | |||||
* | Merge branch 'master' into next | Ben Hilburn | 2017-03-21 | 1 | -2/+1 |
|\ | |||||
| * | Merge pull request #450 from light2yellow/master | Ben Hilburn | 2017-03-21 | 1 | -2/+1 |
| |\ | | | | | | | README: context section typo fix (#447) | ||||
| | * | README: context section typo fix (#447) | Oleksii Vilchanskyi | 2017-03-19 | 1 | -2/+1 |
| |/ | | | | | | | | | | | | | * Remove a duplicate in the table * Use word "set" to emphasize $USER as a shell variable Closes #447. | ||||
* | | Merge pull request #452 from dritter/improve_travis_and_vms | Ben Hilburn | 2017-03-21 | 8 | -4/+77 |
|\ \ | | | | | | | Improve travis and VMs | ||||
| * | | Add a hint for the p9k test folder inside the VMs | Dominik Ritter | 2017-03-21 | 1 | -0/+2 |
| | | | |||||
| * | | Setup some test folders/repos in the VMs for easier testing | Dominik Ritter | 2017-03-21 | 5 | -1/+56 |
| | | | |||||
| * | | Install more dependencies on travis | Dominik Ritter | 2017-03-21 | 1 | -0/+1 |
| | | | |||||
| * | | Install more dependencies in VMs | Dominik Ritter | 2017-03-21 | 2 | -1/+15 |
| | | | |||||
| * | | Fix a problem with redirection in plain.zsh provider | Dominik Ritter | 2017-03-21 | 1 | -1/+1 |
| | | | |||||
| * | | Fix a little problem in BSD | Dominik Ritter | 2017-03-21 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | On BSD ZSH is installed on a different location than on linux. So we link it there to make sure our later scripts will work. | ||||
| * | | Assume "yes" on installation of ZSH on travis | Dominik Ritter | 2017-03-21 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #446 from dritter/fix_442 | Ben Hilburn | 2017-03-21 | 3 | -1/+371 |
|\ \ \ | | | | | | | | | Protect special characters in various modes | ||||
| * | | | Fix tests on TravisCI | Dominik Ritter | 2017-03-20 | 1 | -24/+60 |
| | | | | | | | | | | | | | | | | TravisCI runs ubuntu 14.04 which has ZSH 5.0.2 on it. | ||||
| * | | | Add tests to ensure all icon keys are set in all modes | Dominik Ritter | 2017-03-20 | 1 | -0/+252 |
| | | | | | | | | | | | | | | | | | | | | This tests do compare icons from all modes (except for flat and compatible) with all other modes. | ||||
| * | | | Add tests for setting the right locale in icons.zsh | Dominik Ritter | 2017-03-18 | 2 | -1/+75 |
| | | | | |||||
| * | | | Add default locale to protect the special characters | Dominik Ritter | 2017-03-18 | 1 | -0/+8 |
| |/ / | |||||
* | | | Merge pull request #449 from dritter/ordered_icons_list | Ben Hilburn | 2017-03-21 | 1 | -2/+14 |
|\ \ \ | | | | | | | | | Sort the output of `get_icon_names` alphabetically | ||||
| * | | | Improve get_icon_names function | Dominik Ritter | 2017-03-19 | 1 | -1/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | As this function gets more and more important, it now checks for overrides the user has made and prints these icons instead. At least unless the first parameter is not set to "original". Then it will print the default icons. | ||||
| * | | | Sort the output of `get_icon_names` alphabetically | Dominik Ritter | 2017-03-19 | 1 | -1/+2 |
| |/ / | |||||
* | | | nerdfont config: changing order, removing duplicates | Ben Hilburn | 2017-03-21 | 1 | -9/+4 |
| | | | |||||
* | | | Merge pull request #451 from lcorsini/next | Ben Hilburn | 2017-03-21 | 1 | -11/+23 |
|\ \ \ | | | | | | | | | added missing icons | ||||
| * | | | added missing icons | Luca Corsini | 2017-03-20 | 1 | -11/+23 |
| |/ / | |||||
* | | | iTerm2 debugger: changed error code, added Source Code Pro to fontcheck | Ben Hilburn | 2017-03-21 | 1 | -9/+10 |
| | | | |||||
* | | | Add warn message if XCode is not installed | Dominik Ritter | 2017-03-18 | 1 | -0/+5 |
| | | |