aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #496 from belak/options-odditiesBen Hilburn2017-04-201-6/+10
|\ | | | | Fix some oddities with prompt options
| * Stop setting options in prompt setup which are thrown awayKaleb Elwert2017-04-201-8/+6
| |
| * Add prompt_opts to prompt setup functionKaleb Elwert2017-04-201-0/+6
|/
* Merge branch 'master' into nextBen Hilburn2017-04-190-0/+0
|\
| * Revert "Merge branch 'fix-pw3nage-exploit' of ↵Ben Hilburn2017-04-191-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 Hilburn2017-04-191-5/+5
| |\ | | | | | | | | | into belak-fix-pw3nage-exploit
| | * Fix double expansion of prompt variablesKaleb Elwert2017-04-191-5/+5
| | |
* | | Fix double expansion of prompt variablesKaleb Elwert2017-04-191-5/+5
| | |
* | | Merge pull request #484 from shibumi/svn-debuggingBen Hilburn2017-04-191-0/+6
|\ \ \ | | | | | | | | [SVN] removed %b identifier to fix color encoding
| * | | [SVN] removed %b identifier to fix color encodingChristian Rebischke2017-04-161-0/+6
| | | |
* | | | Merge branch 'master' into nextBen Hilburn2017-04-192-2/+2
|\ \ \ \ | | |/ / | |/| |
| * | | Merge pull request #483 from changyuheng/pr-status-tick-colorBen Hilburn2017-04-191-1/+1
| |\ \ \ | | |_|/ | |/| | Set tick to color name green instead of color code
| | * | Set tick to color name green instead of color codeHenry Chang2017-04-161-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-completeBen Hilburn2017-04-071-1/+1
| |\ \ | | | | | | | | Changing name of nerdfont option per #458
| | * | Changing name of nerdfont option per #458Ben Hilburn2017-04-041-1/+1
| |/ /
* | | Converting timer start time to hexBen Hilburn2017-04-192-3/+2
| | |
* | | Improve logicguixxx2017-04-191-9/+8
| | |
* | | Adds useful commentguixxx2017-04-191-0/+2
| | |
* | | Adds Android icon/battery plugin supportguixxx2017-04-193-3/+25
| |/ |/| | | | | Plus fixes bhilburn/powerlevel9k#479, which was causing integer overflow on 32-bit CPUs
* | Merge pull request #461 from julienfalque/dir-homeBen Hilburn2017-04-132-0/+11
|\ \ | |/ |/| Make home shorthand configurable for dir prompt
| * Make home abbreviation configurable for dir promptJulien Falque2017-04-042-0/+11
|/
* Updating README to use @V1rgul's screenshot.Ben Hilburn2017-04-041-2/+2
| | | Per #370
* Merge pull request #463 from liblit/handle-echotc-Co-failureBen Hilburn2017-04-041-2/+2
|\ | | | | Gracefully handle `echotc Co` failure
| * Gracefully handle `echotc Co` failureBen Liblit2017-04-011-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 GuideBen Hilburn2017-03-211-1/+1
|
* Updating CHANGELOG for v0.6.2 release.Ben Hilburn2017-03-211-1/+7
|
* Merge branch 'master' into nextBen Hilburn2017-03-211-2/+1
|\
| * Merge pull request #450 from light2yellow/masterBen Hilburn2017-03-211-2/+1
| |\ | | | | | | README: context section typo fix (#447)
| | * README: context section typo fix (#447)Oleksii Vilchanskyi2017-03-191-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_vmsBen Hilburn2017-03-218-4/+77
|\ \ | | | | | | Improve travis and VMs
| * | Add a hint for the p9k test folder inside the VMsDominik Ritter2017-03-211-0/+2
| | |
| * | Setup some test folders/repos in the VMs for easier testingDominik Ritter2017-03-215-1/+56
| | |
| * | Install more dependencies on travisDominik Ritter2017-03-211-0/+1
| | |
| * | Install more dependencies in VMsDominik Ritter2017-03-212-1/+15
| | |
| * | Fix a problem with redirection in plain.zsh providerDominik Ritter2017-03-211-1/+1
| | |
| * | Fix a little problem in BSDDominik Ritter2017-03-211-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 travisDominik Ritter2017-03-211-1/+1
| | |
* | | Merge pull request #446 from dritter/fix_442Ben Hilburn2017-03-213-1/+371
|\ \ \ | | | | | | | | Protect special characters in various modes
| * | | Fix tests on TravisCIDominik Ritter2017-03-201-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 modesDominik Ritter2017-03-201-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.zshDominik Ritter2017-03-182-1/+75
| | | |
| * | | Add default locale to protect the special charactersDominik Ritter2017-03-181-0/+8
| |/ /
* | | Merge pull request #449 from dritter/ordered_icons_listBen Hilburn2017-03-211-2/+14
|\ \ \ | | | | | | | | Sort the output of `get_icon_names` alphabetically
| * | | Improve get_icon_names functionDominik Ritter2017-03-191-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` alphabeticallyDominik Ritter2017-03-191-1/+2
| |/ /
* | | nerdfont config: changing order, removing duplicatesBen Hilburn2017-03-211-9/+4
| | |
* | | Merge pull request #451 from lcorsini/nextBen Hilburn2017-03-211-11/+23
|\ \ \ | | | | | | | | added missing icons
| * | | added missing iconsLuca Corsini2017-03-201-11/+23
| |/ /
* | | iTerm2 debugger: changed error code, added Source Code Pro to fontcheckBen Hilburn2017-03-211-9/+10
| | |
* | | Add warn message if XCode is not installedDominik Ritter2017-03-181-0/+5
| | |