Commit Graph

2851 Commits

Author SHA1 Message Date
Robby Russell
c97aff8f6b Merge pull request #2616 from Bounga/master
Don't set RBENV_ROOT to "$HOME/.rbenv" when using Homebrew rbenv
2014-03-22 13:27:56 -07:00
Robby Russell
e0e4c0eeaf Merge pull request #2620 from reedriley/master
Fixed errors if acpitool isn't installed on linux
2014-03-22 13:27:28 -07:00
Robby Russell
2e74fe735e Merge pull request #2619 from korylprince/master
Don't show useless '[]' when chruby_prompt_info is empty
2014-03-22 13:26:51 -07:00
Miguel Flores Ruiz de Eguino
610655e827 Sort bundled commands alphabetically 2014-03-22 10:24:58 -06:00
Robby Russell
2403b05613 Merge pull request #2440 from m0nah/master
Add Laravel4 plugin
2014-03-22 07:57:14 -07:00
Robby Russell
e7420736db Merge pull request #2510 from pavoljuhas/master
Add scd plugin for smart change of directory.
2014-03-22 07:56:35 -07:00
Robby Russell
2e06412ee0 Merge pull request #2531 from KevinBongart/rake-fast
Add rake-fast plugin for fast rake autocompletion
2014-03-22 07:53:36 -07:00
Robby Russell
6d616de6f1 Merge pull request #2637 from aforty/master
Atom plugin
2014-03-22 07:52:24 -07:00
Robby Russell
184e93cb05 Merge pull request #2627 from loxley/add_knife_vault_cmd
Add chef-vault knife cmd support
2014-03-22 07:47:39 -07:00
Robby Russell
c98883f5be Merge pull request #2631 from AntoineD/master
Fix dirpersist plugin
2014-03-22 07:47:18 -07:00
Robby Russell
c137c7bf6a Merge pull request #2639 from jieryn/master
add common video formats FLV and WEBM
2014-03-22 07:43:41 -07:00
jieryn
1509ac9a04 add common video formats FLV and WEBM 2014-03-22 08:51:26 -04:00
Miguel Flores Ruiz de Eguino
c3150edad2 Add irb to the list of bundled commands 2014-03-21 19:18:29 -06:00
Patrick Stadler
69fa67cbac Merge pull request #1 from KevinBongart/brew-cask
Add new brew cask commands
2014-03-21 19:13:17 +01:00
Kevin Bongart
6a8f83bc50 Add new brew cask commands 2014-03-21 14:02:26 -04:00
Alexei Danchenkov
32a7824182 Added a forward-delete fallback to bind Delete key
Delete key (of Fn+Delete on Mac) would print "~" instead of deletion.
2014-03-21 09:24:59 -07:00
Arno Fortelny
5f31190ab9 atom plugin 2014-03-21 11:49:52 -04:00
Alexei Danchenkov
c5413d7dd1 Aligned comments 2014-03-20 19:34:43 -07:00
Alexei Danchenkov
55a9d685fd Update key-bindings.zsh
Aligned comments
2014-03-20 19:29:06 -07:00
Alexei Danchenkov
e537ee9db9 added terminfo keys verification 2014-03-20 19:10:44 -07:00
Antoine Dechaume
ef343eef30 Fix dirpersist plugin
This plugin did not work, I just found the same functionnality in grml, this one works.
2014-03-20 10:43:33 +01:00
Reed Riley
fb2d6eb567 Fixed errors if acpitool isn't installed on linux 2014-03-18 14:13:54 -04:00
Johan Svensson
645fceb38b Add chef-vault knife cmd support 2014-03-18 10:52:25 +01:00
Pavol Juhas
c1c107cfb9 Add scd plugin for smart change of directory.
Synced with the scd-tracker branch
pavoljuhas/oh-my-zsh@2f78243cad.
2014-03-17 19:49:12 -04:00
Pavol Juhas
6952105bfe Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh 2014-03-17 19:48:10 -04:00
Kory Prince
d3babe0d79 Don't show useless '[]' when chruby_prompt_info is empty 2014-03-17 11:02:47 -05:00
Benoit Dubertret
a869ec9bc8 Fix gwip alias in git plugin when no files to rm 2014-03-17 16:07:46 +01:00
Bob Williams
5a586670d7 Merge remote-tracking branch 'upstream/master' 2014-03-17 09:32:57 -04:00
Nicolas Cavigneaux
baf2ab1bf1 Don't set RBENV_ROOT to "$HOME/.rbenv" when using Homebrew rbenv
Hard setting RBENV_ROOT to "$HOME/.rbenv" when using Homebrew's rbenv
will breaks it. It has to be set to $(brew --prefix rbenv).
2014-03-17 10:05:56 +01:00
Robby Russell
ca90021630 Merge pull request #2576 from jeffwilliams/master
Added dirhistory plugin.
2014-03-16 20:49:30 -07:00
Robby Russell
81d53af971 Merge pull request #2597 from githubhjs/master
List pkgs by size
2014-03-16 20:45:18 -07:00
Felix Laurie von Massenbach
3be2e34d96 Don't lazy load the virtualenvwrapper.
Fix robbyrussell#2355.
2014-03-17 02:17:30 +00:00
Robby Russell
12415a99d2 Merge pull request #2539 from chriswiggins/master
Update battery plugin to show calculating - OSX
2014-03-16 18:49:07 -07:00
Robby Russell
dcae31d071 Merge pull request #2549 from brandon-beacher/master
Remove mailcatcher from the bundler plugin.
2014-03-16 18:47:05 -07:00
Robby Russell
23a43e9fd6 Merge pull request #2574 from thiagowfx/linux-battery
added the linux implementation to the battery plugin
2014-03-16 18:46:50 -07:00
Robby Russell
080409a5a7 Merge pull request #2603 from docwhat/ssh-agent-hostname
ssh-agent: prevent environment file from flapping
2014-03-16 18:46:05 -07:00
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
Kevin Bongart
baeac5bec9 Remove copyright information, as per #2588 2014-03-16 16:52:37 -04:00
Mariusz Fik
b56e8fb478 Ignore more users in ssh completion.
Signed-off-by: Mariusz Fik <fisiu@opensuse.org>
2014-03-16 18:14:34 +01: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
Andrew vonderLuft
bf4d4db72b Merge branch 'master' of git://github.com/robbyrussell/oh-my-zsh into dev 2014-03-14 13:17:43 -07:00
Andrew vonderLuft
8f7971349b add option to show dirty status of current dir 2014-03-14 13:17:03 -07:00
Bob Williams
223fd60ba5 Merge remote-tracking branch 'upstream/master' 2014-03-14 10:32:03 -04:00
Michael Hauser-Raspe
9e90bf0f23 Added v as a keybinding to edit-command-line
taken from [here](http://www.zsh.org/mla/users/2008/msg01013.html)
We want pressing v in command mode to take us to an editor (defined by the $VISUAL or $EDITOR variable or vi) to edit the current contents of the command line which (I believe) is a standard feature of bash vi-mode or other readline prompts (see [here](http://www.catonmat.net/download/bash-vi-editing-mode-cheat-sheet.pdf) and [here](http://www.catonmat.net/blog/bash-vi-editing-mode-cheat-sheet/) for source).
2014-03-14 10:14:47 +00: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