Commit Graph

1499 Commits

Author SHA1 Message Date
Robby Russell
d9683974fe Merge pull request #2605 from mhauserr/patch-1
Added v as a keybinding to edit-command-line in vi-mode
2014-03-22 13:30:16 -07:00
Robby Russell
123510382d Merge pull request #2615 from erbridge/fix_virtualenvwrapper_lazy
Don't lazy load the virtualenvwrapper
2014-03-22 13:28:30 -07:00
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
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
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
Kevin Bongart
6a8f83bc50 Add new brew cask commands 2014-03-21 14:02:26 -04:00
Arno Fortelny
5f31190ab9 atom plugin 2014-03-21 11:49:52 -04: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
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
Kevin Bongart
baeac5bec9 Remove copyright information, as per #2588 2014-03-16 16:52:37 -04: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
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
Christian Höltje
cfe468f6f6 ssh-agent: prevent environment file from flapping
On an OS X laptop, the variable `$HOST` changes a lot depending
on what wifi network you're connected to.  This causes a lot
of `~/.ssh/environment-$HOST` files to be created and
causes multiple ssh-agents to created.

Instead, use `scutil --get ComputerName` to get something
more stable.
2014-03-13 14:44:58 -04: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
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
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
d8ed8f669a Merge pull request #650 from tristan0x/emacs
Emacs
2014-03-13 07:33:23 -07:00
Josh Chih-Hsueh Huang
ae2f6f34e3 List pkgs by size 2014-03-11 11:29:25 +08:00
Samvel Khalatyan
b9841b0bae Add github url shortener 2014-03-10 17:18:50 -05:00
Bob Maerten
3c9a29b0d6 Fix typo in autocomplete arguments 2014-03-10 16:23:14 +01:00
Zhou Hua
de0e7b5dc8 Fix hgsl alias.
The original 'hgsl' missed 'hg' part.
2014-03-10 11:41:25 +08:00
Robby Russell
a811ab0ba7 Merge pull request #2331 from posva/catimg
Catimg plugin
2014-03-08 08:42:01 -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
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
7a14ab7f38 Merge pull request #2400 from bric3/svn_fast_plugin
new faster SVN plugin
2014-03-08 08:08:47 -08:00
Jouko Johansson
fd8ce7f8e3 added mvnjetty alias 2014-03-07 01:23:37 +02:00
Jouko Johansson
7378765a79 added aliases for tomcat:run tomcat7:run 2014-03-07 01:22:37 +02:00
Jouko Johansson
8b667b2299 added mvn-update 2014-03-07 01:09:04 +02:00
Markus Faerevaag
d41ac7fe3e Updated wd plugin to v0.3.0 2014-03-04 20:25:54 +01:00
Jeff Williams
c0b98cd6ac Added dirhistory plugin.
This plugin navigates directory history using ALT-LEFT and ALT-RIGHT.
2014-03-03 10:18:10 -05:00
Kaiwen Xu
2691520d6f Integrate changes from #1841. 2014-03-02 14:13:55 -05:00
Thiago Perrotta
564a708d6a added the linux implementation to the battery plugin 2014-03-02 14:47:43 -03:00
Kaiwen Xu
5ba96e9a05 Fixed sublime plugin behaviors.
- Fixed subl search path order in Mac because Sublime Text 3 is named
  Sublime Text.app by default instead of Sublime Text 3.app and they are
  mostly likely to be placed in /Applications instead of
  $HOME/Applications.
- Fixed sublime text binary path in Linux. The sublime_text binary
  installed by Ubuntu installer is placed in /opt/sublime_text/sublime_text
  instead of /usr/bin/sublime_text.
