Commit Graph
100 Commits
Author SHA1 Message Date
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 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
Ben Hilburn 0e627164bc Merge pull request #463 from liblit/handle-echotc-Co-failure
Gracefully handle `echotc Co` failure
2017-04-03 20:01:05 -04:00
Ben Hilburn fa21d8fbc9 Fixing Link to Step 2 of Installation Guide 2017-03-20 23:10:41 -04:00
Ben Hilburn 6761124e70 Updating CHANGELOG for v0.6.2 release. 2017-03-20 22:48:38 -04:00
Ben Hilburn 3cba67626d Merge branch 'master' into next 2017-03-20 22:36:45 -04:00
Ben Hilburn 9e40f2d9f2 Merge pull request #452 from dritter/improve_travis_and_vms
Improve travis and VMs
2017-03-20 22:03:32 -04:00
Ben Hilburn 468534a59b Merge pull request #450 from light2yellow/master
README: context section typo fix (#447)
2017-03-20 21:58:51 -04:00
Ben Hilburn 0132c5dc35 Merge pull request #446 from dritter/fix_442
Protect special characters in various modes
2017-03-20 21:57:36 -04:00
Ben Hilburn 33b41ced80 Merge pull request #449 from dritter/ordered_icons_list
Sort the output of `get_icon_names` alphabetically
2017-03-20 18:52:52 -07:00
Ben Hilburn dca0f7f917 nerdfont config: changing order, removing duplicates 2017-03-20 21:49:17 -04:00
Ben Hilburn ef838c0f65 Merge pull request #451 from lcorsini/next
added missing icons
2017-03-20 18:36:39 -07:00
Ben Hilburn c9c0bb940d iTerm2 debugger: changed error code, added Source Code Pro to fontcheck 2017-03-20 21:29:15 -04:00
Ben Hilburn ec50da4ac5 Merge branch 'Darkheir-next' into next 2017-03-14 14:30:19 -07:00
Ben Hilburn d6e708b221 Merge branch 'next' of https://github.com/Darkheir/powerlevel9k into Darkheir-next 2017-03-14 14:29:02 -07:00
Ben Hilburn 3ad77e6d6d Merge branch 'master' into next 2017-03-14 14:25:41 -07:00
Ben Hilburn 2dc3d08520 Merge pull request #433 from dritter/add_font_debugger
Add font debugger
2017-03-14 17:18:13 -04:00
Ben Hilburn 7eb8085b1d Updating Copyright year 2017-03-10 13:46:58 -05:00
Ben Hilburn 7ec5d100d4 Merge pull request #426 from dritter/fix_changelog
Fix changelog formatting
2017-03-10 11:32:17 -05:00
Ben Hilburn 349b2c315f Merge pull request #412 from dritter/truncate_composer_json
Truncate via name in composer json
2017-03-08 15:04:36 -05:00
Ben Hilburn 622c04eee3 Merge branch 'next' into truncate_composer_json 2017-03-08 15:01:53 -05:00
Ben Hilburn 136a5217e3 readme: adding note about jq installation 2017-03-08 14:57:24 -05:00
Ben Hilburn 94293b0f94 Merge pull request #424 from dritter/add_freebsd_vm
Add FreeBSD VM
2017-03-08 14:31:47 -05:00
Ben Hilburn 2f387376aa unittest: fixing space after branch indicator 2017-03-08 13:43:44 -05:00
Ben Hilburn 5be53ec648 changelog: updating for v0.6.0 release 2017-03-08 13:28:01 -05:00
Ben Hilburn e86ff4ccb7 Fixing AWS icon for nerdfonts, fixing branch icon space. 2017-03-08 13:25:06 -05:00
Ben Hilburn 51d971a032 Merge pull request #413 from davidmpaz/icon_by_repo
vcs: Hide error when no origin in git repo
2017-02-27 19:52:06 -05:00
Ben Hilburn 864979ed27 nerdfont: updating name for nerdfont selection 2017-02-23 12:32:42 -05:00
Ben Hilburn 163b2f4583 Merge branch 'nerdfont' of https://github.com/kaymmm/powerlevel9k into kaymmm-nerdfont 2017-02-23 12:21:03 -05:00
Ben Hilburn 95344af327 Setting new newline flag to false as default. 2017-02-18 22:15:22 -05:00
Ben Hilburn c2cbb32017 README: cleaning up new command_execution_time segment docs 2017-02-18 21:59:39 -05:00
Ben Hilburn 04284abe14 README: updating to reflect new context segment features 2017-02-14 09:00:12 -05:00
Ben Hilburn c65e3217b5 context: fixing conditionals in for always showing $USER 2017-02-14 08:58:40 -05:00
Ben Hilburn 6512796afe Trying to enable always showing user, not working 2017-02-13 22:29:58 -05:00
Ben Hilburn 3de352b296 Adding ssh segment back with some minor changes. 2017-02-13 22:07:23 -05:00
Ben Hilburn f68e055f3b Merging the ssh detection into context segment, resolving conflicts. 2017-02-13 21:50:37 -05:00
Ben Hilburn 5957aef79a Merge branch 'next' into shibumi-next 2017-02-13 21:07:10 -05:00
Ben Hilburn fa255ba868 Merge branch 'next' of https://github.com/shibumi/powerlevel9k into shibumi-next 2017-02-13 21:06:54 -05:00
Ben Hilburn ae553a7c7f Merge pull request #394 from dritter/dir_first_character
Add ability to omit the first character in dir path
2017-02-13 20:25:36 -05:00
Ben Hilburn 36d74f34c2 Merge branch 'next' into dir_first_character 2017-02-13 20:21:33 -05:00
Ben Hilburn 221030013e Merge pull request #398 from dritter/benoits_dir_segment
Add "truncate_with_folder_marker" shorten strategy
2017-02-13 20:18:44 -05:00
Ben Hilburn 1de14df11f Merge pull request #395 from dritter/benoits_dir_writable_segment
Benoits dir writable segment
2017-02-11 10:22:49 -05:00
Ben Hilburn c6f8e10233 Merge pull request #393 from dritter/fix_vanilla_prompt
Fix theme for use with plain "prompt" command
2017-02-11 10:19:48 -05:00
Ben Hilburn 2397d02acc Merge pull request #391 from dritter/simplify_public_ip
Simplify `public_ip` segment
2017-02-11 10:18:53 -05:00
Ben Hilburn da75345275 Merge pull request #387 from dritter/fix_truncate_with_package_name
Fix error with truncating package name if repo is symlinked
2017-02-11 10:12:17 -05:00
Ben Hilburn ddcbc62a05 Merge pull request #386 from dritter/fix_public_ip
Avoid error if CLOBBER is not set in public_ip segment.
2017-02-11 10:10:33 -05:00
Ben Hilburn a58e8bdc8c Merge pull request #379 from dritter/fix_swift_segment
Fix swift segment
2017-01-24 10:11:02 -05:00