Commit graph

3,622 commits

Author SHA1 Message Date
Robby Russell
8c30dfd552 Merge branch 'master' of github.com:robbyrussell/oh-my-zsh 2015-10-09 07:08:05 -07:00
Robby Russell
48d8919fcc Renaming colored-man to colored-man-pages because it needs to be. 2015-10-09 07:07:57 -07:00
Robby Russell
53feb70dd3 Merge pull request #4472 from theavish/master
Fix ohmyz.sh link
2015-10-09 07:02:14 -07:00
Avi Samloff
43175d38a5 Fix ohmyz.sh link
Change http://ohmyz.sh link to use proper markdown syntax
2015-10-08 15:07:24 -07:00
Robby Russell
44e3939404 Merge branch 'master' of github.com:robbyrussell/oh-my-zsh 2015-10-05 13:46:26 -07:00
Robby Russell
a4e9356619 Removing legacy rails-specific aliases from the Textmate plugin. This is probably best handled as a custom plugin. 2015-10-05 13:46:20 -07:00
Robby Russell
469c34902a Merge pull request #4444 from apjanke/git-extras-compatibility
git-extras: fix for compatibility with zsh _git
2015-10-05 07:50:08 -07:00
Robby Russell
dba3e9de32 Merge pull request #4455 from swvjeff/master
Fix 'ack-grep' bug for non-ubuntu users
2015-10-04 10:00:37 -07:00
Jeff Smith
3ac135dff0 Fix 'ack-grep' bug for non-ubuntu users
Redirect STDERR along with STDOUT when looking for ack-grep
2015-10-03 18:39:41 -07:00
Robby Russell
cf53c637e1 Merge pull request #4423 from gfvcastro/alias-rake-middleware
Add 'rake middleware' alias.
2015-10-03 14:37:29 -07:00
Robby Russell
6a0c8424fd Merge pull request #4429 from RobLoach/removeatom
Remove Atom plugin
2015-10-03 14:36:14 -07:00
Robby Russell
f009e5c79a Merge pull request #4445 from wweaver/git-hf-aliases
Add Git Hubflow aliases
2015-10-03 14:34:20 -07:00
Robby Russell
626bde2664 Merge pull request #4453 from uberspot/master
Add 3 more nmap aliases to nmap plugin
2015-10-03 14:33:35 -07:00
Robby Russell
11125741f8 Merge pull request #3165 from hbin/fix-alias-afind-osx
The executable command on Mac OSX is 'ack' rather than 'ack-grep'.
2015-10-03 14:33:10 -07:00
Robby Russell
57500b8b51 Merge pull request #4421 from jcpst/master
gulp plugin: missing opening double quote
2015-10-03 14:32:40 -07:00
Robby Russell
b3d89e9a28 Merge pull request #4424 from Gutem/patch-1
Update Simulator's Path to XCode 7.x
2015-10-03 14:32:12 -07:00
Robby Russell
e03ab4aae8 Merge pull request #4427 from xavhan/patch-1
Add alias for npm global install
2015-10-03 14:31:55 -07:00
uberspot
8b0ffc13e6 Add 3 more nmap aliases to nmap plugin 2015-10-03 19:37:12 +02:00
Will Weaver
b9ba2ec71a Add Git Hubflow aliases 2015-10-02 08:14:06 -04:00
Andrew Janke
7ff3ce8415 git-extras: fix for compatibility with zsh _git
This changes all the __git_* functions it was defining to __gitex_* to avoid collisions with the internal functions used inside _git from zsh.
2015-10-02 03:18:28 -04:00
Xavier Haniquaut
882710ee8b Remove broken link and move npmg alias position 2015-09-30 16:42:46 +02:00
Robby Russell
6d759e5fa0 Merge pull request #4426 from apjanke/turn-off-3889-by-default
completion: turn off the #3889 compfix check by default
2015-09-29 11:31:59 -07:00
Rob Loach
b93c821aba Remove Atom plugin
The Atom plugin is obsolete.