- Use zsh's built-in process detach syntax instead of nohup.
2014-03-02 03:59:27 -05:00
Michael Nikitochkin
6dcdfe61e2 🐼 Added simulator alias for Xcode plugin
It is often required to start simulator without Xcode.
2014-02-28 13:55:15 +02:00
Bob Williams
185cb6e373 adding support for node 2014-02-27 10:56:07 -05:00
Josh Burns
fdbf0cbe46 gem push alias and gem yank alias 2014-02-28 01:32:01 +11:00
Josh Burns
da573f6356 add gem push alias 2014-02-28 01:26:54 +11:00
Josh Burns
f139401485 add gem build alias 2014-02-28 01:26:17 +11:00
Bob Williams
56babe6538 Adds command line aliases useful for dealing with JSON 2014-02-26 19:35:24 -05: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
2eb68a4e29 Merge pull request #2544 from fduch2k/patch-1
Update gitignore.plugin.zsh
2014-02-23 06:58:43 -08:00
Eduardo San Martin Morote
8309b0a19b Verification of convert inside the function
Depending on when the path is declared this solution would work in any case
2014-02-23 10:07:26 +01:00
Chris Jones
c397000b3b grab last item in list which is the branch instead of relying on position. 2014-02-21 22:48:38 -08:00
Chris Jones
7a546362d3 Much needed PEP8 love. Use spaces, not tabs. 2014-02-21 22:47:56 -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
Brandon Beacher
840ae4382e Remove mailcatcher from the bundler plugin.
Recommended by @sj26 per https://github.com/sj26/mailcatcher#bundler.
2014-02-19 18:55:52 -05:00
Alexander Hramov
bd4f7e24ea Update gitignore.plugin.zsh
Fix URL to gi (gitignore) function in _gitignireio_get_command_list function
2014-02-19 15:08:47 +03:00
Brian McKenna
1df7d01618 Fix URL to gi (gitignore) function
Previous URL doesn't seem to work because the host requires a www
prefix.
2014-02-18 14:43:42 -07:00
Brian McKenna
358b6ffcde Add cabal_sandbox_info function
Reports whether the current working directory is within a
sandbox. Useful to check before installing Cabal packages into the
global registry.
2014-02-18 14:37:59 -07:00
Chris Wiggins
fdd864bd5b Update battery plugin to show calculating - OSX
Instantly after removing the charger, I have found that the "AvgTimeToEmpty" value can swing to rediculous values. Apple's current claim is that the max battery life is 12 hours, so any value larger than this is considered a "time is being calculated" value.
2014-02-17 13:32:24 +13:00
Igor Timoshenko
354593e9b2 Added Yii basic command completion 2014-02-14 14:55:00 +00:00
Kevin Bongart
1a029f2935 Add rake-fast plugin for fast rake autocompletion 2014-02-13 12:27:00 -05:00
Emanuele Zattin
f6f3e93019 Improve oneline logs
Add decorate and color to the normal oneline and add a new alias for graph oneline logs.
2014-02-13 10:32:52 +01:00
Luke Steensen
aa9db3e8f9 update golang plugin to match official version 2014-02-12 20:13:00 -06:00
Luke Steensen
2078e7d4de remove duplicate 'go' plugin, symlink to 'golang' 2014-02-12 20:09:44 -06:00
Ed Lui
f3f0a54259 Updated _brew zsh autocompletion to latest Homebrew upstream 2014-02-11 22:45:41 -05: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
Luke Steensen
0d212bb218 Add 'services' command to homebrew completion 2014-02-11 21:14:02 -06:00
Tobias Kirschstein
0cb2ecff80 provides iwhois command to use CNAMES under whois.geek.nz to find most accurate whois server 2014-02-11 20:05:59 +13:00
Florian Franzen
c563fe95fb Makes history-substring-search use term specific up and down buttons. Fixes #2089. 2014-02-09 14:06:58 +01:00
Pavol Juhas
ed19ffee5e Add scd plugin for smart change of directory.
Synced with the scd-tracker branch pavoljuhas/oh-my-zsh@9d04d8ca78
2014-02-08 20:09:51 -05: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
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
Kevin Lange
a48fd1e808 Update nyan.plugin.zsh 2014-01-24 10:27:41 -08:00
Kevin Lange
9b3344dd80 change nyancat telnet server
miku.acm.uiuc.edu was decommissioned a while ago; this is a sanctioned mirror
2014-01-23 20:58:23 -08:00
Brice Dutheil
cc8b09366b Adds a method that print a battery gauge
It is especially useful for themes, this function is a port of the code written by Steve Losh
and made available on [this blog entry](http://stevelosh.com/blog/2010/02/my-extravagant-zsh-prompt/#my-right-prompt-battery-capacity)
2014-01-18 13:58:42 +01:00
Evgeny Golubev
7b9e48992f Add Laravel4 plugin 2014-01-17 12:59:14 +03:00
LFDM
a6671919ab Fixes _rails_command
Changes precedence of the conditional clause, more recent versions come
first now. Fixes problems when users update their app and still have
the old rails files inside of their file tree.
Closes #2405 - check the discussion there for further info.
2014-01-10 22:52:18 +01:00
Brice Dutheil
ca129bb550 Renames main plugin function to svn_prompt_info 2014-01-10 14:03:10 +01:00
Brice Dutheil
f66ab7f98f Renamed the methods of this script 2014-01-08 03:04:54 +01:00
Brice Dutheil
8ede6c6af3 Added further cleanup and svn status information 2014-01-08 02:50:58 +01:00
LFDM
8bf8e1ecf9 Heavy refactor of svn-fast-info 2014-01-07 10:07:02 +01:00
Brice Dutheil
642ae64bc5 Inline parse_svn to avoid leaky state
As noted in review, `in_svn` is not properly reset to false. This is better anyway to not leak state.
2014-01-07 02:10:34 +01:00
Brice Dutheil
1304ed8d25 Report the SVN need upgrade
This happen when subversion 1.7+ is used on a repository created with subversion up to 1.6
2014-01-06 14:09:40 +01:00
Brice Dutheil
9ce1b6289a new faster SVN plugin 2014-01-04 22:08:00 +01:00
Pablo Cantero
4354f91171 Fixes tmuxinator plugin find on OSX 2014-01-03 11:52:33 -02:00
Patrick Stadler
288604ef1a add brew-cask plugin 2014-01-03 14:32:49 +01:00
Sam O
d60522c7a2 escape dashes 2014-01-02 15:53:34 -08:00
Sam O
827d9dfcb4 Update git.plugin.zsh 2014-01-02 15:48:09 -08:00
lumbric
b58b996b40 fix name schema for sudo plugin
Plugin won't load automatically if added to variable $plugins, if name schema different than $name/$name.plugin.zsh is used (see is_plugin() in oh-my-zsh.sh).
2013-12-21 19:49:44 +01:00
chuancong
e41b6acd2a Add support to command "show" 2013-12-19 11:24:38 -08:00
Mikhail Nikalyukin
fdfc907052 Add rdmtc alias for rails plugin. 2013-12-11 11:42:11 +02:00
Eduardo San Martin Morote
44b23ae194 catimg: fix exit without using source
supresses errors from convert whilen converting, as they
are usually just warnings
2013-12-09 22:18:20 +01:00
Eduardo San Martin Morote
349fa15b18 Fixed a dirs bug for catimg 2013-12-09 22:07:19 +01:00
Eduardo San Martin Morote
0185d9920b catimg plugin
allow to print an image to the stdout using convert
2013-12-09 08:54:38 +01:00
Peter van der Does
2ffca06806 Update git-flow-avh 1.7.0 2013-12-03 08:56:18 -05: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
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
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
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
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
b6f4a887ac Merge pull request #2131 from stevschmid/patch-1
Fix gallois theme
2013-12-02 23:24:01 -08:00
Robby Russell
3d6f9d78c5 Merge pull request #306 from jtriley/git-prompt
add git-prompt plugin from olivierverdier/zsh-git-prompt
2013-12-02 22:49:08 -08:00
Robby Russell
7f3e56f8d6 Merge pull request #2198 from Larandar/master
[PLUGINS] Brew: Add "options" as a valide first argument
2013-12-02 22:45:55 -08:00
Robby Russell
182652b00a Merge pull request #2202 from kevinxucs/themes-random
themes plugin now picks a random theme if no argument is provided.
2013-12-02 22:43:52 -08:00
Robby Russell
9a40ae9b5f Merge pull request #2212 from bsiegel/bundler_bi_function
Change bundler plugin's `bi` alias to a function
2013-12-02 22:42:50 -08:00
Robby Russell
e25329fcf6 Merge pull request #2222 from jamesoff/fix-battery-plugin
Prevent errors in prompts if no battery info available.
2013-12-02 22:39:45 -08:00
Brandon Siegel
22c0db64ee Change bi alias to a function
Only check the bundler version when we call bi. This fixes two issues:
First, if there is no bundler available system-wide this will cause an
error each time zsh loads. Second, if new bundler is installed
system-wide but you change into an rbenv with an older version, the
alias will no longer work.
2013-12-02 10:51:25 -05:00
Atem18
06bd72f842 Merge remote-tracking branch 'upstream/master' 2013-12-01 23:45:55 +01:00
Kevin Messer
84e178fa3d Fixed lines 32, 33, 34 where one 'p' was missing in 'zypper' command. 2013-12-01 23:29:55 +01:00
Robby Russell
5643fac887 Merge pull request #2290 from jtinfors/master
Adds the hgsl alias for one-line shortlog convenience
2013-12-01 13:53:40 -08:00
Robby Russell
270b1dc689 Merge pull request #2242 from sztupy/fix-mvn-color-locale
Fix issues with special characters when running mvn
2013-12-01 13:53:24 -08:00
Robby Russell
1b337af758 Merge pull request #2252 from henrique2010/master
new useful aliases for zeus
2013-12-01 13:52:16 -08:00
Robby Russell
259daa08af Merge pull request #2254 from Atem18/master
Rebranded SUSE's plugin according to Zypper's official alias
2013-12-01 13:51:47 -08:00
Robby Russell
401c82a8c8 Merge pull request #2286 from ych/master
Add FreeBSD support for autojump plugin
2013-12-01 13:50:48 -08:00
Robby Russell
d51cb6d385 Merge pull request #2260 from Stibbons/gsemet_push_sublime3_support2
Add support for sublime 3
2013-12-01 13:49:19 -08:00
Robby Russell
7a27a1ce77 Merge pull request #2240 from Kriechi/master
unified and improved Rails plugin -- consolidates Rails3 and Rails4 plugins into one.
2013-12-01 13:33:00 -08:00
Jens Tinfors
96bd365542 Adds the hgsl alias for one-line shortlog convenience 2013-12-01 15:33:23 +01:00
Thomas Kriechbaumer
1493d88e3f Added migration notification for rails plugin 2013-12-01 15:31:48 +01:00
Robby Russell
f078e03743 Merge pull request #2275 from wjv/wjv
Use precmd hook instead of chpwd for updating OS X proxy icon
2013-11-30 11:06:21 -08:00
ych
699c82eb89 Add FreeBSD support for autojump plugin 2013-11-29 18:34:12 +08:00
Markus Færevaag
b4ffe5cf0a wd.plugin: Added checks, readme and completion 2013-11-26 00:46:13 +01:00
Markus Færevaag
240b25daaa wd.plugin: Fixed nested dirs 2013-11-26 00:45:24 +01:00
Robby Russell
66a33b80c3 Merge pull request #2261 from webframp/feature/chruby-plugin
Add simple plugin for chruby ruby version manager
2013-11-24 10:46:58 -08:00
Robby Russell
370ccc359d Merge pull request #2266 from ssm/plugin/pyenv
Add pyenv plugin
2013-11-24 10:35:57 -08:00
Robby Russell
81f9f3ca1a Merge pull request #2271 from ashleyh/master
fix pip plugin
2013-11-24 10:32:19 -08:00
Robby Russell
83462b3bff Merge pull request #2273 from thibaudgg/patch-1
Update _heroku config arguments (Heroku Client v3)
2013-11-24 10:31:38 -08:00
christianschmidt
ec779d5f73 Update _pass to follow symlinks for completion
Based on: http://comments.gmane.org/gmane.comp.encryption.pass/235
2013-11-23 15:32:22 +01:00
Amila Perera
27d048aa57 Merge remote-tracking branch 'upstream/master' 2013-11-23 10:33:30 +05:30
Johann Visagie
d12113a9e8 Use precmd hook for updating OS X proxy icon
Using the chpwd hook function causes some junk to be printed to STDOUT after
returning from a subshell wherein the working directory was changed. In rare
cases, this can cause issues with 3rd party tools. An example is this issue
with the Python virtualenvwrapper tool:

https://bitbucket.org/dhellmann/virtualenvwrapper/issue/216/lsvirtualenv-and-workon-output-broken-in
2013-11-22 14:59:04 +01:00
Thibaud Guillaume-Gentil
b5b3519ac7 Update _heroku config arguments (Heroku Client v3) 2013-11-22 09:48:51 +01:00
aph
4d3fb286d8 fix pip plugin 2013-11-21 16:58:57 +00:00
Thomas Kriechbaumer
9b37fcba5e unified and improved Rails plugin 2013-11-19 17:14:52 +01:00
Stig Sandbeck Mathisen
613d116cda Add pyenv plugin 2013-11-19 09:12:05 +01:00
Sean Escriva
037b39a817 Add simple plugin for chruby ruby version manager 2013-11-16 15:40:55 -08:00
Gaetan Semet
ae1fe0029c Add support for sublime 3
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2013-11-17 00:03:16 +01:00
Robby Russell
9f5a895192 Merge pull request #2084 from mekanics/update-pod-plugin
updated the arguments list to the newest version (0.27.1) of cocoapods
2013-11-16 08:55:18 -08:00
Robby Russell
06021ccad7 Merge pull request #2209 from quodlibetor/pip-caching-fixes
pip: successfully cache all the packages
2013-11-16 08:51:02 -08:00
Markus Færevaag
6f48f586ba Added wd plugin 2013-11-16 02:15:17 +01:00
Atem18
1f334ba660 Rebranded plugin according to Zypper's official alias 2013-11-15 02:36:15 +01:00
Chris Martin
51b273a66f basic command line xcode functionality 2013-11-14 16:04:38 -08:00
Pedro Henrique Passalini
dcf7c7cce0 add aliases to readme 2013-11-14 14:36:20 -02:00
Pedro Henrique Passalini
ae6b26327a add new alias to zeus 2013-11-14 14:31:24 -02:00
Robby Russell
1cc1906347 Merge pull request #2244 from marcoccchan/master
Use environment specific open command when creating a new Jira issue.
2013-11-13 13:28:01 -08:00
Robby Russell
a4f4ed037a Merge pull request #2243 from sabarishcrri/bundle_plugin_nobundle_fix
bundle plugin throwing error when bundle is not in path while initializing
2013-11-12 19:34:09 -08:00
Carlos Cardoso
c6dce05fab python3 clean updated. 2013-11-12 22:55:28 -02:00
Amila Perera
4e7b0fe083 getting the projects name correctly and making compdef to work with mux alias 2013-11-13 00:35:19 +05:30
Marco Chan
bb2064e92b Use environment specific open command when creating a new Jira issue. 2013-11-12 15:55:16 +08:00
Sabarish Kumar R
27f9747143 bundle plugin throwing error when bundle is not in path while initializing 2013-11-12 12:31:13 +05:30
Zsolt Sz. Sztupák
96798c42f0 Fix issues with special characters when running mvn
Setting the locale to C will stabilize sed, so it won't stop processing
the mvn output when it encounters invalid characters (like binary data)

This makes it also more viable to add the `alias mvn='mvn-color`, as
the coloring is less obtrusive, and there won't be any issues with sed
breaking because of an invalid character inside the stream
2013-11-11 18:09:33 +00:00
James Seward
8cfc7d6677 Prevent errors in prompts if no info available.
Define empty functions instead of none at all if we can't figure out the
platform.
2013-11-04 21:00:11 -05:00
nishigori
dd4f57010c Fix bad ps syntax in ssh-agent plugin 2013-11-05 08:40:13 +09:00
Robby Russell
b2376c3770 Merge pull request #1529 from aquaplanet/fix-sshagent-openbsd
Fix ssh-agent plugin for OpenBSD, making it more portable
2013-11-04 12:29:42 -08:00
Robby Russell
0d36ecfe38 Merge pull request #2174 from oxnz/master
plugins/osx/osx.plugin.zsh: add itunes function to control itnues from the terminal
2013-11-02 10:35:18 -07:00
Eduardo San Martin Morote
37be62ffb7 randquote plugin
correcting an issue about encoding some people was having
added a message when the user doesn't have curl
added varibles for colors->easier to customize
2013-10-31 13:38:12 +01:00
Brandon W Maister
008e57aa5a Make the pip cache work with djangopypi2
Also add a test function that allows messing with the cache-creating
regex with some assurance that you're not trampling other people's
index-parsing.
2013-10-30 21:00:08 -04:00
Brandon W Maister
78df6e96f5 pip: successfully cache all the packages
Switch to using curl and regular expressions to generate a local cache
file so that we don't need to hit pypi.python.org every time.
This (obviously) results in a massive speed improvement, especially if
you spawn new shells frequently.

This also makes the autocompletion work for me, it didn't before. (pip
would always time out.)

