Commit Graph

3618 Commits

Author SHA1 Message Date
Robby Russell
f3fa41834d Merge branch 'master' of github.com:robbyrussell/oh-my-zsh 2015-10-05 13:46:26 -07:00
Robby Russell
d26549b7ec 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
62c86f5c75 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
f104d1624d 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
2d9df4468f 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
920ab071cb Merge pull request #4423 from gfvcastro/alias-rake-middleware
Add 'rake middleware' alias.
2015-10-03 14:37:29 -07:00
Robby Russell
bff88685b8 Merge pull request #4429 from RobLoach/removeatom
Remove Atom plugin
2015-10-03 14:36:14 -07:00
Robby Russell
867d586253 Merge pull request #4445 from wweaver/git-hf-aliases
Add Git Hubflow aliases
2015-10-03 14:34:20 -07:00
Robby Russell
80179c10be 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
5d24ba4228 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
30c7ef7d2b Merge pull request #4421 from jcpst/master
gulp plugin: missing opening double quote
2015-10-03 14:32:40 -07:00
Robby Russell
bd264980a5 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
d7e7ef6f94 Merge pull request #4427 from xavhan/patch-1
Add alias for npm global install
2015-10-03 14:31:55 -07:00
uberspot
df5e1f9c2c Add 3 more nmap aliases to nmap plugin 2015-10-03 19:37:12 +02:00
Will Weaver
b35d78f2f8 Add Git Hubflow aliases 2015-10-02 08:14:06 -04:00
Andrew Janke
7f2656c126 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
f9c16f940e Remove broken link and move npmg alias position 2015-09-30 16:42:46 +02:00
Robby Russell
a9c882094d 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
0516a39dec Remove Atom plugin
The Atom plugin is obsolete.

See #3193
2015-09-29 12:16:18 -04:00
Xavier Haniquaut
df80081e9b Add alias for npm global install 2015-09-29 10:20:55 +02:00
Andrew Janke
4589bc6c65 completion: turn off the #3889 compfix check by default 2015-09-28 18:09:29 -04:00
Gutem
1e305e0186 Update Simulator's Path to XCode 7.x 2015-09-28 16:04:25 -03:00
Gustavo Villa
3e04cd62d3 Add 'rake middleware' alias. 2015-09-28 14:59:06 -03:00
Joseph Post
5af52fbc75 gulp plugin: missing opening double quote & had unneeded parens on function 2015-09-28 10:50:35 -05:00
Robby Russell
52e2aaee06 Merge pull request #4411 from TylerCharlesworth/patch-1
Fixes Sublime Cygwin support
2015-09-28 07:31:05 -07:00
Tyler Charlesworth
2266368b77 Update sublime.plugin.zsh 2015-09-27 16:51:38 -07:00
Robby Russell
b05ef1034f 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
a51a9169a9 Merge pull request #4348 from andybateman/patch-1
Display song currently playing in iTunes
2015-09-27 12:40:31 -07:00
Robby Russell
9e291033d9 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
156fa5fa10 Merge pull request #4396 from TylerCharlesworth/patch-1
Adds Cygwin support to Sublime
2015-09-27 12:39:27 -07:00
Robby Russell
4b902d75a2 Merge pull request #4410 from justVitalius/master
Fix print rvm version in amuse theme
2015-09-27 12:38:15 -07:00
justvitalius
dc3413b91c Fix print rvm version in amuse theme 2015-09-27 19:01:12 +03:00
Robby Russell
b75b0b8882 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
935948cf3b 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
b5a5bc9ae5 Merge pull request #4337 from iCross/master
fix url-quote-magic not working issue
2015-09-26 09:35:12 -07:00
Robby Russell
f186b62704 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
d47219fbce 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
c932eb3f04 Merge pull request #4385 from Philosoft/patch-1
Update README.md for vi-mode
2015-09-26 09:33:33 -07:00
Robby Russell
c076fc0842 Merge pull request #4392 from ag4ve/patch-1
Correct repo dir
2015-09-26 09:32:37 -07:00
Robby Russell
4204cfd22f Merge pull request #4408 from DoomHammer/fix-chruby-test-expression
Fix invalid test expression.
2015-09-26 09:30:54 -07:00
Robby Russell
a97a308604 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
3b2d03630f 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
ccc86dae76 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
a8617192f7 Merge pull request #4340 from pahnev/master
Fixed broken git branch icon
2015-09-26 09:29:14 -07:00
Piotr Gaczkowski
17088c6431 Fix invalid test expression. 2015-09-25 22:53:40 +02:00
Aleksandar Vidakovic
0c0450b303 Accept single and double quotes in Gulp plugin 2015-09-24 11:51:15 +01:00
Tyler Charlesworth
07f08aa731 Adds Cygwin support 2015-09-24 01:25:22 -07:00
Michael SALIHI
8e74f7c1aa Add alias for print latest tag name 2015-09-24 02:22:50 +02:00
Andrew Janke
96ff86142e Merge branch 'master' into installer-cygwin-support-3
Conflicts:
	tools/install.sh
2015-09-23 18:53:05 -04:00
shawn
7a636097f8 Correct repo dir
cvs's metadata is under CVS and not .cvs
2015-09-23 18:47:09 -04:00