See #3193
2015-09-29 12:16:18 -04:00
Xavier Haniquaut
aae1256c03 Add alias for npm global install 2015-09-29 10:20:55 +02:00
Andrew Janke
a22e9c781c completion: turn off the #3889 compfix check by default 2015-09-28 18:09:29 -04:00
Gutem
76baaec860 Update Simulator's Path to XCode 7.x 2015-09-28 16:04:25 -03:00
Gustavo Villa
041ecebfad Add 'rake middleware' alias. 2015-09-28 14:59:06 -03:00
Joseph Post
d92847ebe2 gulp plugin: missing opening double quote & had unneeded parens on function 2015-09-28 10:50:35 -05:00
Robby Russell
68f2d09798 Merge pull request #4411 from TylerCharlesworth/patch-1
Fixes Sublime Cygwin support
2015-09-28 07:31:05 -07:00
Tyler Charlesworth
5cf9900a9f Update sublime.plugin.zsh 2015-09-27 16:51:38 -07:00
Robby Russell
398afc4c48 Merge pull request #4121 from apjanke/chucknorris-check-for-fortune
chucknorris: check for fortune/strfile dependency
2015-09-27 12:42:38 -07:00
Robby Russell
9cd6f3a0b3 Merge pull request #4348 from andybateman/patch-1
Display song currently playing in iTunes
2015-09-27 12:40:31 -07:00
Robby Russell
5ad381ef9f Merge pull request #4394 from PrestanceDesign/new-git-alias
Add alias for print latest tag name
2015-09-27 12:39:51 -07:00
Robby Russell
40bc1d61b3 Merge pull request #4396 from TylerCharlesworth/patch-1
Adds Cygwin support to Sublime
2015-09-27 12:39:27 -07:00
Robby Russell
bea2250f89 Merge pull request #4410 from justVitalius/master
Fix print rvm version in amuse theme
2015-09-27 12:38:15 -07:00
justvitalius
a45808489b Fix print rvm version in amuse theme 2015-09-27 19:01:12 +03:00
Robby Russell
3017af48f5 Merge pull request #4333 from mbologna/fedora_plugin
Added fedora plugin, based on dnf/yum plugin
2015-09-26 09:37:24 -07:00
Robby Russell
85a7c0b4bc Merge pull request #3646 from apjanke/installer-cygwin-support-3
Add Cygwin support to installer.
2015-09-26 09:35:39 -07:00
Robby Russell
df1cbe0f3c Merge pull request #4337 from iCross/master
fix url-quote-magic not working issue
2015-09-26 09:35:12 -07:00
Robby Russell
806d609783 Merge pull request #4387 from mbologna/fix_git_equal_remote
Uniform git prompt equal remote
2015-09-26 09:34:58 -07:00
Robby Russell
efe9f7581c Merge pull request #4397 from vidakovic/master
Accept single and double quotes in Gulp plugin
2015-09-26 09:34:25 -07:00
Robby Russell
db76db2593 Merge pull request #4385 from Philosoft/patch-1
Update README.md for vi-mode
2015-09-26 09:33:33 -07:00
Robby Russell
08dad5274c Merge pull request #4392 from ag4ve/patch-1
Correct repo dir
2015-09-26 09:32:37 -07:00
Robby Russell
05aee32115 Merge pull request #4408 from DoomHammer/fix-chruby-test-expression
Fix invalid test expression.
2015-09-26 09:30:54 -07:00
Robby Russell
906a5714b5 Merge pull request #4349 from FishingCactus/fix-atom_plugin_for_cygwin
Fixed atom plugin for cygwin users
2015-09-26 09:29:53 -07:00
Robby Russell
c5e33e6c20 Merge pull request #4377 from fcrozat/master
Do not fail if tput is not available
2015-09-26 09:29:34 -07:00
Robby Russell
897a78eb0e Merge pull request #4375 from PrestanceDesign/capistrano-plugin-fix
Fix capistrano problem when generating autocompletion
2015-09-26 09:29:25 -07:00
Robby Russell
9b64676b7d Merge pull request #4340 from pahnev/master
Fixed broken git branch icon
2015-09-26 09:29:14 -07:00
Piotr Gaczkowski
fe213d337e Fix invalid test expression. 2015-09-25 22:53:40 +02:00
Aleksandar Vidakovic
ad530b1eef Accept single and double quotes in Gulp plugin 2015-09-24 11:51:15 +01:00