And, also, for fun: This allows you to explicitly set which pip indexes
to use. Technically the old version of the plugin should have had this
behavior automatically -- without having to do more than configure pip
-- but the install completion never worked for me so this is a net gain
in functionality.
2013-10-29 23:33:23 -04:00
onemouth
c81e42f050 Update git.plugin.zsh
add command to ignore changes to file temporarily
2013-10-30 11:05:35 +08:00
Alexandre Joly
0eb86f82d6 updated to the latest version of cocoapods 0.27.1 2013-10-29 10:33:37 +01:00
Kaiwen Xu
f731d6c16f themes plugin now picks a random theme if no argument is provided. 2013-10-28 11:06:10 -04:00
Adrien Dudouit-Exposito
103fc334d6 Add "options" as a valide 1st argument 2013-10-26 11:43:59 +02:00
Kevin Bongart
7567fd7f27 Re-add whitespace 2013-10-25 12:01:28 -04:00
Kevin Bongart
03dc3a8463 Add command blacklist support to bundler plugin 2013-10-25 11:54:56 -04:00
Robby Russell
90c28b786a Merge pull request #1688 from mbauhardt/z
ohmyzsh plugin of the z project: https://github.com/rupa/z
2013-10-24 20:29:10 -07:00
Robby Russell
9f88fb5229 Merge pull request #2165 from kevinxucs/custom-gitignore-fix
gitignore fix for custom folder.
2013-10-24 20:26:20 -07:00
Robby Russell
e44c147e25 Merge pull request #1963 from shajra/pr/gpg-fix
fix gpg-agent "running already" check
2013-10-24 20:25:33 -07:00
Robby Russell
86d57e83ed Merge pull request #2078 from tbuehl/master
Add commonly used git stash aliases to git plugin
2013-10-24 20:24:59 -07:00
Robby Russell
07ad2bad66 Merge pull request #2192 from kevintraver/tmux-aliases
Add tmux aliases
2013-10-24 20:23:40 -07:00
Robby Russell
8f2e53c33e Merge pull request #2107 from maxd/master
Check bundler version to avoid error with unsupported command line arguments
2013-10-24 13:13:10 -07:00
Kevin Traver
d01ca03635 Add tmux aliases 2013-10-23 23:17:43 -07:00
oxnz
500e5a73b6 add itunes function to control itnues from the terminal 2013-10-16 16:43:03 +08:00
Lei Zhang
c0c9fc0254 Add support .venv folder as virtual env 2013-10-16 15:50:52 +08:00
Riyad Preukschas
d608fbfc7f Make the virtualenv plugin themable 2013-10-15 14:34:03 +02:00
Wes Morgan
3ca3c5a126 don't clobber existing RBENV_ROOT & follow Homebrew's default behavior 2013-10-14 09:59:20 -06:00
Kaiwen Xu
c5902d3f34 Moved misplaced plugins. 2013-10-14 07:39:59 -04:00
Cristian Măgherușan-Stanciu
190fcdffa7 Added a completion plugin for the new aws-cli tool
It also supports quickly switching AWS profiles defined in
~/.aws/config using the asp alias
2013-10-09 17:00:39 +02:00
Robby Russell
c79e5a97a9 Merge pull request #2132 from jkaving/forklift2
Add support for ForkLift 2 to the ForkLift plugin
2013-10-08 19:26:28 -07:00
Timo Sand
671db71d21 Added '.jar' 2013-10-03 13:00:12 +03:00
Timo Sand
387de3a57e Added '.war' extension to unzip 2013-10-03 09:48:49 +03:00
kaving
2be4158d8f Add support for ForkLift 2 to the ForkLift plugin
The ForkLift plugin now supports ForkLift 2 as well as ForkLift 1.
If ForkLift is not running it also waits for it to be running before
trying to switch to the specified directory
2013-10-02 10:51:21 +02:00
Steven Schmid
05b3ea342a Fix work_in_progress in empty git repos
I noticed that the function ``work_in_progress``, which is used in the "gallois"-theme, would print ``fatal: bad default revision 'HEAD'`` in a new folder after ``git init``.

