Commit graph

1,202 commits

Author SHA1 Message Date
Gernot Höflechner
761af48047 Merge bbededdd29 into 2403b05613 2014-03-22 15:45:09 +00: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
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
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
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
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
LFDM
89433cbc4e Deletes dot aliases from common-aliases.
They are implemented in lib anyway.
2014-03-14 08:19:17 +01:00
LFDM
cbf48828e3 Pushes autoenv code to its plugin.
Sources the activate.sh file or informs the user, that its not
available.
Overriding the cd function, as it was formerly done, is not needed
anymore, activate.sh does this by itself.
2014-03-14 08:19:17 +01: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