Commit Graph
100 Commits
Author SHA1 Message Date
Robby Russell fed807655a Merge pull request #2607 from avonderluft/dev
Show svn dirty on current dir, as well as whole working copy
2014-03-16 18:45:10 -07:00
Robby Russell 8ee9971556 Merge pull request #2613 from Fisiu/ignore-ssh-users
Ignore more users in ssh completion.
2014-03-16 18:44:45 -07:00
Robby Russell c9e7129341 Merge pull request #2602 from blueyed/use-default-hosts-completion-2
Use zsh's default for ':completion:*:hosts'
2014-03-15 16:03:30 -07:00
Robby Russell ee21fe9447 Merge pull request #2380 from rkh/chruby-gallois
add chruby info to gallois theme
2014-03-13 16:18:55 -07:00
Robby Russell 8d8df3fd7a Merge pull request #2435 from tompelka/master
Adding commit hash to branch name in my favorit rjk-repos theme.
2014-03-13 16:18:30 -07:00
Robby Russell d943d23aa0 Merge pull request #2466 from jarus/steeef-virtualenv-fix
Improve virtualenv prompt in steeef theme
2014-03-13 16:18:06 -07:00
Robby Russell 07c2bdf45d Merge pull request #2588 from kerimdzhanov/remote-themes-copyright-info
Remove all copyright information in themes. Closes #2587
2014-03-13 16:15:51 -07:00
Robby Russell d752c8cbc1 Merge pull request #2584 from joukojo/master
added mvn-update
2014-03-13 16:14:37 -07:00
Robby Russell 3b604c6cd9 Merge pull request #2590 from zhouhua015/master
Fix hgsl alias.
2014-03-13 16:14:24 -07:00
Robby Russell d058c9d3f7 Merge pull request #2593 from bobmaerten/typo-docker-plugin
Typo in autocomplete arguments for docker plugin
2014-03-13 16:13:20 -07:00
Robby Russell 552aab6939 Merge pull request #2591 from kevinxucs/remove-extra-aliases
Removed unsolicited aliases.
2014-03-13 13:29:12 -07:00
Robby Russell 47b0d754ae Fixing a few quirks in the latest installer updates (quoting /Users/robbyrussell/.oh-my-zsh and such). Also mentioining our twitter account after install 2014-03-13 10:15:18 -07:00
Robby Russell de78e47d27 Merge pull request #2149 from cristim/master
Added a completion plugin for the new aws-cli tool
2014-03-13 08:07:46 -07:00
Robby Russell 7adf66f942 Merge pull request #1355 from F30/key-bindings
Use terminfo key codes instead of hardcoded ones for key bindings
2014-03-13 08:07:24 -07:00
Robby Russell ca648ae7b1 Merge pull request #2072 from jorge-d/master
Add autocompletion plugin for meteor command
2014-03-13 08:06:42 -07:00
Robby Russell d65a153593 Merge pull request #2595 from ksamdev/git.io
Add github url shortener
2014-03-13 08:05:44 -07:00
Robby Russell d0dcedcde2 Merge pull request #2421 from LFDM/rails_plugin_fix
Fixes _rails_command in new rails plugin
2014-03-13 07:55:19 -07:00
Robby Russell 7c95518f80 Merge pull request #2518 from erawk/master
Updated _brew zsh autocompletion to latest Homebrew upstream
2014-03-13 07:44:01 -07:00
Robby Russell 0d76d9eb15 Merge pull request #2326 from zakkak/master
Improving comments in the zshrc template
2014-03-13 07:42:51 -07:00
Robby Russell e8b85f9202 Merge pull request #1776 from ronshapiro/master
plugged_in function
2014-03-13 07:41:18 -07:00
Robby Russell a5df4d79c7 Merge pull request #1501 from gambhiro/master
more lol
2014-03-13 07:40:40 -07:00
Robby Russell 9cb14dc886 Merge pull request #1085 from avit/install-path
Accept alternate install paths via ZSH variable
2014-03-13 07:35:01 -07:00
Robby Russell d8ed8f669a Merge pull request #650 from tristan0x/emacs
Emacs
2014-03-13 07:33:23 -07:00
Robby Russell 9272b0b0b1 Merge pull request #2600 from jontewks/patch-1
Update license year
2014-03-13 07:31:26 -07:00
Robby Russell b6cbba9dfe Updating README to show the new install URL, which redirects to the raw files on github. 2014-03-12 07:52:20 -07:00
Robby Russell 86a272ef81 Merge pull request #2596 from ryanwmarsh/fixing_bureau_scrollback
Fixes #2467 tab completion scrolls back in terminal when using bureau
2014-03-11 07:44:30 -07:00
Robby Russell 48579ebf2b Merge pull request #2341 from mcornella/title_backticks
Avoid evaluating special chars in $LINE on title command (fixes #2234)
2014-03-08 14:30:55 -08:00
Robby Russell a811ab0ba7 Merge pull request #2331 from posva/catimg
Catimg plugin
2014-03-08 08:42:01 -08:00
Robby Russell e744bf22ca Merge pull request #2479 from mrbfrank/theme-agnoster
theme agnoster: update characters to match latest powerline fonts
2014-03-08 08:39:54 -08:00
Robby Russell 6a2e65f4c8 Merge pull request #1402 from sergeylukin/master
Fix install.sh compatibility with /bin/sh
2014-03-08 08:39:34 -08:00
Robby Russell 59db638d99 Merge pull request #2565 from theallegedjosh/master
ruby-gems aliases
2014-03-08 08:34:50 -08:00
Robby Russell 7b7c5fd12b Merge pull request #2579 from mfaerevaag/master
Updated wd plugin to v0.3.0
2014-03-08 08:33:14 -08:00
Robby Russell 0018969b80 Merge pull request #2535 from IgorTimoshenko/feature/yii-plugin
Added Yii basic command completion
2014-03-08 08:32:37 -08:00
Robby Russell 01261d4795 Merge pull request #2556 from chrisjones-brack3t/fix/git-prompt-1-9
git-prompt (gitstatus.py) plugin fix
2014-03-08 08:23:16 -08:00
Robby Russell 0e10ebb9f6 Merge pull request #2572 from kevinxucs/sublime-linux-fix
Fixed sublime plugin behaviors.
2014-03-08 08:22:55 -08:00
Robby Russell 0e31bed555 Merge pull request #2059 from felipec/fc/gitfast
gitfast: update to upstream v1.8.4
2014-03-08 08:21:12 -08:00
Robby Russell 755f8094b8 Merge pull request #2529 from emanuelez/patch-1
Improve oneline logs
2014-03-08 08:16:34 -08:00
Robby Russell 95e6feaf76 Merge pull request #2525 from lukesteensen/update-go-plugin
unify and update golang plugins
2014-03-08 08:15:54 -08:00
Robby Russell ae9a9b7f70 Merge pull request #2481 from felds/master
highlight the username when root
2014-03-08 08:15:29 -08:00
Robby Russell 7b06ce70a6 Merge pull request #2366 from chuancong/patch-1
pip: Add support to command "show"
2014-03-08 08:14:16 -08:00
Robby Russell cc926e9987 Merge pull request #2322 from dpsk/patch-2
Add alias to rails plugin
2014-03-08 08:13:48 -08:00
Robby Russell 92a54ebc7e Merge pull request #2166 from cap10morgan/no-clobber-rbenv-root
rbenv plugin: don't clobber existing RBENV_ROOT & follow Homebrew's default behavior
2014-03-08 08:13:19 -08:00
Robby Russell 978bb40d03 Merge pull request #2564 from miry/patch-3
Added simulator alias for Xcode plugin
2014-03-08 08:10:53 -08:00
Robby Russell 9bd9278b80 Merge pull request #2287 from rumpelsepp/master
Added/modified some useful aliases.
2014-03-08 08:10:34 -08:00
Robby Russell 7a14ab7f38 Merge pull request #2400 from bric3/svn_fast_plugin
new faster SVN plugin
2014-03-08 08:08:47 -08:00
Robby Russell deb08a762e Merge conflicts with af-magic theme 2014-03-08 08:07:04 -08:00
Robby Russell 2208854597 Cleaning up conflict with merge of #2330 2014-03-08 08:02:23 -08:00
Robby Russell 6b3c953775 Merge branch 'master' of github.com:robbyrussell/oh-my-zsh 2014-02-25 20:27:51 -08:00
Robby Russell 6cc240811f ..a fundamental piece of matter. 2014-02-25 20:27:33 -08:00
Robby Russell 74ad998ad0 Merge pull request #2548 from puffnfresh/gitignore-plugin-url
Fix remaining broken URL in gitignore function
2014-02-23 06:59:12 -08:00
Robby Russell 2eb68a4e29 Merge pull request #2544 from fduch2k/patch-1
Update gitignore.plugin.zsh
2014-02-23 06:58:43 -08:00
Robby Russell 598a9c6f99 Adieu l'ami.
@jimweirich -- You will be missed.
2014-02-20 10:18:53 -08:00
Robby Russell 500cbbc79b Merge pull request #2541 from puffnfresh/cabal-sandboxes-info
Add cabal_sandbox_info function
2014-02-19 18:23:30 -08:00
Robby Russell 861290e40b Merge pull request #2542 from puffnfresh/gitignore-plugin-url
Fix URL to gi (gitignore) function
2014-02-18 19:59:02 -08:00
Robby Russell 4ce7f0a37f Merge pull request #2515 from nupfel/plugins/iwhois
provides iwhois command to use CNAMES under whois.geek.nz to find most accurate whois server
2014-02-11 19:18:10 -08:00
Robby Russell 2ed99037c1 Merge pull request #2516 from lukesteensen/patch-1
Add 'services' command to homebrew completion
2014-02-11 19:17:05 -08:00
Robby Russell ec37c05cb3 Merge pull request #2465 from klange/master
change nyancat telnet server
2014-02-03 22:23:46 -08:00
Robby Russell 7a6e2c05af Merge pull request #2342 from blackjid/master
Prevents oh-my-zsh loading the .zshenv twice
2014-02-03 22:23:11 -08:00
Robby Russell 41d9717252 Merge pull request #2402 from bric3/battery_level_gauge
Adds a method that print a battery gauge
2014-02-03 22:22:36 -08:00
Robby Russell df0305aba5 Merge pull request #2368 from lumbric/master
fix name schema for sudo plugin
2014-01-28 16:22:14 -08:00
Robby Russell d485044169 Merge pull request #2389 from driver2000/patch-1
Fix bad right prompt placing.
2014-01-06 20:06:10 -08:00
Robby Russell a609fd5616 Merge pull request #2398 from phstc/fixes-tmuxinator-plugin-find
Fixes tmuxinator plugin `find` on OSX
2014-01-06 20:03:43 -08:00
Robby Russell e2838f75f0 Merge pull request #2396 from soluwalana/master
Fix WIP false positive
2014-01-02 16:01:28 -08:00
Robby Russell a38af27991 Revert "Cancel update if the current user doesn't have write permissions for the oh-my-zsh directory."
This reverts commit 152e1e07e0.
2013-12-18 17:03:33 -08:00
Robby Russell c9e5adb637 Merge pull request #2358 from n-st/master
Cancel update if the current user doesn't have write permissions for the oh-my-zsh directory.
2013-12-18 17:01:01 -08:00
Robby Russell 357ab4912b Merge pull request #2316 from BBonifield/master
Making auto-correction off by default.

Okay, I don't feel so strongly these days about this.
2013-12-04 21:02:58 -08:00
Robby Russell 8c93142b13 Merge pull request #2303 from petervanderdoes/git-flow-avh
Update git-flow-avh 1.7.0
2013-12-03 12:51:39 -08:00
Robby Russell 6fa64b7199 Merge pull request #2296 from pstadler/master
check_for_upgrade.sh: source ~/.profile only if it exists
2013-12-03 12:51:00 -08:00
Robby Russell 4e34588a5b Merge pull request #2208 from onemouth/master
Update git.plugin.zsh
2013-12-03 00:20:36 -08:00
Robby Russell 032ca0d67c Merge pull request #2173 from jeffrey4l/venv
Add support .venv folder as virtual env
2013-12-03 00:19:21 -08:00
Robby Russell 7d1b668f41 Merge pull request #2159 from pungoyal/master
removing a github redirect during install
2013-12-03 00:18:44 -08:00
Robby Russell f0a7adcd3d Merge pull request #2176 from dejanlukan/spectrum
Added the spectrum_bls function, which prints all 256 colors set as the background.
2013-12-03 00:18:17 -08:00
Robby Russell b8c1566835 Merge pull request #2194 from kevinxucs/gitignore-fix
Minor gitignore fix.
2013-12-03 00:16:59 -08:00
Robby Russell 83c18f8553 Merge pull request #2195 from KevinBongart/command_blacklist_for_bundler_plugin
Add command blacklist support to bundler plugin
2013-12-03 00:16:22 -08:00
Robby Russell aed9cff57a Merge pull request #2215 from posva/rand-quote
Update rand-quote plugin
2013-12-03 00:15:24 -08:00
Robby Russell b422b073f1 Merge pull request #2255 from shadyproject/plugin/xcode-support
basic command line xcode functionality
2013-12-03 00:04:00 -08:00
Robby Russell 4be8c51446 Merge pull request #2258 from amilaperera/master
getting the projects name correctly and making compdef to work with mux ...
2013-12-03 00:03:34 -08:00
Robby Russell b764fad271 Merge pull request #2262 from mfaerevaag/master
Fixed and improved wd plugin
2013-12-03 00:02:47 -08:00
Robby Russell cd219f70a4 Merge pull request #1520 from prooftechnique/master
add symbol in darcs repos to match git and mercurial (smt theme)
2013-12-02 23:55:46 -08:00
Robby Russell f974fa31dc Merge pull request #1574 from adben/master
updated theme adben
2013-12-02 23:55:25 -08:00
Robby Russell a762b3e85b Merge pull request #1683 from mnme/master
replace hostname -s with hostname in ys theme for compatibility
2013-12-02 23:54:12 -08:00
Robby Russell 0d352109e9 Merge pull request #1087 from avit/install-template
Add configuration placeholders to installer template
2013-12-02 23:49:00 -08:00
Robby Russell de35b55141 Merge pull request #1136 from koraa/pull_req_fastfile
On-the-fly creation and usage for file/dir shortcuts
2013-12-02 23:47:40 -08:00
Robby Russell 4bb8bd8007 Merge pull request #1135 from koraa/pull_req_sinchar
Singel character aliases (and combinations) for grep, wegt, cat, pagers, xargs, sudo and more
2013-12-02 23:47:30 -08:00
Robby Russell 1dd9c43e12 Merge pull request #1134 from koraa/pull_req_helpers
Helpers for default variables and alias value access
2013-12-02 23:47:21 -08:00
Robby Russell c9dd778ec0 Merge pull request #1201 from koraa/pull_req_debian
Fix Debian Plugin Auto Completion
2013-12-02 23:46:32 -08:00
Robby Russell 5a32796fc5 Merge pull request #2088 from Stibbons/gsemet_push_pep_pylint_completion
Completion for python, pep8, autopep8 and pylint
2013-12-02 23:45:35 -08:00
Robby Russell 19ce09c008 Merge pull request #2086 from Stibbons/gsemet_push_repo
New aliases for repo plugin
2013-12-02 23:44:55 -08:00
Robby Russell f48d6759e6 Merge pull request #1883 from Stibbons/gsemet_push_source_profile_for_upgrade
source ~/.profile for upgrading (to source the proxy configuration)
2013-12-02 23:43:43 -08:00
Robby Russell bc79f61901 Merge pull request #1866 from Stibbons/gsemet_push_common_aliases
New plugin 'common-aliases' for optional cutting edge zsh aliases
2013-12-02 23:42:46 -08:00
Robby Russell 7c3665bd2e Merge pull request #2003 from dongweiming/update-gem
Update gem completion
2013-12-02 23:41:31 -08:00
Robby Russell c0a6f8a8a2 Merge pull request #1950 from dongweiming/add-systemadmin-plugin
Add a plugin for systemadmin ops and developer
2013-12-02 23:41:09 -08:00
Robby Russell 573830ba37 Merge pull request #1947 from dongweiming/add-sudo
Add sudo plugin
2013-12-02 23:40:12 -08:00
Robby Russell 2f3bddccfb Merge pull request #1931 from dongweiming/update-urltools
Add shell built method
2013-12-02 23:39:26 -08:00
Robby Russell 027c9ee4cd Merge pull request #1942 from dongweiming/update-powify
Update powify for displayed parameter is not enough, and when there is no directory error
2013-12-02 23:39:06 -08:00
Robby Russell b93f3b9f5a Merge pull request #1940 from dongweiming/update-supervisor
Add version option
2013-12-02 23:38:45 -08:00
Robby Russell 44c7fd976b Merge pull request #1928 from dongweiming/add-hist-stamp
Add option for show in the command execution time stamp in the history
2013-12-02 23:38:26 -08:00
Robby Russell f574849c0a Merge pull request #1927 from dongweiming/modify
Modify determine the oh-my-zsh installed in non-default path of the installed
2013-12-02 23:37:49 -08:00
Robby Russell 533e31f2cc Merge pull request #1956 from emesix/patch-1
Update jonathan.zsh-theme
2013-12-02 23:32:56 -08:00
Robby Russell 3ff772d68b Merge pull request #2022 from Zhann/master
Updates Zhann theme
2013-12-02 23:30:25 -08:00