This is the fix.
2013-10-01 18:08:15 +02:00
Rimenes Ribeiro
2445333200 Add reload and status alises to postgres 2013-09-24 15:20:52 -03:00
Maxim Dobryakov
e8c3619486 Check bundler version to avoid error with unsupported command line arguments 2013-09-24 13:58:48 +04:00
Robby Russell
0582bd193c Merge pull request #1763 from jonilicious/master
RVM plugin - Fixes wrong variable used in 'rb20' function
2013-09-19 06:58:51 -07:00
Robby Russell
26e936e645 Merge pull request #1967 from tchaudhri/gdc_git_alias
Added a 'git diff --cached' alias -> 'gdc'
2013-09-19 06:56:58 -07:00
Robby Russell
4275e68bb3 Merge pull request #2079 from paulmelnikow/subl
Sublime Text: Harmonize alias with the Sublime Text install instructions
2013-09-19 06:56:35 -07:00
Robby Russell
9d93608740 Merge pull request #2077 from paulmelnikow/nvm
Plugin for Node Version Manager
2013-09-19 06:52:42 -07:00
Robby Russell
ea4d3367b9 Merge pull request #2060 from dchusovitin/bug-node-doc
Fixed opening documentation on Linux (node)
2013-09-19 06:50:05 -07:00
Robby Russell
91c9d98bd8 Merge pull request #2066 from agronemann/patch-1
Update bundler.plugin.zsh
2013-09-19 06:49:28 -07:00
Robby Russell
d5701784b0 Merge pull request #2098 from monstermunchkin/master
jump plugin: fix autocompletion with single mark
2013-09-19 06:48:13 -07:00
Robby Russell
d72ebc0824 Merge pull request #2043 from quodlibetor/fix-pip
Improve pip plugin options support
2013-09-18 23:39:59 -07:00
Robby Russell
fc70d76788 Merge pull request #2053 from fluxrad/mosh
Add support for mosh (remote-shell) tab completion.
2013-09-18 23:39:12 -07:00
Robby Russell
a712579a2a Merge pull request #2099 from mchaisse/master
Added WIP (work in progress) feature to git.plugin
2013-09-18 23:38:11 -07:00
yleo77
0240ac6496 Merge remote-tracking branch 'robbyrussell/master' 2013-09-19 12:40:45 +08:00
Maxime Chaisse-Leal
095a01d92a Added WIP (work in progress) feature to git.plugin 2013-09-18 21:54:23 +02:00
Thomas Hipp
91b6a6b5a4 jump plugin: fix autocompletion with single mark
Autocompletion fails if there's only one mark, since the ls command
will not display the parent directory with the trailing colon.
Handling the single mark case separately and validating the symlink
explicitly, resolves the issue.
2013-09-18 17:13:12 +02:00
Robby Russell
b51c2a0d0b Merge pull request #1987 from zvirusz/patch-1
Added 'reinstall' command to brew completion
2013-09-11 06:20:22 -07:00
Robby Russell
045323160a Merge pull request #2002 from stibinator/master
added duckduckduck go to the web-search plugin
2013-09-11 06:20:10 -07:00
Robby Russell
e99a8fb9c2 Merge pull request #2080 from Mehonoshin/bundler-parallel-installing
Support of parallel bundle install
2013-09-11 06:16:30 -07:00
Robby Russell
cf4eded921 Merge pull request #1975 from fff/master
fix typo error in tmux plugin
2013-09-11 06:15:26 -07:00
Alexandre Joly
40b1cf0103 repo list search one level deeper
the folder structure changed '.cocoapods/' -> '.cocoapods/repos'
2013-09-10 15:20:57 +02:00
Gaetan Semet
4543852876 Completion for python, pep8, autopep8 and pylint
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2013-09-10 11:33:58 +02:00
Gaetan Semet
8735dfd87e New aliases for repo plugin
This helps a lot in day to day android development:
- rs: repo sync (git fetch on all projects)
- rra: auto rebase for all projet without loosing uncommited changes
- rsrra: do both steps at once

Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2013-09-10 11:20:07 +02:00
Alexandre Joly
bdb2cabaa6 typo 2013-09-10 09:17:09 +02:00
Alexandre Joly
f6fb34845d updated the arguments list to the newest version (0.24.0) of cocoapods 2013-09-10 09:14:24 +02:00
Jeroen Janssens
d3e005d6b4 Fix aliasing pwd 2013-09-06 15:29:14 -04:00
Jeroen Janssens
255b0c4f5e Mark function asks for confirmation and uses basename of directory when no argument is given 2013-09-06 09:55:43 -04:00
Jeroen Janssens
55d4873f91 Change marks function and remove 'function' keyword as suggested by pielgrzym in https://github.com/robbyrussell/oh-my-zsh/pull/2045#issuecomment-22820224 2013-09-06 09:40:44 -04:00
Jeroen Janssens
4517db6acc Add _completemarks function as suggested by pielgrzym in https://github.com/robbyrussell/oh-my-zsh/pull/2045#issuecomment-22826540 2013-09-06 09:34:27 -04:00
Stanislav Mekhonoshin
69ce2362d6 Support of parallel bundle install 2013-09-05 20:22:46 +04:00
Justin Aiken
a265acee4f Better filename matching 2013-09-05 10:00:14 -06:00
Justin Aiken
128cd3f566 Filter out missing links with jump autocomplete 2013-09-05 09:39:22 -06:00
Paul Melnikow
4da4d12d33 Sublime Text: Harmonize alias with the Sublime Text install instructions
The typical command is `subl`, not `st`. Leaving both for backward compatibility.

