Commit Graph
100 Commits
Author SHA1 Message Date
Ben Hilburn 948e7f5bff Merge pull request #660 from brianmoran/ISS-650-pythonpath-in-prompt
ISS-650 Fix PYTHONPATH appearing in prompt
2017-11-02 14:37:24 -04:00
Ben Hilburn ba7d116677 Merge pull request #663 from MarcHauptmann/master
declared variables as 'local'
2017-11-02 14:34:37 -04:00
Ben Hilburn 43ab3ebefd Merge pull request #661 from derekbassett/fix/kubernetes-prompt
Fix/kubernetes prompt
2017-11-02 14:33:32 -04:00
Ben Hilburn 98729cdc4a Merge pull request #656 from ylluminarious/remove-weird-glyphs
remove weird glyphs in README.md
2017-10-26 19:10:56 -04:00
Ben Hilburn f46617acd3 Merge branch 'master' into next 2017-10-17 21:33:40 -04:00
Ben Hilburn 1f88c289b5 Merge pull request #651 from claycephas/more-documentation
Add documentation for VCS hooks config
2017-10-17 19:38:14 -04:00
Ben Hilburn 37a27463b8 Merge pull request #647 from sbutler2901/master
OSX bug fix for prompt_public_ip
2017-10-17 19:34:20 -04:00
Ben Hilburn aef54bfbaa Merge pull request #643 from terencode/patch-1
Fix incomplete vpn segment name
2017-10-17 19:33:15 -04:00
Ben Hilburn 01893a015b Merge branch 'master' into next 2017-10-06 22:45:27 -04:00
Ben Hilburn 834b6735fa Fixing vcs.spec tests after adding space. 2017-10-06 22:41:57 -04:00
Ben Hilburn ad74199822 Adding SIG to signal name, removing - sign. 2017-10-06 22:34:44 -04:00
Ben Hilburn 2a7f3966c2 Merge branch 'master' into next 2017-10-06 21:43:43 -04:00
Ben Hilburn 01b554cda8 Adding a space after VCS_BRANCH_ICON by default 2017-10-06 21:43:25 -04:00
Ben Hilburn 6136152997 Merge pull request #638 from TimothyEarley/dropbox-integration
Added Dropbox segment
2017-10-06 20:44:00 -04:00
Ben Hilburn 8f3159c99b Merge pull request #640 from simonvpe/master
Corrected awesome-fontconfig lock icon
2017-10-06 20:43:49 -04:00
Ben Hilburn b87c3b85ac Updating Dropbox icon for non-awesome fonts 2017-10-06 20:41:51 -04:00
Ben Hilburn 000da51aea Merge pull request #636 from ZeGentzy/master
Fixes issue #619
2017-10-06 20:28:08 -04:00
Ben Hilburn 386a39671f Merge pull request #616 from trashbat/patch-2
Changed "less than" to "fewer than".
2017-09-28 17:33:22 -04:00
Ben Hilburn 11e80b47ef Merge pull request #611 from Typositoire/fix/prompt_kubecontextlocal1
Fix prompt_kubecontext:local:1: not valid in this context: Version:
2017-09-28 17:31:26 -04:00
Ben Hilburn 9ab067bd62 Merge pull request #610 from sjoeboo/rbenv_always
Add ability to always show rbenv prompt
2017-09-28 17:30:03 -04:00
Ben Hilburn 748f9868fc Final cleanup for new POWERLEVEL9K_RBENV_ALWAYS flag 2017-09-28 17:27:59 -04:00
Ben Hilburn 095351cfe1 Cleaning up README language about new rbenv feature. 2017-09-28 17:24:39 -04:00
Ben Hilburn 688f6203b4 Merge pull request #608 from tippl/fix_load_segment
Fix average selection in load segment.
2017-08-27 20:39:16 -04:00
Ben Hilburn c6c405955e README: Quick typo fix. 2017-08-27 12:50:22 -04:00
Ben Hilburn 50f0a94642 Slight tweaks to the awesome-mapped-fontconfig error message. 2017-08-27 12:41:25 -04:00
Ben Hilburn 47e32f913d Merge branch 'awesome-font-mapping' of https://github.com/pfrybar/powerlevel9k into pfrybar-awesome-font-mapping 2017-08-27 12:34:36 -04:00
Ben Hilburn 17c069d25a README: Quick fix to MD formatting 2017-08-26 13:59:15 -04:00
Ben Hilburn 348178fd8d Updating CHANGELOG for v0.6.4 2017-08-26 13:43:00 -04:00
Ben Hilburn a4c3fbd76b Merge branch 'master' into next 2017-08-26 13:31:43 -04:00
Ben Hilburn c4e3d70fd7 Merge pull request #605 from tadeoos/next
Add average choice to load extension
2017-08-26 12:21:48 -04:00
Ben Hilburn 44871a455b Merge pull request #602 from varundey/patch-1
README: Updated braces for hyperlink
2017-08-26 12:13:55 -04:00
Ben Hilburn 9f4faf7f21 Merge pull request #596 from eumiro/truncate_to_unique
Add TRUNCATE_TO_UNIQUE shortening dir strategy
2017-08-12 13:52:10 -04:00
Ben Hilburn e464b4e2a5 Adding reference for truncate_to_unique code. 2017-08-12 13:49:50 -04:00
Ben Hilburn 5923aaf07d README: Slight change to new truncation strategy doc 2017-08-12 13:49:14 -04:00
Ben Hilburn 02332d5962 Merge branch 'master' into next 2017-08-12 13:46:08 -04:00
Ben Hilburn f8ba6937b9 Merge pull request #594 from belak/fix-prompt-sp
Add back the `prompt_sp` option for zsh >= 5.4.1
2017-08-12 13:19:19 -04:00
Ben Hilburn 6aca483b60 Merge pull request #592 from tippl/dir_write-588
Implemented functionality from dir_writable to dir
2017-08-12 13:17:55 -04:00
Ben Hilburn d784b1c8dc Cleaning up the dir docs in README 2017-08-12 13:15:29 -04:00
Ben Hilburn 93a1c4d2e8 Merge pull request #581 from docwhat/pr/show-signals
status: show signal name
2017-08-03 15:59:08 -04:00
Ben Hilburn 41b469ed9b Quick fix to next exit code doc in README 2017-08-03 15:52:28 -04:00
Ben Hilburn 50ecdfd57a Merge pull request #584 from giogziro95/patch-1
Update OK_ICON weight to match FAIL_ICON
2017-08-02 11:59:18 -04:00
Ben Hilburn df9b99c2da Merge pull request #580 from sei40kr/master
Fixed Vi mode indicator issue
2017-08-02 11:56:10 -04:00
Ben Hilburn 176559a050 Merge pull request #583 from docwhat/pr/rvm-575
rvm: handle -head, etc. more gracefully.
2017-07-27 07:38:37 -04:00
Ben Hilburn 0bcef50e29 Merge pull request #573 from AdrienHorgnies/feature/status-cross-ok-option-set
Update `status` segment to provide additional configuration option, streamline settings flags.
2017-07-26 21:17:02 -04:00
Ben Hilburn e1442c8e96 Merge pull request #577 from diraol/patch-python-icon-awesome
Fix code-point for Python icon in Awesome fonts.
2017-07-26 20:57:49 -04:00
Ben Hilburn 45fc45223c Merge pull request #568 from dritter/fix_empty_delimiter
Fix empty delimiter
2017-07-17 14:42:29 -04:00
Ben Hilburn c7cd2d54cf Merge pull request #541 from golgoth31/next
vpn prompt: change "ip" to "ifconfig" to be used on OSX
2017-07-17 13:33:30 -04:00
Ben Hilburn c69d45cdcc Merge pull request #569 from docwhat/pr/home-folder-abbr-test
Added tests and replaced a sed call
2017-07-13 11:33:21 -04:00
Ben Hilburn ba41840ebc Merge pull request #570 from docwhat/pr/docker-known-issues
test-in-docker: show known issues
2017-07-13 11:03:23 -04:00
Ben Hilburn 08426a26d7 Merge pull request #571 from docwhat/pr/merge-master
Merge in commits from master
2017-07-13 11:02:02 -04:00
Ben Hilburn 82f319d1fb Adding Code of Conduct
Slightly modified version of Contributors Covenant.
2017-07-12 10:33:26 -04:00
Ben Hilburn 40a12d388f Merge pull request #567 from docwhat/pr/docker
test-in-docker: quickly test frameworks in docker
2017-07-12 10:27:45 -04:00
Ben Hilburn c88cea7f3f Merge pull request #562 from docwhat/pr/cleanup-directory-detection
Cleaned up installation directory detection
2017-07-12 10:13:01 -04:00
Ben Hilburn 6735c24e62 Merge pull request #547 from D-side/patch-1
Fixed RVM segment for usernames with dashes
2017-07-11 19:39:54 -04:00
Ben Hilburn 92ff579d5b Merge pull request #554 from derekbassett/Prompt_Hang_Kubecontext_Minikube
Fixed prompt hangs on kubectl version command
2017-07-11 19:13:21 -04:00
Ben Hilburn 3c3a86a42f Fixes for README and CHANGELOG re: vpn segment. 2017-06-02 12:15:38 -04:00
Ben Hilburn 70e0b20772 Updating CHANGELOG with new vpn segment 2017-06-02 12:14:07 -04:00
Ben Hilburn b81d2cb2f2 Merge pull request #539 from golgoth31/next
add vpn ip to prompt
2017-06-02 12:13:03 -04:00
Ben Hilburn e09d4ae926 Merge branch 'next' into next 2017-06-02 12:09:35 -04:00
Ben Hilburn d6a14a9a01 Updating README and CHANGELOG 2017-06-02 11:59:30 -04:00
Ben Hilburn 4be16020b7 Merge pull request #535 from zikes/go_icon
Add Gopher icon to go_version segment
2017-05-27 21:22:20 -04:00
Ben Hilburn 92264124a9 Merge branch 'master' into next 2017-05-25 16:01:08 -04:00
Ben Hilburn 19fc709a16 Moving some parts of README to the Wiki. 2017-05-25 16:00:44 -04:00
Ben Hilburn d9014c67a3 Merge branch 'host_user' of https://github.com/onaforeignshore/powerlevel9k into onaforeignshore-host_user 2017-05-25 15:47:51 -04:00
Ben Hilburn b63bf00113 Merge pull request #473 from zikes/patch-1
Only show go_version segment if inside GOPATH
2017-05-22 21:55:49 -04:00
Ben Hilburn 44764285c3 Merge branch 'host_user' of https://github.com/onaforeignshore/powerlevel9k into onaforeignshore-host_user 2017-05-22 21:46:17 -04:00
Ben Hilburn 643e8372db Merge branch 'next' of github.com:bhilburn/powerlevel9k into next 2017-05-22 21:45:17 -04:00
Ben Hilburn 5beb77bdf4 Merge branch 'master' into next 2017-05-22 21:39:44 -04:00
Ben Hilburn 58d5027dba Merge branch 'moxon6-master' 2017-05-22 21:39:31 -04:00
Ben Hilburn 65f5f7a90f Merge pull request #531 from shibumi/next
swapped colors for virtualization detection
2017-05-22 21:34:42 -04:00
Ben Hilburn 6f7e88474d Merge pull request #526 from docwhat/pr/nvm-current
nvm: improve default detection
2017-05-22 21:32:41 -04:00
Ben Hilburn 325e01b9f2 Updating the README to add a note about teardown feature. 2017-05-22 21:23:52 -04:00
Ben Hilburn a7409272ac Fixing typo in #525 to teardown RPROMPT 2017-05-22 21:20:56 -04:00
Ben Hilburn c04c51bc8b Merge branch 'pr/teardown' of https://github.com/docwhat/powerlevel9k into docwhat-pr/teardown 2017-05-22 21:17:10 -04:00
Ben Hilburn e844fc4c72 Incorporating @dritter's feedback from #524. 2017-05-22 21:12:59 -04:00
Ben Hilburn 6486e62f14 Merge branch 'pr/newline' of https://github.com/docwhat/powerlevel9k into docwhat-pr/newline 2017-05-22 21:07:23 -04:00
Ben Hilburn ff0766ec5e Merge pull request #515 from docwhat/pr/pipe-status
status: add option for support pipes
2017-05-22 21:04:24 -04:00
Ben Hilburn 0b2483cf6d Merge branch 'master' into next 2017-05-09 21:57:46 -04:00
Ben Hilburn a0abc44ec7 Merge pull request #521 from guixxx/devel
Icons for Windows/Cygwin + Refixes 32-bit support
2017-05-09 21:55:54 -04:00
Ben Hilburn ecd05e1b67 Merge pull request #519 from docwhat/pr/readme-typo
readme: typo fix
2017-05-09 21:48:59 -04:00
Ben Hilburn d9969f6546 Merge branch 'master' into next 2017-05-03 15:38:03 -04:00
Ben Hilburn 29c0172c18 Merge pull request #513 from belak/belak/prompt-cr
Make sure prompt_cr is set
2017-05-03 15:36:55 -04:00
Ben Hilburn cae2a7927d Updates to README and CHANGELOG for changes from #498. 2017-05-01 21:37:12 -04:00
Ben Hilburn 98a00d31a8 Merge branch 'battery' of https://github.com/onaforeignshore/powerlevel9k into onaforeignshore-battery 2017-05-01 21:28:22 -04:00
Ben Hilburn 954c8697e7 Merge pull request #502 from shibumi/detect-virt-debugging
[detect-virt] quickfix for unnecessary information in prompt
2017-04-24 14:06:09 -04:00
Ben Hilburn 95be97ea5f Updating CHANGELOG for v0.6.3. 2017-04-21 11:36:24 -04:00
Ben Hilburn 1dbaf43b98 Merge branch 'master' into next 2017-04-21 11:14:59 -04:00
Ben Hilburn 2f462bd33a Merge pull request #496 from belak/options-oddities
Fix some oddities with prompt options
2017-04-20 11:49:24 -04:00
Ben Hilburn 6d677f5770 Merge pull request #494 from belak/better-realpath
Use method built in to zsh to read symlinks
2017-04-20 10:45:39 -04:00
Ben Hilburn 25fc2fb03e Merge branch 'master' into next 2017-04-19 10:44:27 -04:00
Ben Hilburn 99e59bc83a Revert "Merge branch 'fix-pw3nage-exploit' of https://github.com/belak/powerlevel9k into belak-fix-pw3nage-exploit"
This reverts commit ae259ff594, reversing
changes made to 01a5c6a3a1.
2017-04-19 10:14:11 -04:00
Ben Hilburn ae259ff594 Merge branch 'fix-pw3nage-exploit' of https://github.com/belak/powerlevel9k into belak-fix-pw3nage-exploit 2017-04-18 19:26:08 -04:00
Ben Hilburn ddc425a840 Merge pull request #484 from shibumi/svn-debugging
[SVN] removed %b identifier to fix color encoding
2017-04-18 18:14:12 -04:00
Ben Hilburn c70bb0d4ee Merge branch 'master' into next 2017-04-18 18:08:44 -04:00
Ben Hilburn 01a5c6a3a1 Merge pull request #483 from changyuheng/pr-status-tick-color
Set tick to color name green instead of color code
2017-04-18 18:08:23 -04:00
Ben Hilburn 54a444535a Converting timer start time to hex 2017-04-18 18:02:37 -04:00
Ben Hilburn 2be5d5071e Merge pull request #461 from julienfalque/dir-home
Make home shorthand configurable for dir prompt
2017-04-12 17:24:37 -04:00
Ben Hilburn 37174ea911 Merge pull request #466 from bhilburn/nerdfont-complete
Changing name of nerdfont option per #458
2017-04-07 09:58:00 -04:00
Ben Hilburn 67ef7892de Changing name of nerdfont option per #458 2017-04-03 20:50:23 -04:00
Ben Hilburn 5a1d9ddb64 Updating README to use @V1rgul's screenshot.
Per #370
2017-04-03 20:18:16 -04:00