See http://www.sublimetext.com/docs/2/osx_command_line.html
2013-09-05 10:12:12 -04:00
Paul Melnikow
3007f96090 NVM: Avoid providing completions when nvm is not installed 2013-09-05 10:09:19 -04:00
Torsten Bühl
5bf20572cc Add commonly used git stash aliases 2013-09-05 14:37:37 +02:00
Paul Melnikow
e3c02bfeba Plugin for Node Version Manager 2013-09-04 18:07:58 -04:00
Dimitri Jorge
90b83b8101 Add completion for package add and remove 2013-09-01 19:23:21 +02:00
Dimitri Jorge
dd220152be Add autocompletion plugin for meteor command 2013-09-01 18:20:08 +02:00
Alexander Gronemann
958c847f54 Update bundler.plugin.zsh
Added taps to bundled_commands
2013-08-29 16:20:40 +02:00
yleo77
fda5afaebc Merge remote-tracking branch 'robbyrussell/master' 2013-08-29 13:41:42 +08:00
dchusovitin
300118ec05 Fixed opening documentation on Linux (node) 2013-08-24 13:12:03 +04:00
Felipe Contreras
9ebdbec589 gitfast: update to upstream v1.8.4
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
2013-08-23 22:00:11 -05:00
Aaron Mills
f11934e00c Add support for mosh (remote-shell) tab completion. 2013-08-19 16:28:09 -06:00
Jeroen Janssens
73c22c146c Add tab completion for jump plugin 2013-08-18 14:16:26 -04:00
Jeroen Janssens
e368bf1d4a Add jump plugin, which allows you to easily jump around the file system 2013-08-15 10:32:01 -04:00
Brandon W Maister
e4d0b2b385 Improve pip plugin options support
* -r, --record now looks for a local file instead of trying to cache
  the entire package index
* add --editable because it's useful
* add --single-version-externally-managed because it is too long
* add --record and --root because they're required by
  --single-version-externally-managed
2013-08-14 23:19:16 -04:00
stibinator
b9474c411b changed duck to ddg for alias 2013-08-14 14:04:06 +10:00
Robby Russell
434f3bc05c Merge pull request #2028 from AeonAxan/master
Add Docker Autocompleteion
2013-08-13 06:21:53 -07:00
Robby Russell
f6dbe212e8 Merge pull request #1672 from miry/rails3_command_fix
Use new style of rails command.
2013-08-13 06:21:14 -07:00
Robby Russell
39a5e36c37 Merge pull request #1790 from simlegate/master
change git  alias
2013-08-13 06:20:53 -07:00
Robby Russell
00183d1199 Merge pull request #1961 from brenttheisen/issue_1952_pr
Copy and paste of two functions from Ubuntu 13.04's version of /usr/s… …hare/zsh/functions/Completion/Unix/_git that were referenced in 46f0d8d.
2013-08-13 06:20:05 -07:00
Robby Russell
89067b5387 Merge pull request #1960 from mekanics/plugin-pod
Plugin pod
2013-08-13 06:18:37 -07:00
Ahmed Azaan
e724a63b24 Merge branch 'master' of https://github.com/AeonAxan/oh-my-zsh 2013-08-07 22:13:20 +05:30
Ahmed Azaan
2d1a07a3f7 fixed minor errors 2013-08-07 22:11:49 +05:30
Ahmed Aeon Axan
0a62f6636d Update README.md 2013-08-07 21:29:53 +05:30
Ahmed Azaan
619ecb5f4f add docker autocomplete plugin 2013-08-07 21:19:21 +05:30
stibinator
0456664463 added duckduckgo to web-search 2013-07-26 11:53:53 +10:00
stibinator
25913cf144 added duckduckgo to web-search 2013-07-26 11:49:40 +10:00
Andrey Janzen
c8dbadd3da Added completion for second argument for 'brew reinstall' 2013-07-23 21:32:55 +07:00
Robby Russell
5fcb6e1263 Merge pull request #1988 from jwarwick/mix
Added autocompletion support for Elixir mix command
2013-07-23 07:24:58 -07:00
Robby Russell
dde7aefc67 Merge pull request #1992 from jeromemacias/patch-1
Fix symfony command completion 'permission denied'
2013-07-23 07:24:27 -07:00
Robby Russell
34ce86e4c8 Merge pull request #1994 from kennethgeerts/master
Updated gem plugin zsh completion (gem 2.0.3).
2013-07-23 07:23:59 -07:00
Kenneth Geerts
107d196f94 Updated gem plugin zsh completion (gem 2.0.3). 2013-07-23 15:51:35 +02:00
Andrey Janzen
b456541cc3 In capistrano completion show also tasks without description 2013-07-23 15:52:44 +07:00
Jérôme Macias
d0e312fc13 Fix symfony command completion 'permission denied' 2013-07-22 15:51:16 +02:00
John Warwick
4b8e109584 Added autocompletion support for Elixir mix command 2013-07-19 23:19:11 -04:00
Andrey Janzen
cbbdc0dfeb Added 'reinstall' command to brew completion 2013-07-20 10:12:06 +07:00
Robby Russell
2cc4801bd2 Merge pull request #1980 from awidegreen/upstream
Fix ssh-agent plugin identities comment for using multiple identities.
2013-07-16 20:45:19 -07:00
Trae Robrock
9a9e6e9299 No cat, and hide errors for missing cache file 2013-07-16 17:01:58 -07:00
Trae Robrock
00ccee1f33 Add knife_ssh command to make connecting to servers managed with chef easier 2013-07-16 16:58:55 -07:00
Armin Widegreen
5c529b5daa Fix ssh-agent plugin identities comment for using multiple identities. 2013-07-16 17:24:07 +02:00
yleo77
6041e4938c set default value --max-count=10 2013-07-16 16:54:54 +08:00
yleo77
67b2781f62 Merge remote-tracking branch 'robbyrussell/master' 2013-07-16 16:37:18 +08:00