1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2024-12-21 03:41:57 +00:00
Commit graph

2906 commits

Author SHA1 Message Date
Felipe Contreras
169cd8b6ca gitfast: update to upstream v2.4
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
2016-05-18 03:07:09 -05:00
Felipe Contreras
0b5d18a247 gitfast: update to upstream v2.0
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
2016-05-17 20:27:18 -05:00
Sebastian Gniazdowski
e2d157d589 znt: update to v2.1.15 2016-05-16 16:29:17 +02:00
Robin Chalas
621eb21139 Fix deprecated usage (#5050)
When using the command alias `sfcontainer` or `sfrouter`, the following warning occurs:

> ! [CAUTION] The use of "container:debug" command is deprecated since version 2.7 and will be removed in 3.0. Use the
> ! "debug:container" instead.
2016-05-14 17:19:26 +02:00
Wanbok Choi
615af65087 Add 'gcn!' for the '--no-edit' option. (#4830)
Remove the '-s' option from 'gcan!'
Add 'gcans!'. It is the same as the current 'gcan! -s'.
2016-05-14 13:45:55 +02:00
Shang Yehua
5aa7e0f600 Add mvn options to ignore test failures (#5092)
add "-Dmaven.test.failure.ignore=true" .
This option will not ignore all tests but ignore the failures when run tests.

See http://maven.apache.org/surefire/maven-surefire-plugin/test-mojo.html#testFailureIgnore
2016-05-14 12:14:34 +02:00
Marc Cornellà
4a1e89c58b Merge pull request #5076 from tomasnorre/VagrantSnapshot
[TASK] Vagrant plugin: Add missing vagrant snapshot command
2016-05-12 20:19:26 +02:00
Marc Cornellà
52723876f9 Add README to meteor plugin 2016-05-12 17:06:44 +02:00
Juan David Pastas
edf89bffdc Add meteor plugin aliases
Signed-off-by: Marc Cornellà <marc.cornella@live.com>
2016-05-12 17:04:13 +02:00
Marc Cornellà
30870d87dd Reword and fix formatting of mvn plugin README 2016-05-12 13:41:29 +02:00
Vimal Raj
863675f3d4 Add README file for mvn plugin
Signed-off-by: Marc Cornellà <marc.cornella@live.com>
2016-05-12 13:41:15 +02:00
Marc Cornellà
817889c95f Merge branch 'manu09-patch-1'
Close #4938
2016-05-12 13:29:42 +02:00
manu
2ad13bd945 This plugin also includes tab completions
Signed-off-by: Marc Cornellà <marc.cornella@live.com>
2016-05-12 13:29:20 +02:00
jgmdev
2bce3b1f58 Added fossil plugin. 2016-05-10 13:23:23 -03:00
Tomas Norre Mikkelsen
244d6b1df9 [TASK] Vagrant plugin: Add missing vagrant snapshot command
Fixes issue #5022
2016-05-10 08:09:12 +02:00
Marc Cornellà
0ebe35968c Merge pull request #4907 from johankj/feature/osx-iterm2
Add iTerm2 v3 support
2016-05-01 16:23:25 +02:00
Nicolas Charpentier
3524fc8de5 JIRA Plugin will open rapidboard instead of dashboard if JIRA_RAPID_BOARD is true 2016-04-26 13:08:13 -04:00
Marc Cornellà
1b1315a777 Merge pull request #5027 from tony612/add-files-completion-to-mix-test
add files completion to mix test
2016-04-20 23:05:55 +02:00
Marc Cornellà
63ad70825d Merge pull request #5023 from psprint/master
[znt] Don't leave positional parameters being set
2016-04-20 21:10:11 +02:00
Tony Han
c1ed14189b add files completion to mix test 2016-04-20 23:09:52 +08:00
Sebastian Gniazdowski
19769fded2 Don't leave positional parameters being set 2016-04-20 07:33:10 +02:00
Sharat M R
f28c0a81b7 Moved git.io url to https
git.io now redirects to https. So the current function break. Changing it to https fixes the issue.
2016-04-16 06:52:58 +05:30
Rob Loach
616ac67924 Add 'asdf' plugin 2016-03-30 02:05:07 -04:00
Marc Cornellà
b4a85eca9d Merge pull request #4728 from atk91/4727
Remove --color flag from git log aliases

The way to colorize `git log` output is by setting the `color.ui` configuration.
2016-03-30 04:46:22 +02:00
Marc Cornellà
c74681a199 Merge pull request #2392 from s7anley/master
Geeknote autocomplete and alias
2016-03-30 04:31:09 +02:00
Marc Cornellà
d1a5fad25b Merge pull request #4943 from MattLewin/master
Update 'tm' function to take multiple files on the command-line
2016-03-30 04:29:56 +02:00
Marc Cornellà
dfccac312c Merge pull request #3892 from delphiki/sf2-plugin
Added environment based shortcuts in symfony2 plugin
2016-03-30 03:40:55 +02:00
Marc Cornellà
8daa52d56c Merge pull request #4809 from aried3r/patch-1
Add missing alias to README of bundler plugin
2016-03-30 03:19:14 +02:00
Robby Russell
5365cca76a Merge pull request #4849 from gkotian/master
Minor README fixes
2016-03-26 10:49:18 -07:00
Matthew Lewin
fc89773413 Update 'tm' function to take multiple files on the command-line 2016-03-25 11:57:09 -07:00
Antonis Karamitros @antouank
097cc70f7b [feature/npm-outdated]
- add alias for "npm outdated" to check outdated npm modules
2016-03-24 07:28:26 +00:00
Johan K. Jensen
d189236f75 Add iTerm2 v3 support 2016-03-08 13:17:23 +01:00
Will Mendes
480ad804a6 Fix bug in compass docs search 2016-02-22 00:09:27 +11:00
Marvin Frommhold
31614f8c40 fix terminal color pollution, see issue https://github.com/robbyrussell/oh-my-zsh/issues/4856 2016-02-18 15:50:15 +01:00
Gautam Kotian
eee6f08421 Minor README fixes 2016-02-15 10:51:17 +01:00
Marc Cornellà
624518054b Add README to dnf plugin 2016-02-11 21:45:24 +01:00
Marc Cornellà
c0b12523fe Fix deprecated dnf commands
Update -> upgrade
Erase -> remove
2016-02-11 21:38:10 +01:00
George Machitidze
ee86f1a627 Create dnf plugin
Adds some useful aliases
2016-02-11 21:37:50 +01:00
Filippo Valsorda
52737b1828 git.plugin: remove the conflicting gvt alias
See FiloSottile/gvt#19 and FiloSottile/gvt#4
2016-02-10 18:31:49 +00:00
Glenn / devalias
2a0be1aad4 Add hash imported from 2016-02-10 10:17:18 +11:00
Glenn / devalias
db39afe95b Update _brew to match latest
Updated _brew to match latest in https://github.com/Homebrew/homebrew/blob/master/Library/Contributions/brew_zsh_completion.zsh
2016-02-09 15:43:17 +11:00
Eddie Dunn
78bf3dd9b2 pylint.plugin.zsh: Remove include-ids=y
The flag `--include-ids` is soon to be deprecated for Pylint. This pull request
removes that option from pylint-quick
2016-02-07 21:31:25 +01:00
Anton Rieder
a6ad7a0c8d Add missing alias to README of bundler plugin 2016-01-29 13:04:53 +01:00
low-ghost
494b07b093 Update gitignore.plugin: comma separated arguments
Seems like this is more like the intended effect, splits arguments with commas
for proper gitignore.io api request.
Thanks for teaching me about custom compdef completions!

Updated with zsh join operator by Marc Cornellà
2016-01-18 21:54:10 +01:00
Sébastien Larivière
7daa207dbc Adding support for stdin input in the encode64 plugin 2016-01-18 21:01:04 +01:00
Marc Cornellà
40016afdc4 Merge pull request #4755 from psprint/master
znt: optimizations for zsh<=5.2
2016-01-18 15:16:48 +01:00
Sebastian Gniazdowski
77f93f61c5 znt: optimizations for zsh<=5.2, use $BUFFER if cmd is not from history 2016-01-18 08:53:54 +01:00
Marc Cornellà
87e782f91e Merge pull request #4738 from valentinbud/feature-vault
Vault basic autocompletion
2016-01-15 20:11:38 +01:00
“Valentin
b9ace28179 Vault basic autocompletion. 2016-01-15 21:03:34 +02:00
Marc Cornellà
071db94ec3 Merge pull request #4713 from apjanke/forklift-new-homepage
forklift: update homepage URL and tweak formatting
2016-01-15 18:20:06 +01:00
Marc Cornellà
4b9bc91ce4 Merge pull request #4537 from agireud/command-not-found-OSX
Add OSX support for command-not-found
2016-01-15 18:18:46 +01:00
Andrew Janke
9dd8def169 forklift: update homepage URL and tweak formatting 2016-01-08 23:35:22 -05:00
Stefan Wrobel
3dfd2166fa chruby plugin locals moved inside function 2016-01-07 17:31:03 -08:00
Satoshi Ohmori
06659f7fc1 Support bundler 2015-12-25 19:54:12 +09:00
atk91
d853ec4b62 Closes #4727 2015-12-25 11:33:29 +03:00
Marc Cornellà
30ddf25fd7 Merge pull request #4695 from mcornella/add-hub-completion
Add hub's completion file
2015-12-16 12:34:03 +01:00
Paul Calabro
247a582d09 Fixed a typo. 2015-12-15 22:52:13 -07:00
Pavan Rikhi
3ebbb40b31 colored-man-pages: Use Portable less Path 2015-12-15 15:13:19 -05:00
Marc Cornellà
6ad6d114dc Merge pull request #4700 from giordanovi/master
Update gulp.plugin.zsh
2015-12-15 12:17:46 +01:00
Giordano Vicari
015437cab8 Update gulp.plugin.zsh
Remove `local` stuff that cause an error in shell
2015-12-15 12:14:41 +01:00
Marc Cornellà
3162de563f Add hub's completion file
This uses the version at commit 35c76bf (2015-12-08)
35c76bf91d
2015-12-15 11:57:24 +01:00
Marc Cornellà
5e310c5308 Fix syntax error in colored-man-pages
Commit 09d2a597a5 introduced the bug, which is due to using
single brackets conditions at the same time as *.

This commit should fix it and use double brackets everywhere
else.

Fixes #4699
2015-12-15 11:56:16 +01:00
Marc Cornellà
fe9ff63ced Merge pull request #4463 from giordanovi/master
Fetch Gulp tasks list in a better way
2015-12-15 11:44:59 +01:00
Giordano Vicari
4f314e2a32 Update gulp.plugin.zsh
Add local stuff
2015-12-15 11:41:36 +01:00
Giordano Vicari
8042394c78 Update gulp.plugin.zsh
Sort pipe dropped and fix 2>/dev/null
2015-12-15 11:14:25 +01:00
Marc Cornellà
cb11d139b4 Merge pull request #4697 from psprint/master
znt: more optimizing workarounds for 5.0.6 <= zsh < 5.2
2015-12-15 11:03:14 +01:00
Sebastian Gniazdowski
d30a501b1c znt: more optimizing workarounds for 5.0.6 <= zsh < 5.2 2015-12-15 11:02:10 +01:00
Marc Cornellà
09d2a597a5 Fix style of colored-man-pages plugin 2015-12-15 04:11:40 +01:00
cknoblauch
a8157293a7 colored-man plugin: Quoted PATH variable
Some environments (in my case, cygwin) have PATH variables with directories
with spaces in them, breaking colored-man.
Adding quotes around the PATH environment variable makes the plugin run OK.
2015-12-15 04:06:23 +01:00
Marc Cornellà
ef31d06426 Merge pull request #4139 from ultimatemonty/patch-1
Nicer formatting of ember aliases in README
2015-12-15 03:37:44 +01:00
Andrew Janke
9f552130bd Move current_branch() from git plugin to core lib/git.zsh
Fixes #4085: core -> plugin dependency issue.
Rename it to git_current_branch for clarity that it's git-specific.
Update all plugins that were calling it to use new name.
Fix variable leaks by making more variables in lib/git.zsh local.
Have lib/git.zsh use [[ ]] instead of [ ] everywhere.
2015-12-14 20:28:37 -05:00
Marc Cornellà
bfd2d8de24 Merge pull request #4498 from gfvcastro/alias-rake-stats
Add 'rake stats' alias.
2015-12-15 02:21:51 +01:00
Marc Cornellà
93c00cced5 Merge pull request #4451 from victor-torres/branch-plugin
Add branch plugin
2015-12-15 01:02:49 +01:00
Marc Cornellà
d988ee01c2 Merge pull request #4568 from blueyed/archlinux-improve-commands-lookup
archlinux: use $+commands instead of 'command -v' in a subshell
2015-12-15 01:01:47 +01:00
Victor Torres
fe63ed09b7 Updating speed test info and using zsh command line. 2015-12-14 20:58:29 -03:00
Victor Torres
cf5db83fac Implementing mcornella's suggestions in pull request 4451. 2015-12-14 17:39:26 -03:00
Marc Cornellà
6a8692da7c Merge pull request #4676 from bamarni/composer-stderr
[Composer] redirect stderr to /dev/null for completion commands
2015-12-14 11:25:43 +01:00
Marc Cornellà
4108c4895f Merge pull request #4690 from kaelig/patch-1
Update link to git completion
2015-12-14 02:21:32 +01:00
Kaelig
6190d3e8ba Point to the GitHub repository 2015-12-13 16:49:13 -08:00
Marc Cornellà
273063ad59 Merge pull request #4663 from psprint/master
znt: faster startup of tools using colorifying (e.g. n-history), optimized heap usage for older Zsh's
2015-12-14 00:41:40 +01:00
Andrew Janke
45822e85c5 history-substring-search: bind arrows in both emacs and viins modes
This avoids an ordering dependency between this and the vi-mode plugin.
2015-12-13 21:34:02 +01:00
Kaelig
b6997f6972 Update link to git completion 2015-12-11 15:36:55 -08:00
Marc Cornellà
5e950d4fa0 Merge pull request #4689 from apjanke/fix-non-numeric-versions
common-aliases: handle "dev" versions in version check
2015-12-11 22:02:50 +01:00
Marc Cornellà
45e42efa45 Merge pull request #4657 from hghwng/master
Recognize Firefox addon and Android packages.
2015-12-11 14:13:30 +01:00
Marc Cornellà
07fcbbe74c Merge pull request #4641 from WeeBull/patch-1
Use actual `commit --amend` command for Mercurial
2015-12-11 13:58:33 +01:00
Andrew Janke
c52f67746b common-aliases: handle "dev" versions in version check
Uses `is-at-least` instead of a numeric comparison hack, so versions with non-numeric bits like "4.5.0-dev5" don't throw errors.
2015-12-11 03:03:38 -05:00
Gregory McCue
fb5effd5d8 Add Ecosia to web-search plugin. 2015-12-10 22:58:53 +01:00
Sebastian Gniazdowski
357d57c541 znt: include some status information on top of the window 2015-12-07 14:15:09 +01:00
Bilal Amarni
0d45e771c8 [Composer] redirect stderr to /dev/null for completion commands 2015-12-06 13:56:10 +01:00
Sebastian Gniazdowski
c793baeadd znt: optimize heap usage for older Zsh's (e.g. 5.0.8) 2015-12-04 19:51:09 +01:00
Sebastian Gniazdowski
89205f90e5 znt: faster startup of tools using colorifying (e.g. n-history) 2015-12-03 11:07:35 +01:00
Hugh Wang
a42a3eead7 Recognize Firefox addon and Android packages. 2015-12-02 12:05:05 +08:00
Marc Cornellà
c82f49e734 Merge pull request #4652 from psprint/master
znt: updated README.md, twice as fast searching
2015-12-02 01:33:23 +01:00
Marc Cornellà
f7ed7244c2 Merge pull request #3321 from moul/pr-tmux-cssh
[tmux-cssh plugin] Initial version
2015-12-01 00:04:12 +01:00
Sebastian Gniazdowski
d427ac1ef9 znt: twice as fast searching 2015-11-30 19:22:34 +01:00
Sebastian Gniazdowski
ae84be7e31 znt: updated README.md 2015-11-30 18:30:05 +01:00
Sebastian Gniazdowski
39e4dfb6a6 Updated README.md 2015-11-30 18:05:55 +01:00
Sebastian Gniazdowski
c8852902a9 Renamed README.txt to README.md 2015-11-30 15:05:49 +01:00
Sebastian Gniazdowski
c2b4d9ff40 znt: n-history supports multi-line cmds and starts with current buffer 2015-11-30 10:48:30 +01:00
Marc Cornellà
afd28bf1fc Merge pull request #4368 from psprint/master
Update Zsh Navigation Tools plugin
2015-11-30 09:50:37 +01:00
Marc Cornellà
46824b39a3 Merge pull request #4191 from apjanke/vi-mode-fix-smkx
vi-mode: fix smkx/rmkx by removing broken line-init/finish widgets
2015-11-29 14:31:35 +01:00
Marc Cornellà
d3b9520501 Merge branch 'apjanke-z-allow-custom'
Closes #4578
2015-11-27 17:12:45 +01:00
Andrew Janke
2205aa42aa z plugin: fix loading from custom location
The old implementation would attempt to load both the default and custom
implementations, with the custom one coming first, so it would get clobbered
by the default version.
2015-11-27 17:12:09 +01:00
Marc Cornellà
85d949550b Merge pull request #4181 from posva/z
Update z version to 5dc2a86
2015-11-27 17:09:05 +01:00
Andrew Janke
7e398391db history-substring-search: update to upstream version 2015-09-28
Updates OMZ's copy to commit 2c295432175990c1bb4e90bc13f609daa67a25d6 from zsh-users/zsh-history-substring-search
2015-11-27 16:59:06 +01:00
Andrew Janke
d7e6ba0b66 history-substring-search: add a script to automatically update OMZ from the upstream repo 2015-11-27 16:59:06 +01:00
Marc Cornellà
befb5b66c5 Merge pull request #4634 from mfaerevaag/master
[wd] update minor version (v0.4.2)
2015-11-27 16:51:05 +01:00
Marc Cornellà
90e1630163 Merge pull request #4443 from apjanke/github-update
Update github plugin to work with current hub versions
2015-11-27 16:07:00 +01:00
WeeBull
b57ddd6a67 Use actual commit --amend command for Mercurial
Rather than trying to emulate `git commit --amend` using mercurial queues (which might have side effects if you're using MQ for other things) use the `commit --amend` command which was introduced in Mercurial 2.2 (2012-05-01).
2015-11-26 14:08:53 +00:00
Markus Faerevaag
7d9648e631 [wd] update minor version (v0.4.2) 2015-11-23 22:22:45 +01:00
Marc Cornellà
249d2229d4 Cleanup gradle plugin file
- Delete useless #!zsh
- Simplify gradle build file check
- Format comments and delete TODO stuff (already dealt with)
- Use `$()` syntax for cat commands
2015-11-21 03:16:34 +01:00
Gergely Nagy
950bbccd60 gradle plugin: also list tasks in subprojects 2015-11-21 03:16:34 +01:00
Marc Cornellà
64e1252bd5 Merge pull request #4623 from apjanke/dircycle-remove-redundant-bindings
dircycle: remove redundant key bindings
2015-11-20 18:08:11 +01:00
Marc Cornellà
5d8fd93cac Merge pull request #4617 from ahmadawais/patch-1
Removed Similar Aliases
2015-11-20 18:07:55 +01:00
Marc Cornellà
7627004a2f Merge pull request #4612 from stereodenis/patch-1
bundle outdated alias
2015-11-20 18:05:21 +01:00
Andrew Janke
c8e280f2ab dircycle: remove redundant key bindings
In bindkey strings, "^[" and "\e" mean the same thing. They're both notations for Escape.
2015-11-18 07:02:22 -05:00
Andrew Janke
8ea773582f vi-mode: remove line-init/finish widgets that broken terminfo keybindings
The zle-line-init and zle-line-finish definitions here were broken with
respect to smkx/rmkx because their "if" logic had fallthrough where it shouldn't,
so the mode was left in rmkx all the time. This just removes those widgets
entirely, because they're now defined (correctly) in lib/keybindings.zsh and
not needed in plugins.
2015-11-18 06:06:20 -05:00
Ahmad Awais
8f823c6371 Update README.md 2015-11-17 12:23:39 +05:00
Andrew Janke
cca422eacf Mercurial plugin: revise README
Closes #4616
Changes the `plugins=(... mercurial ...)` to be closer to correct zsh syntax, removing commas and extra spaces.
Revises discussion on configuring themes to avoid sounding like users should modify the theme definition file in the main OMZ folder. Prioritizes the suggestion of using a theme which already supports hg_prompt_info.
2015-11-16 16:57:42 -05:00
Ahmad Awais
602cc62a5d Removed Similar Aliases
Two similar aliases which were causing issues.
2015-11-16 23:37:02 +05:00
Denis
bee79f0871 bundle outdated alias 2015-11-16 01:33:20 +03:00
Andrew Janke
24492a2fdb Update github plugin to work with current hub versions
Removes old completion setup that breaks with current _git and _hub completions.
Ruby is no longer required by hub; removes that test.
Does not define new completions for hub; they are now defined by hub itself.
Change the functions to use hub to create the repos on GitHub.
Add error checking to the functions.
Removes apparently-unused _github completion definition.
2015-11-06 04:10:33 -05:00
Eduardo San Martin Morote
d3363964a2 Updated z version
Closes #3248
Closes #4570
2015-11-04 16:23:48 +01:00
Alberto Gireud
f6557932e9 Add OSX support for command-not-found 2015-11-02 01:32:15 -06:00
Sebastian Gniazdowski
4c292ea2b0 Initial commit of Zsh Navigation Tools 2015-11-01 16:10:55 +01:00
Daniel Hahler
9e4aba4c8c archlinux: use $+commands instead of 'command -v' in a subshell 2015-11-01 00:21:26 +01:00
Danny Hawkins
8d388e464c use capit instead of shipit as shipit conflicts with npm package shipit 2015-10-30 08:11:38 +00:00
Cooper Maruyama
9264d75d5d Fix typo.
* `cfp` alias was referencing an old version of the `cf` command which
no longer exists. This has been updated to reference a valid command.
2015-10-21 17:08:20 +02:00
Marc Cornellà
405ee83af4 Merge pull request #4500 from sachin21/modify_a_condition
[FIX ERROR] Refactor for function in plugins/rake-fast/rake-fast.plugin.zsh
2015-10-21 16:52:32 +02:00
Satoshi Ohmori
a1755e652c Refactor for method in plugins/rake-fast/rake-fast.plugin.zsh 2015-10-21 23:36:36 +09:00
evanandrewrose
fe02e027fe Fix "be" -> "b" typo in coffee plugin README.md. 2015-10-20 23:43:11 +02:00
Marc Cornellà
e0c9ada380 Merge pull request #4214 from queria/chuck-linefix
chucknorris: add missing line/quote delimiters
2015-10-20 23:05:12 +02:00
Marc Cornellà
a7b4c09373 Merge pull request #4526 from sachin21/fix_typo
[FIX #4525]: Fix typo
2015-10-20 12:54:10 +02:00
Satoshi Ohmori
2c8697b934 [FIX #4525]: Fix typo 2015-10-20 18:45:41 +09:00
Superbil
2c54428d6e
Fixd bug for pyenv plugin
Check pyenv-virtualenv can eval before use it.

Signed-off-by: Superbil <superbil@gmail.com>
2015-10-19 15:13:06 +08:00
Gustavo Villa
e5164d7b70 Add 'rake stats' alias. 2015-10-15 16:14:54 -03:00
Arvind Chembarpu
8a362b2b1f Enable pyenv rehash 2015-10-15 08:44:15 +05:30
Arvind Chembarpu
8a95cedc3b Init pyenv virtualenvs too 2015-10-15 08:43:40 +05:30
Robby Russell
306e3e7ea0 Merge pull request #4459 from Scuilion/update-gradle-commands
Gradle Plugin: Update Gradle Commands
2015-10-13 18:09:51 -07:00
Gustavo Villa
b18d386d7f Add option '--port' to 'rails server' alias. 2015-10-12 04:32:22 -03:00
Robby Russell
57c2ac1e60 Merge pull request #4482 from sachin21/add_an_alias_for_upstream
Add an alias for upstream
2015-10-10 07:12:21 -07:00
Robby Russell
ff1bd952a7 Merge pull request #4480 from volcov/master
add alias to sort by version
2015-10-10 07:11:39 -07:00
Satoshi Ohmori
7597bf805e Add an alias for upstream 2015-10-10 11:51:33 +09:00
Andrew Janke
2d0e7fbdad autoenv: actually source autoenv once located
Fixes bug introduced in #4440
2015-10-09 20:35:19 -04:00
Bruno Volcov
252078dd6c add alias to sort by version 2015-10-09 18:47:48 -03:00
Robby Russell
2522ab4504 Merge pull request #4204 from DoctorJellyface/patch-1
Added --now systemd aliases
2015-10-09 07:19:54 -07:00
Robby Russell
0be21f025e Merge pull request #4440 from apjanke/autoenv-homebrew
autoenv: support homebrew-installed autoenv
2015-10-09 07:18:02 -07:00
Robby Russell
dc06e96e9c Merge pull request #4254 from apjanke/copyfile-portability
Cross-platform clipboard clipcopy() and clippaste()
2015-10-09 07:15:53 -07:00
Robby Russell
b1173d4b30 Merge pull request #4418 from Gnouc/master
Encode64 Plugin - Fix wrong `echo` usage
2015-10-09 07:15:20 -07:00
Robby Russell
bb509dda23 Renaming colored-man to colored-man-pages because it needs to be. 2015-10-09 07:07:57 -07:00
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
Giordano Vicari
ee8f3771e9 Added support to subtask through gulp --tasks-simple command 2015-10-05 19:44:00 +02: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
Andrew Janke
b6d78df62c clip*: add xsel support 2015-10-05 05:13:11 -04:00
Kevin O'Neal
a95473919a Update Gradle Commands 2015-10-04 17:05:28 -05: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
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
uberspot
df5e1f9c2c Add 3 more nmap aliases to nmap plugin 2015-10-03 19:37:12 +02:00
Victor Torres
d49cacfb7b Add branch plugin 2015-10-02 23:16:56 -03: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
Andrew Janke
c146853a5e autoenv: also look in the Homebrew installation location for it 2015-10-01 19:29:59 -04:00
Andrew Janke
56b747aa89 Merge branch 'autoenv-check' of github.com:kudos/oh-my-zsh into autoenv-homebrew 2015-10-01 19:20:34 -04:00
Xavier Haniquaut
f9c16f940e Remove broken link and move npmg alias position 2015-09-30 16:42:46 +02: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
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
Andrew Janke
e4fdb08365 Merge branch 'master' into copyfile-portability 2015-09-28 08:52:03 -04:00
LE Manh Cuong
758195cb79 Encode64 Plugin - Fix wrong echo usage
Currently, encode64 plugin using `echo -n` to print the content
of $1 variable. This approach will not work with arbitrary data,
which contains sequence of escaped characters, since when many
`echo` implementation will expand them.

This commit chage the usage to `printf`, which is builtin in all
POSIX shells and can print arbitrary data reliability.
2015-09-28 16:05:22 +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
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
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
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
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
Alexander Frolov
e957ae4135 Update README.md 2015-09-23 09:54:22 +03:00
Chris McCuller
e6ccd37b05 Merge master (rebase being super annoying). Fix conflicts 2015-09-21 22:19:15 -04:00
Andy Bateman
326c2b0859 Replaced the use of 'print' with 'echo' in order to sanitise track and artist names
Fixed indentation

Fixed indentation
2015-09-22 08:15:31 +12:00
Andy Bateman
993e09cc6b Added function for 'itunes playing' to display state when not playing 2015-09-22 08:15:31 +12:00
Andy Bateman
9f2acdc445 You can now use 'itunes status' as well as 'itunes playing' to show current track 2015-09-22 08:15:31 +12:00
Andy Bateman
29db0e0119 Fixed colourisation of Now Playing function 2015-09-22 08:15:31 +12:00
Andy Bateman
a746e6010a Update osx.plugin.zsh
Added function to display the song you're currently listening to in iTunes

Fixed indent

Indentation on line 169 was squiffy

Fixed spelling

Removed unnecessary wording to make function more succinct.

Highlighting of Artist and Track

Changed the highlighting of the Track and Artist in yellow to make use of Prompt Expansion Colors
2015-09-22 08:15:22 +12:00
Michael SALIHI
1bb2715b22 Fix capistrano problem when generating autocompletion 2015-09-21 13:17:45 +02:00
Ramses Ladlani
f8502965e4 Added cygwin support to atom plugin 2015-09-21 09:18:43 +02:00
Robby Russell
cbc1a0806e Merge pull request #4342 from robobenklein/patch-1
Fix Atom Plugin for Linux Users
2015-09-19 09:39:13 -07:00
Robby Russell
25f2d59048 Merge pull request #4353 from dzotokan/feat/stackPlugin
Add Haskell Stack commands list
2015-09-19 09:38:48 -07:00
Robby Russell
4d65dd2404 Merge pull request #4310 from ablyler/add-codeclimate-plugin
Add codeclimate autocomplete plugin
2015-09-19 09:29:04 -07:00
Robby Russell
e268ef3a80 Merge pull request #4320 from ixti/fix/aws-plugin-rprompt-pollution
Fix aws plugin RPROMPT pollution
2015-09-19 09:23:18 -07:00
Robby Russell
b29095fe68 Merge pull request #4354 from henrikhodne/patch-1
chruby: donʼt try to execute .sh files before loading
2015-09-19 09:22:14 -07:00
Robby Russell
c4d84f1b77 Merge pull request #4343 from apjanke/jira-readme
jira: add README.md
2015-09-19 09:20:04 -07:00
Robby Russell
ce104579a8 Merge pull request #4370 from afh/pull/emotty_plugin
Add emotty plugin
2015-09-19 09:17:36 -07:00
Robby Russell
2dc980c8c0 Merge pull request #4331 from icholy/master
golang: improve go doc completion
2015-09-19 09:06:16 -07:00
Robby Russell
db14538853 Merge pull request #4315 from mbologna/fancy-ctrl-z
Added Fancy-ctrl-z plugin
2015-09-19 09:04:30 -07:00
Robby Russell
3b29132214 Merge pull request #4300 from igordejanovic/vim-escape-fname
[vim-interaction plugin] Escape special chars in filenames.
2015-09-19 09:04:17 -07:00
Robby Russell
cfba05cf9d Merge pull request #4282 from ferenczy/master
Added missing commands to Vagrant plugin
2015-09-19 09:03:40 -07:00
Robby Russell
ff3e0d530c Merge pull request #4266 from t413/master
Bring bgnotify plugin up to date with t413/zsh-background-notify
2015-09-19 09:03:29 -07:00
Robby Russell
4f1caf0955 Merge pull request #4237 from mcornella/fix-taskwarrior-plugin
Fix taskwarrior plugin
2015-09-19 09:01:28 -07:00
Robby Russell
6eb6017b3c Merge pull request #4235 from mcornella/fix-xcode-plugin
Fix xcode plugin
2015-09-19 09:01:16 -07:00
Robby Russell
1e49dfcd15 Merge pull request #4209 from ah450/npm-exec
Adds npmE alias
2015-09-19 09:00:54 -07:00
Robby Russell
075655563f Merge pull request #4201 from wkentaro/gnu-utils-findutils
gnu-utils: add findutils (find,xargs,locate)
2015-09-19 09:00:41 -07:00
Robby Russell
681c42ac46 Merge pull request #4154 from sfragis/toggle-sudo
Esc-esc toggles sudo
2015-09-19 08:59:29 -07:00
Robby Russell
f7c24e1808 Merge pull request #4137 from troter/coffee-first-argument-with-double-quote
coffee: protect args with double-quote
2015-09-19 08:59:13 -07:00
Robby Russell
544eccb5dd Fixing conflict in rails plugin merge with rake test shortcut 2015-09-19 08:58:24 -07:00
Robby Russell
04c8acf5de Merge branch 'rails-rake-test' of https://github.com/skv-headless/oh-my-zsh into skv-headless-rails-rake-test 2015-09-19 08:55:13 -07:00
Robby Russell
fb0776e1be Merge pull request #4134 from boddhisattva/rails-rake-routes-alias
Adds an alias to search for the rails routes that pattern match a string
2015-09-19 08:54:07 -07:00
Robby Russell
dde5540b1e Merge pull request #4093 from apjanke/osx-fix-tab-for-iterm
osx: fix tab() functions so the cd works in iTerm2, and status/output are better
2015-09-19 08:52:23 -07:00
Robby Russell
763bf6374c Merge pull request #3971 from moul/pr-scaleway
Support for 'scw' command (Scaleway CLI)
2015-09-19 08:51:21 -07:00
Robby Russell
baf1aa13cb Merge pull request #3661 from ericbottard/GradleWrapperFix
Fix invocation of gradlew
2015-09-19 08:48:41 -07:00
Robby Russell
3c782f78f1 Merge pull request #3582 from apjanke/fold-terminalapp-plugin-into-termsupport
Fold terminalapp plugin in to lib/termsupport
2015-09-19 08:48:03 -07:00
Robby Russell
4bd6c43cfb Merge pull request #3408 from spacewander/git-extras
update git-extras plugin
2015-09-19 08:47:13 -07:00
Robby Russell
93c6b5deb8 Merge pull request #3078 from akoenig/gulpjs
gulp.js plugin
2015-09-19 08:46:49 -07:00
Robby Russell
cc53e4cb99 Merge pull request #2471 from phstc/capistrano-multistage
Adds support to capistrano multistage completion
2015-09-19 08:45:43 -07:00
Alexis Hildebrandt
dce052dac0 Add emotty plugin
which displays an emoji for the current $TTY.
2015-09-18 14:24:46 +02:00
Henrik Hodne
8c5b948162 chruby: donʼt try to execute .sh files before loading 2015-09-16 15:28:08 +02:00
Daniel Stankevich
bb10ad0a13 Remove unnecessary sandbox fn 2015-09-16 17:25:39 +10:00
Daniel Stankevich
a8a8bc3967 Add simple Stack commands list 2015-09-16 17:18:27 +10:00
Tim O'Brien
e8639c700e Update to current robbyrussell/oh-my-zsh master 2015-09-14 15:39:18 -07:00
Tim O'Brien
797e1f9a64 [plugins/bgnotify] fix for iTerm2 notification clicks 2015-09-14 15:32:50 -07:00
Andrew Janke
c9af79fcad jira: add README, "emulate -L zsh", add "dumpconfig" action
(The "dumpconfig" action is for verifying the configuration behavior against what's documented in the README now.)
add "error" to some of the error messages
2015-09-11 18:37:39 -04:00
Andrew Janke
6642a99fac xcode: extend xcselv to list versions and do completion 2015-09-11 21:06:18 +02:00
Ilia Choly
22287d0153 handle multiple paths in GOPATH 2015-09-11 12:27:22 -04:00
Andrew Janke
36fea45bfc svn plugin: urldecode repo info
The repo location reported by `svn` is a URL. If you don't decode it before using it a prompt, the `%` sequences will be misinterpreted by prompt expansion and give screwy results.
Fixes #2233
2015-09-11 03:11:01 -04:00
Ben Klein
dca429557a Make Readme much clearer and explain edits.
Also added some examples, but those should be mostly self-explanatory.
2015-09-10 22:22:00 -04:00
Ben Klein
953e4d8926 Make Linux compatible
Just an if/else to determine if we're OSX or Linux and alias `at` appropriately.
2015-09-10 22:19:53 -04:00
Ilia Choly
9e9b790fe1 golang: improve go doc completion 2015-09-09 10:59:29 -04:00
Michele Bologna
6170fa41d9 Added fedora plugin, based on dnf/yum plugin 2015-09-09 11:42:56 +02:00
Marc Cornellà
82ae41ca4c Reorder xcode plugin file 2015-09-07 12:09:08 +02:00
Marc Cornellà
213f46a296 Add xcselv documentation in the README 2015-09-07 12:08:50 +02:00
Andrew Janke
5584aa05c7 xcode: add version-based xcselv() 2015-09-07 11:50:45 +02:00
Juraj Fiala
86d881c47d Added aliases for --now commands
Also removed the old sc-launch alias because this is just better.
2015-09-06 13:01:09 +02:00
Marc Cornellà
d95589d4e4 Add README for the xcode plugin 2015-09-05 23:17:38 +02:00
Marc Cornellà
ec3694c788 Make simulator dependant of currently active dev directory
This also gets rid of `xcode-select` command-not-found errors.
2015-09-05 22:47:52 +02:00
Marc Cornellà
24bdd8e29a Replace xcsel function with just an alias 2015-09-05 22:47:52 +02:00
Marc Cornellà
6a830f39b6 Return error if no xcode files where found 2015-09-05 22:47:52 +02:00
Marc Cornellà
cbdad588e6 Use zsh globbing instead of ls + grep in xc function
Uses zsh arrays and globbing to find .xcworkspace and .xcodeproj files.
2015-09-05 22:47:52 +02:00
Marc Cornellà
38d25a3359 Update taskwarrior completion to latest version (Jul 26 2015)
See relevant commit at:
https://git.tasktools.org/projects/TM/repos/task/commits/3158883dc4d251
2015-09-05 22:47:51 +02:00
Marc Cornellà
75844fe1a1 Put relevant documentation into README file 2015-09-05 22:47:51 +02:00
Alexey V Zapparov
7a63ccabf6 Fix aws plugin RPROMPT pollution 2015-09-04 21:18:32 +02:00
Andrew Janke
93b4a6c02e Merge branch 'master' into osx-fix-tab-for-iterm
Conflicts:
	plugins/osx/osx.plugin.zsh
2015-09-03 13:05:24 -04:00
Pablo Cantero
c7d782f1ab Add the update from @mtwentyman https://github.com/phstc/dotfiles/pull/1
to make it work for older versions of capistrano
2015-09-03 13:39:41 -03:00
Chris McCuller
30ef856648 Fix maintainer line 2015-09-03 09:47:02 -04:00
Michele Bologna
9a7b2d7ffb Moved comments and credits from source to README 2015-09-03 08:55:03 +02:00
Michele Bologna
6d7c39a2ae Added fancy-ctrl-z plugin
Use Ctrl-Z to switch back to Vim
I frequently need to execute random command in my shell. To achieve it I pause
Vim by pressing Ctrl-z, type command and press fg<Enter> to switch back to Vim.

The fg part really hurts me. I just wanted to hit Ctrl-z once again to get back
to Vim.
I could not find a solution, so I developed one on my own that works wonderfully
with ZSH.

Source: http://sheerun.net/2014/03/21/how-to-boost-your-vim-productivity/
2015-09-02 21:00:36 +02:00
Eric Bottard
ef4a315630 Fix invocation of gradlew 2015-09-02 20:17:03 +02:00
Andy Blyler
b08431ff74 Add codeclimate autocomplete plugin 2015-09-01 23:08:41 -04:00
Marc Cornellà
c481c62bc9 Refactor and clear up README file 2015-09-02 00:26:16 +02:00
Marc Cornellà
d982e1200f Reorder alias definitions 2015-09-02 00:26:15 +02:00
Marc Cornellà
663ac56d54 Prettify frontend help output and clean up logic 2015-09-02 00:26:14 +02:00
willmendesneto
ff706f3ef8 Add "help" method in "frontend-search" plugin 2015-09-02 00:26:13 +02:00
Marc Cornellà
f1472f1f64 Simplify frontend-search function with assoc array
Also adds the lodash URL (which was missing) and uses https on those websites
that support it.
2015-09-02 00:26:11 +02:00
Marc Cornellà
7f64092361 [vim-interaction plugin] Escaping special chars in file names and simplifying code. 2015-09-01 19:07:49 +02:00
Robby Russell
0532860c61 Merge pull request #4285 from nmaggioni/master
'ip' command compatibility and much quicker external IP detection
2015-08-31 22:21:25 -07:00
Robby Russell
7366b5677e Merge pull request #4268 from ZhengzhongZhang/patch-1
Plugin vundle: update link
2015-08-31 22:20:53 -07:00
kyleheyne
022a060ec7 thefuck-alias -> thefuck --alias
Per warning message.
2015-08-31 17:36:41 -04:00
Robby Russell
ba5fd57c1f Merge pull request #3989 from eubenesa/master
Updates to ember-cli plugin
2015-08-30 22:14:25 -07:00
Robby Russell
a77e23a0f9 Merge pull request #4109 from zhiyelee/patch-1
add git alias `gcam` -  git commit -am
2015-08-30 21:52:07 -07:00
Robby Russell
da6ece4ec9 Merge pull request #4117 from nextgenthemes/patch-1
Adds agar = apt-get autoremove
2015-08-30 21:51:50 -07:00
Robby Russell
eb12ec1dc8 Merge pull request #4146 from perobertson/heroku-help
[heroku] add '--help' as an option to commands
2015-08-30 21:50:22 -07:00
Robby Russell
ac85faa262 Merge pull request #4171 from linux-china/master
Spring Boot Plugin
2015-08-30 21:49:51 -07:00
Robby Russell
c1bff7798a Merge pull request #4195 from jerryling315/master
Add 'man' plugin.
2015-08-30 21:49:07 -07:00
Robby Russell
3f95377676 Merge pull request #4198 from matjack1/gclean-gpristine
git plugin: make gclean safer, introduce gpristine
2015-08-30 21:48:36 -07:00
Robby Russell
daabe2a008 Merge pull request #4205 from mcornella/fix-git-prompt-plugin
Fix git-prompt plugin
2015-08-30 21:48:14 -07:00
Robby Russell
c10d5c8b7c Merge pull request #4244 from Gnouc/master
Emoji plugin - Fix wrong string comparison
2015-08-30 21:47:42 -07:00
Robby Russell
69a17150ad Merge pull request #4239 from yous/fix-linux-gems
rvm plugin: Fix `gems` to work on Linux machine
2015-08-30 21:47:26 -07:00
Robby Russell
adff369c05 Merge pull request #4220 from andytank123/master
Add support for Docker images from custom registries
2015-08-30 21:47:09 -07:00
Robby Russell
2f6d85d64e Merge pull request #4248 from gabetax/rbenv_plugin_load_performance
reduce rbenv plugin load time by 150ms by removing additional brew call
2015-08-30 21:42:35 -07:00
Robby Russell
51c3ab7d76 Merge pull request #4283 from hanschen/master
Update autojump plugin for latest brew installation
2015-08-30 21:42:00 -07:00
Robby Russell
14e1f0c6d8 Merge pull request #4286 from RobinDaugherty/rand-quote-failure
Rand-quote plugin overflows stack when site is unreachable
2015-08-30 21:40:26 -07:00
Robby Russell
9c9699dcf5 Merge pull request #4250 from mcornella/fix-divide-by-zero-emoji
Fix divide by zero in emoji plugin
2015-08-30 21:38:09 -07:00
Robby Russell
6346cc9ba9 Merge pull request #4260 from fgibaux/patch-1
plugin symfony2 sf2.7 compatibility fix
2015-08-30 21:36:46 -07:00
Robby Russell
c084a13df2 Merge pull request #4259 from apjanke/jira-prefix-and-help-and-stuff
jira: prefix variable dashboard, default action, and completion
2015-08-30 21:36:06 -07:00
Robby Russell
e59f4cb14f Merge pull request #4271 from loctauxphilippe/patch-1
added apt-get autoremove in ubuntu plugin
2015-08-30 21:35:18 -07:00
Robby Russell
50d329450e Merge pull request #4289 from moonfruit/master
Remove redundant semicolon
2015-08-30 21:33:26 -07:00
Robby Russell
869b1046a4 Merge pull request #4292 from cxbig/master
improved alias conflict between git flow & git fetch
2015-08-30 21:32:45 -07:00
Robby Russell
a7aed69d02 Merge pull request #4170 from black-roland/master
The Fuck plugin (https://github.com/nvbn/thefuck)
2015-08-30 09:12:07 -07:00
Will Mendes
0a80889848 Frontend-search: add search in npm website 2015-08-29 11:48:28 -03:00
cxbig
acf6039ff3 improved alias conflict between git flow & git fetch 2015-08-29 01:35:41 +02:00
MoonFruit
0a2c31fb60 Remove redundant semicolon
Remove redundant semicolon to make tab() works better in ITerm 2.
2015-08-28 10:46:45 +08:00
Niccolò Maggioni
d923cebdb3
Updated with @mcornella suggestions 2015-08-27 11:34:53 +02:00
Robin Daugherty
96aefd2b98 Remove code, not comment it out
Gaaah.
2015-08-26 14:12:42 -04:00
Robin Daugherty
241be2d28b Fix rand-quote failure when site is unreachable
This plugin was designed so that if there is any failure, it will simply call itself recursively. Which means that if you were working offline, if `quote` was called in your `.zshrc`, you would be unable to open a new terminal session.

I fixed this by allowing the plugin to output nothing if a quote could not be fetched.
2015-08-26 13:24:59 -04:00
Niccolò Maggioni
058bbe4f02
General compatibility 2015-08-26 10:54:08 +02:00
Niccolò Maggioni
a127c4f88e
'ip' command compatibility and much quicker external IP detection 2015-08-26 10:48:01 +02:00
Hans Chen
1bf5c587a5 Update autojump plugin for latest brew installation 2015-08-25 17:05:28 -04:00
Dawid Ferenczy
76f4871d4e Added missing commands to Vagrant plugin, updated commands description 2015-08-25 18:07:47 +02:00
Philippe Loctaux
aaf5c8f43f added apt-get autoremove in ubuntu plugin
I use that command a lot of times, and there's no shortcut for that.
Now it does :)
2015-08-21 16:05:54 +02:00
章正中
1aeebf60a0 Update link 2015-08-21 14:28:03 +08:00
Tim O'Brien
7c31c7a963 Bring bgnotify plugin up to date with t413/zsh-background-notify
Changes include:
- time format now shows h/m/s (only when needed!)
- adds hooks only for interactive connections
- adds specific kde support (via kdialog)
- adds click-action for OS X terminals
2015-08-19 22:33:41 -07:00
fgibaux
a9daea17d8 plugin symfony2 sf2.7 compatibility fix
with symfony 2.7 command group titles are listed as commands. this commit prevents it.
2015-08-18 14:19:40 +02:00
Andrew Janke
dc42e8d488 jira: add completion 2015-08-18 05:05:54 -04:00
Andrew Janke
7cf892ecaa Add dashboard support and default-action configuration.
Some refactoring.
2015-08-18 04:49:10 -04:00
Andrew Janke
ee4a423da5 Merge branch 'pr-4158' into jira-prefix-and-help-and-stuff 2015-08-18 04:12:35 -04:00
Andrew Janke
caf667fb30 Merge branch PR 4132 into jira-prefix-and-help-and-stuff 2015-08-18 04:10:56 -04:00
Andrew Janke
5c8b0cc0c1 Add clipcopy() and clippaste() generic cross-platform CLI clipboard functions.
Change copydir, copyfile, and coffee plugins to use them, instead of the Mac-only `pbcopy` command.
2015-08-18 03:49:51 -04:00
Andrew Janke
00eb465830 Merge branch 'master' into fold-terminalapp-plugin-into-termsupport 2015-08-17 20:59:39 -04:00
Andrew Janke
96c34cebae Add a deprecation comment. 2015-08-17 20:51:41 -04:00
Kentaro Wada
c4ba3065a1 Show tag name when detached status if possible 2015-08-17 18:22:27 +09:00
Mohnish Jadwani
3f83331c71 removes a trailing white space 2015-08-17 06:23:58 +05:30
Marc Cornellà
be667a24b0 Remove obsolete comment 2015-08-17 01:05:37 +02:00
Marc Cornellà
3c698743fa Clean up gitstatus.py 2015-08-16 23:21:48 +02:00
Kentaro Wada
45473c3a81 Fix for initial or detached status branch info 2015-08-16 23:02:17 +02:00
Marc Cornellà
30bed07e9c Parse UTF-8 output from git status 2015-08-16 23:02:16 +02:00
Kentaro Wada
94007f7db2 git-prompt: collect all git status information by one cmd
This commit uses the `git status --porcelain -b` format to gather the
number of ahead and behind commits related to the remote branch.
2015-08-16 23:02:15 +02:00
Marc Cornellà
6ff53d173b Cleanup of git-prompt plugin file 2015-08-16 23:02:14 +02:00
Marc Cornellà
1d133ff11f Cleanup the rest of gitstatus.py 2015-08-16 23:02:13 +02:00
Marc Cornellà
5642014ff1 Pull in simplified version from @wkentaro
This version uses `git status --porcelain` instead of making
multiple calls to `git status`.
2015-08-16 23:02:12 +02:00
Marc Cornellà
6443626a6b Pull in latest version from olivierverdier/zsh-git-prompt 2015-08-16 23:02:11 +02:00
Marc Cornellà
c6a5f6efb4 Check that list_size value is not zero before division 2015-08-16 22:40:52 +02:00
Marc Cornellà
88243b846a Use right variable name to avoid zero-length array
This fixes the typographic error that always assigned an undefined
array to `$names`, which made `$list_size` = 0 and triggered a
divide by zero error on the next line.
2015-08-16 22:26:33 +02:00
Gabe Martin-Dempesy
daedfcab51 reduce rbenv plugin load time by 150ms by removing additional brew call 2015-08-15 12:54:46 -07:00
Chayoung You
d20c111d78 rvm plugin: Fix gems to work with GNU sed
Fix #1579.
2015-08-15 15:19:02 +09:00
LE Manh Cuong
0238301726 Emoji plugin - Fix wrong string comparison 2015-08-14 09:55:46 +07:00
Robby Russell
192de6bcff Merge pull request #4238 from wubaiqing/master
Add Baidu support to web-search plugin
2015-08-12 21:16:37 -07:00
Robby Russell
1605d8264c Merge pull request #4234 from mcornella/fix-fbterm-autostart
Fix fbterm autostart
2015-08-12 21:16:19 -07:00
Robby Russell
20f536c064 Merge pull request #4228 from mcornella/fix-virtualenvwrapper-quotes
[virtualenvwrapper] Add quotes to support folders with whitespace
2015-08-12 21:14:44 -07:00
Robby Russell
b8dbd9bfba Merge pull request #4217 from mcornella/standard-open-command
Implement and use a standard, cross-platform open command
2015-08-12 21:14:27 -07:00
Robby Russell
4c1eda114d Merge pull request #4216 from gkze/master
Add terraform completion
2015-08-12 21:13:39 -07:00
Robby Russell
e3a01e5af1 Merge pull request #4212 from NAR8789/master
Fix chpwd clobbering in dirhistory and last-working-dir
2015-08-12 21:12:58 -07:00
Robby Russell
45d640baee Merge pull request #4200 from lislon/systemd-patch
Add alias for "systemctl cat" and "systemctl edit"
2015-08-12 21:11:33 -07:00
Robby Russell
8c3d4a9826 Merge pull request #4095 from kd35a/master
Use 'quit all' instead of counting needed quits
2015-08-12 21:10:53 -07:00
Robby Russell
afc36e2710 Merge pull request #2446 from fallwith/emoji_plugin
Emoji plugin
2015-08-12 21:02:46 -07:00
Robby Russell
c45fff1f81 Merge pull request #2367 from andrew-dwyer/n98-magerun
New plugin for the n98-magerun Magento command line tool
2015-08-12 21:01:42 -07:00
Ahmed Hisham Ismail
dcd95dd223 Changes quotes so that path will be set appropriately on multiple runs 2015-08-11 02:56:49 +02:00
wubaiqing
9caa215a2f Add Baidu support to web-search plugin 2015-08-10 11:41:48 +08:00
Marc Cornellà
be10229659 Exit only if the fbterm session closed correctly
This prevents the previous behavior that exitted the zsh session
even if fbterm didn't start correctly.
2015-08-09 22:45:02 +02:00
Marc Cornellà
be5dcb8a59 Check if fbterm is installed and use $TTY variable 2015-08-09 21:55:52 +02:00
Marc Cornellà
ccb0ae5720 Add quotes to support folders with whitespace 2015-08-07 22:45:46 +02:00
Andrew Robertson
c3fbe4d121 Add support for Docker images from custom registries 2015-08-05 19:51:05 +01:00
Manfred Touron
720fb5b68e
Support for 'scw' command (Scaleway CLI) 2015-08-05 14:58:00 +02:00
Ahmed Hisham Ismail
269ae84c9b Removes unnecessary single quotes 2015-08-05 02:49:20 +02:00
Marc Cornellà
b760a10cb2 Use standard open command in fasd and lighthouse plugins 2015-08-05 01:18:42 +02:00
Marc Cornellà
d1d06b5675 Use standard open command in current plugins
Substitutes the current duplicate logic for the standard
and cross-platform function open_command in plugins:

  frontend-search, jira, node, web-search
2015-08-05 00:57:40 +02:00
xiao.fan
cddfc3b038 style fixes 2015-08-04 15:10:18 -07:00
Florin Patan
cf78586f15 Update to latest Terraform release 0.6.1 2015-08-04 21:54:01 +02:00
gkze
7f3e6143ec Add terraform completion 2015-08-04 11:42:28 -07:00
Pavel Sedlák
9c74128406 chucknorris: add missing line/quote delimiters
few quotes were missing the '%' line delimiters,
so some of the quotes were appearing at once merged together
2015-08-04 16:01:12 +02:00
xiao
aac5523629 Additional chpwd clobbering fix for dirpersist 2015-08-03 22:58:29 -07:00
xiao
084792b829 Don't clobber chpwd 2015-08-03 22:10:24 -07:00
Ahmed Hisham Ismail
e1353fce3c Adds npmE alias
Option to execute a command from node_modules folder
2015-08-03 22:06:33 +02:00
Juraj Fiala
800af047d7 Add sc-launch as a shortcut for start & enable
I've heard many people requesting systemd to add this functionality. It's very handy under Arch.
2015-08-01 17:45:00 +02:00
Kentaro Wada
daa04bae86 gnu-utils: add findutils (find,xargs,locate) 2015-08-01 03:11:58 +09:00
Boris Avdeev
5554207279 Add alias for "systemctl cat" and "systemctl edit" 2015-07-31 15:05:07 +03:00
Roland Chernov
fb8c446ea4 Thefuck: fix global variable assignment 2015-07-30 21:04:58 +09:00
Matteo Giaccone
a2b574bc9e git plugin: make gclean safer, introduce gpristine 2015-07-30 12:32:41 +01:00
Andrew Stuart
96e5346efb Merge branch 'master' of gh:robbyrussell/oh-my-zsh 2015-07-29 14:04:08 -07:00
Andrew Stuart
2120b2e079 Add escaped home 2015-07-29 13:58:22 -07:00
Robby Russell
3d5b3430fd Merge pull request #4122 from apjanke/venvw-treat-git-repo-as-venv-again
virtualenvwrapper: Treat git repos as project roots again
2015-07-29 08:01:33 -07:00
Jerry Ling
c83575da3f Add 'man' plugin.
Inspired by sudo. But we have man-preview!
2015-07-29 20:05:44 +08:00
Roland Chernov
f534b4b321 Thefuck: fixed compability with latest version 2015-07-23 20:55:15 +09:00
Roland Chernov
54e27406dc Thefuck: replaced static alias with eval "$(thefuck-alias)" 2015-07-23 20:53:56 +09:00
Black Roland
8e8a13398e Thefuck: combined with @cristim plugin. Code formating 2015-07-23 20:09:59 +09:00
Cristian Măgherușan-Stanciu
803e5dbb84 improved the check for availability 2015-07-22 15:01:15 +09:00
Cristian Măgherușan-Stanciu
0da9a4be25 fuck: added a basic plugin for https://github.com/nvbn/thefuck 2015-07-22 15:01:14 +09:00
Roland Chernov
e38455bf4f Added conflict note (thefuck plugin) 2015-07-19 12:57:57 +09:00
linux_china
b4a8cbf6a5 spring boot plugin 2015-07-19 11:44:51 +08:00
linux_china
f838b56591 spring boot plugin readme 2015-07-19 11:44:42 +08:00
Roland Chernov
cd2213a030 Thefuck plugin README 2015-07-18 21:21:19 +09:00
Roland Chernov
7a13a407e9 Added thefuck plugin https://github.com/nvbn/thefuck 2015-07-18 21:10:56 +09:00
Andrew Janke
9a397254da Remove redundant comments from the .zsh file (since they're in README now). 2015-07-15 17:16:59 -04:00
Andrew Janke
6d618ef70e emoji plugin: generate char map from Unicode UTR51 data files
Refactor the functions and group listings to have fewer functions,
but have them take group names as parameters.
Pull group definitions in to a single associative array.
2015-07-15 17:07:33 -04:00
Robby Russell
a207a38d63 Merge pull request #4099 from moncho/master
Plugin now uses completion script from docker-compose repo.
2015-07-14 15:54:15 -07:00
Andrew Stuart
afa30572f5 Add jira_url_help 2015-07-13 13:10:31 -07:00
Fabio Strozzi
ff8d799594 Esc-esc now toggles sudo.
Press esc-esc once to add sudo (normal behaviour), press it twice
to remove it from the beginning of the line.
2015-07-12 17:01:34 +02:00
Jonathan Cremin
b7617b35ff Check for autoenv_init function before trying to source autoenv. 2015-07-10 14:12:27 +01:00
Paul Robertson
ffe8e5465c add '--help' to heroku commands 2015-07-09 23:40:35 -04:00
Chris McCuller
3594e27eeb Nicer formatting 2015-07-08 09:02:23 -04:00
Takumi IINO
1e8196de82 passing the first argument with double quote 2015-07-08 11:16:44 +09:00
Patryk Małek
ad4675cb0a Concise local variables declarations 2015-07-07 20:26:00 +02:00
Patryk Małek
b1772c5333 More consistent curly braces variables 2015-07-07 20:07:13 +02:00
Patryk Małek
37f45eb621 Making variables local in jira plugin 2015-07-07 20:03:58 +02:00
Patryk Małek
1e99168627 Changing indents to be more consistent (2 spaces) 2015-07-07 19:56:22 +02:00
Patryk Małek
88a30a3e2f Changing string comparison for more zsh-like 2015-07-07 18:50:23 +02:00
Headless
750de22972 rails rake test 2015-07-07 15:44:35 +03:00
Mohnish Jadwani
dff03743ef adds an alias to search for the rails routes that pattern match a string 2015-07-07 09:47:49 +05:30
Patryk Małek
b1da3bbc6f Adding ability to add JIRA_PREFIX as an env variable (e.g. in .zshrc) and minor refactor to bash curly variable braces 2015-07-06 22:00:53 +02:00
Robby Russell
3ea3384186 Merge pull request #4041 from apjanke/fix-jira-prefix-comment-merge
Fix jira plugin syntax error due to merge conflict
2015-07-06 09:33:43 -07:00
Andrew Janke
f73e642e22 virtualenvwrapper: treat git repos as project roots again (instead of requiring a .venv customization directory)
Change error output to more conventional OMZ format, so it's clear the plugin is for oh-my-zsh and not base zsh.
Use `local` variables instead of manual unsetting.
2015-07-02 21:57:15 -04:00
Andrew Janke
a2e01e9a87 chucknorris: check for strfile dependency
Gives a better error message than "command not found: strfile", because
it's not obvious to many users that strfile is part of fortune.
Also handles the weird /usr/sbin install location for strfile on Cygwin.
2015-07-02 20:37:28 -04:00
nextgenthemes
2e92ff8ae5 Adds agar = apt-get autoremove
Since #3902 lacks the auto-completion I made a PR for this as well.

Also fixes some typos.
2015-07-02 17:33:30 +02:00
Zhiye Li
efb04d66a0 add git alias gcam - git commit -am
add git alias `gcam` -  `git commit -am`
2015-06-30 17:50:01 -05:00
Andrew Janke
c1f1f91daa virtualenvwrapper: Replace "realpath" with portable zsh-native :A and :h modifiers 2015-06-29 18:55:58 -04:00
moncho
0950f9c56d Plugin now uses completion script from docker-compose repo. 2015-06-28 11:16:17 +02:00
Fredrik Strandin
546b99ad4c Use 'quit all' instead of counting needed quits 2015-06-26 15:47:00 +02:00
Andrew Janke
689b5ab3c8 osx: fix tab* functions so cd works in iTerm2, exit status is correct, and
error messages are not discarded.
2015-06-26 01:48:17 -04:00
ncanceill
d24196cfbd git plugin: fix ggl to avoid empty string
see
https://github.com/robbyrussell/oh-my-zsh/pull/2790#issuecomment-112716330
2015-06-17 22:38:31 +02:00
Arnaud Rinquin
ed6645a282 Fix plugin/git ggpull and ggpush backward compatibility
Current `ggpush` is `git push origin` instead of `git push origin $(current_branch)`
Same for `ggpull`
2015-06-17 22:36:25 +02:00
ju
68e03a0592 Changed env based sf2 shortcuts to sfdev & sfprod 2015-06-16 08:44:50 +02:00
Andrew Janke
d0670aa2bd Fix merge conflict for jira-prefix and jira add comment 2015-06-15 16:55:25 -04:00
Robby Russell
8921902388 Merge pull request #3852 from sachin21/add_alias_of_bundle_clean
Add alias of bundle clean
2015-06-14 22:28:33 -07:00
Robby Russell
5d214af6d2 Merge pull request #3858 from muchweb/muchweb-patch-1-editor
Use $EDITOR
2015-06-14 22:28:17 -07:00
Robby Russell
7daf7401b9 Merge pull request #3874 from diraol/patch-2
Debian Plugin: Differing upgrade and safe-upgrade
2015-06-14 22:27:59 -07:00
Robby Russell
0665ece7bd Merge pull request #3973 from moul/pr-boot2docker-update
Add new boot2docker options
2015-06-14 22:27:07 -07:00
Robby Russell
31b351ce4c Merge pull request #3947 from mkwmms/patch-1
Respect $ZSH_CACHE_DIR when creating fasd's cache
2015-06-14 22:26:28 -07:00
Robby Russell
0a8ca6adff Merge pull request #3918 from cbazin/master
Detect the .venv in any parent directory of the current directory
2015-06-14 22:19:23 -07:00
Robby Russell
b55effd3bb Merge pull request #3919 from delphij/history-extendedglob
Don't leak extendedglob to global environment.
2015-06-14 22:18:33 -07:00
Robby Russell
3a57076d93 Merge pull request #3813 from ziegs/fix_gradle_tasks
Fixes gradle autocomplete so it includes subproject tasks
2015-06-14 22:17:24 -07:00
Robby Russell
628c1fe1c0 Merge pull request #3848 from tristola/master
Added aliases for docker compose
2015-06-14 22:17:09 -07:00
Robby Russell
058def3b91 Merge pull request #3798 from dnixx/vundle-update
Use the newest Vundle commands
2015-06-14 22:16:34 -07:00
Robby Russell
c0b283c76b Merge pull request #3833 from coopermaruyama/master
coffeescript aliases for easy compiling
2015-06-14 22:16:04 -07:00
Robby Russell
6a340d99fd Merge pull request #3988 from UserTaken/docker_update
Docker run and create options
2015-06-14 22:15:40 -07:00
Robby Russell
ea5ff03b92 Merge pull request #3759 from mikeokner/master
Adding quotes to git completion discovery path
2015-06-14 22:14:07 -07:00
Robby Russell
04c301bb3a Merge pull request #3975 from wernerb/patch-1
Set AWS_PROFILE and use existing RPROMPT
2015-06-14 22:10:18 -07:00
Robby Russell
a1e722d446 Merge pull request #3976 from rodrigoargumedo/patch-1
Add rdrs method to reset the database(s)
2015-06-14 22:09:46 -07:00
Robby Russell
a7784636d8 Merge pull request #3929 from GunfighterJ/GunfighterJ-patch-sublime3
Add sublime text 3 paths to check list
2015-06-14 22:00:32 -07:00
Robby Russell
78bbf7a6e5 Merge pull request #3809 from ncanceill/easymerge
Easy-to-Merge
2015-06-14 21:46:41 -07:00
Mikhail S. Pobolovets
a7e79824f8 Add mix-fast plugin (similar to rake-fast)
Signed-off-by: Mikhail S. Pobolovets <styx.mp@gmail.com>
2015-06-14 17:41:56 +02:00
UserTaken
55b1a2befe Update _docker 2015-06-13 16:30:18 -07:00
Michael Okner
3d670c0bfc Adding quotes to git completion discovery path
Previously, spaces in the path would result in wto separate errouneous
paths being parsed. This fixes that issue.
2015-06-13 08:59:10 -05:00
Fräntz Miccoli
4cc0a2638c A paver (Python build and configuration utility) plugin 2015-06-13 11:06:26 +02:00
Marc Cornellà
26c7adf110 Revert "Added migration notification for rails plugin"
This reverts commit 1493d88e3f, made
to put a deprecated notice on rails3 and rails4 plugins, so that
users would migrate to the unified rails plugin.

It's been 1.5 years since that, so everyone should be migrated to
the good one.
2015-06-13 11:05:38 +02:00
Sriram Sundarraj
8b95bdb5e0 Added github in web_search plugin. 2015-06-13 11:04:02 +02:00
Christian Hoener zu Siederdissen
83295ec9bc last-working-dir working with spaces in dirnames 2015-06-13 11:00:58 +02:00
Tommy Wang
d0b690b584 use local options to set no_equals before sourcing bash completion script 2015-06-13 10:57:31 +02:00
ncanceill
f1a43daa36 git plugin: new/changed aliases
gaa was brought back by popular demand — see #3535
gap was replaced with gapa — see #3682
gdc was replaced with gdca — see #3977
2015-06-12 11:50:30 +02:00
Filip Bartuzi
e55d84f76e Add reference to bundler plugin issue in README 2015-06-12 00:36:53 +02:00
Erlend Hamberg
763cef8013 Add leaves command to brew completion 2015-06-12 00:24:43 +02:00
Vadim
4b76b7429a remove trash command from osx plugin 2015-06-12 00:21:44 +02:00
wyldphyre
cf3fb873ec Added README.md file for ForkLift plugin 2015-06-12 00:17:26 +02:00
wyldphyre
81da07602c Added README.md file for atom plugin 2015-06-12 00:17:22 +02:00
wyldphyre
a2d7d36e70 Added README.md file 2015-06-12 00:17:17 +02:00
CkEsc
c28b226af2 Fix README.md for sst command 2015-06-12 00:14:59 +02:00
Daniel Campoverde [alx741]
0e35bd4001 Plugins: vi-mode: Add first README file 2015-06-12 00:08:26 +02:00
KhasMek
0f96e8e6c2 Plugins: archlinux - add basic README. 2015-06-12 00:03:55 +02:00
KhasMek
e5929680fd Plugins: archlinux - use command -v in favor of which
The command 'which' launches an external process that isn't
  really necessary.
2015-06-12 00:03:16 +02:00
KhasMek
e0ce87632d Plugins: apache2-macports - add README 2015-06-12 00:00:47 +02:00
ncanceill
8eb31a6f9a git plugin: fix ggpnp when called without argument
also allow multiple arguments for ggp and ggl aliases
2015-06-11 23:34:18 +02:00
Mikhail S. Pobolovets
1f008b4113 Update Mix complition upto 1.0.4
Signed-off-by: Mikhail S. Pobolovets <styx.mp@gmail.com>
2015-06-11 21:10:55 +02:00
Jorge González
02c2b74918 Update aliases in laravel5.plugin.zsh file
Some minor changes to the aliases.
* removed php artisan dump-autoload since is no longer a command in laravel 5
* updated the la5routes alias to the new version of the command
* added a la5vendor alias to publish assets from vendor packages
2015-06-11 21:10:39 +02:00
regagain
266894c6a1 Update taskwarrior.plugin.zsh
Corrected documentation to avoid confusion (see https://github.com/robbyrussell/oh-my-zsh/issues/3796)
2015-06-11 21:10:38 +02:00
Michele Bologna
1a4dc0d2db Renamed 'ss' alias to 'sstat' (to avoid collision with /bin/ss). 2015-06-11 21:10:38 +02:00
Paul
8791d7e09e Update bgnotify.plugin.zsh
Fixed error with spaces in commands
2015-06-11 21:10:37 +02:00
Luca Stefani
af4ffe56ea adb: add more commands 2015-06-11 21:10:37 +02:00
Octavian Neamtu
fb5b83d10d Fixed jump pluging to display the right mark name on 'mark . ' 2015-06-11 21:10:36 +02:00
Oleksandr Shybystyi
563e1052c7 Added README for mercurial plugin 2015-06-11 21:10:35 +02:00
Paul Melnikow
4c409b0de9 sublime: Make subl a function so it can be called from functions in other modules
Without this change, whether a function can invoke 'subl' depends on the order in which modules are loaded. With this change, the order doesn't matter.

zsh resolves aliases at parse time not run time, which means if you invoke an alias from a function, the alias must be defined before the function.

See http://stackoverflow.com/a/25532276/893113 which refers to an explanation of this limitation.

For code which may be used non-interactively, the recommend workaround is to use functions instead of aliases.
2015-06-11 21:10:34 +02:00
Jonathan Roemer
e8ac8b9b5f Added support for detecting Sublime Text 3 on Arch Linux 2015-06-11 21:10:34 +02:00
Matheus Cruz Rocha
6bec3c6719 Update history-substring-search README
This Change remove the .zsh on the plugin activate example, cause with the .zsh at the end the plugin won't be activated
2015-06-11 21:10:34 +02:00
DimitriSteyaert
83c3316cf4 Added the tugboat autocompletion plugin 2015-06-11 21:10:33 +02:00
ncanceill
f513999a4d git plugin: make b local in gg* functions
because it leaked, and led to #3991
2015-06-11 17:14:35 +02:00
ncanceill
6ff96dab36 git plugin: fix error msg in gwip alias
because git rm will fail when no files were deleted
2015-06-11 16:16:12 +02:00
ncanceill
6c29041af7 git plugin: global var for git command
due to issues like #3962
until a proper plugin-loading system is implemented
2015-06-11 15:12:28 +02:00
ncanceill
a570f4b7f3 git plugin: bring back olg gg aliases
by popular demand, see #3972
2015-06-11 11:04:54 +02:00
Eubene Sa
10c92cc083 Updates to ember-cli plugin 2015-06-11 01:09:44 -07:00
UserTaken
557dc09d71 More run and create options 2015-06-11 00:21:45 -07:00
Blake Watters
25df9f3998 Disable globbing when executing zeus rake aliases to enable use of square brackets without escaping 2015-06-10 14:36:55 +02:00
Sean Escriva
f21a672fed add kitchen completion plugin from @petere 2015-06-10 14:36:55 +02:00
Andrew Purcell
41104f8af8 Fix homebrew directory in aws plugin.
Sometimes the output of ``homebrew --prefix`` and ``homebrew --prefix
awscli`` don't match, and the second is the correct call.
2015-06-10 14:36:54 +02:00
David Hartmann
8652fd64ef added comment functionality
added commenting functionality by appending 'm' after the issue key (regular JIRA shortcut)
2015-06-10 14:36:54 +02:00
Wayne
729b19c085 Remove docker insert command
Remove the docker insert command of autocomplete
2015-06-10 14:36:53 +02:00
liuxiang
45e3f623cc Add README for httpie plugin 2015-06-10 14:36:53 +02:00
Alexandre Joly
d686f8a8d0 generate with 'pod --completion-script' /cc thx to @ajmccall
version bumped
2015-06-10 14:36:52 +02:00
Alexandre Joly
a2f782e5f3 updated the command list to the latest cocoapod version (0.33.0)
version bumped
2015-06-10 14:36:52 +02:00
Rodrigo Argumedo
b7d041c627 Add rdrs method to reset the database(s) 2015-06-09 13:41:34 -06:00
Werner Buck
5770ad51f9 Set AWS_PROFILE and use existing RPROMPT 2015-06-09 16:52:40 +02:00
Manfred Touron
3a77433cea
Add new boot2docker options 2015-06-09 11:29:37 +02:00
Robby Russell
4c21557862 Merge pull request #3320 from moul/pr-boot2docker
[boot2docker plugin] Initial version
2015-06-05 08:06:11 -07:00
Robby Russell
3e88e53ee7 Merge pull request #2999 from nicorevin/master
fix paclist() for non-english locales
2015-06-05 08:04:59 -07:00
Robby Russell
dac07b2652 Merge pull request #2736 from felipec/fc/gitfast
gitfast: update to upstream v1.9.2
2015-06-05 08:04:32 -07:00
Robby Russell
35c7b7bbcf Merge pull request #1951 from Neal/extract-ipsw
Add .ipsw to the extract plugin.
2015-06-05 08:04:12 -07:00
Robby Russell
a449d53c7e Merge pull request #2790 from ncanceill/plugin-git
[UPDATE] Plugin: git
2015-06-05 08:01:31 -07:00
Robby Russell
da2109211d Merge pull request #3945 from nicolas-brousse/homebrew-plugin
Create new aliases for homebrew plugin
2015-06-04 22:17:34 -07:00
Lucas Braun
cffeefde90 Add installation instructions to README
Update README formatting
2015-06-04 11:00:21 -04:00
william
7f232f69fe Respect $ZSH_CACHE_DIR when creating fasd's cache 2015-06-02 14:43:38 -06:00
Nicolas Brousse
7416018d1c Create new aliases for homebrew plugin 2015-05-31 19:34:01 +02:00
GunfighterJ
0c8cb11d44 Add sublime text 3 paths to check list 2015-05-25 16:02:26 -05:00
Xin Li
743be91b20 Don't leak extendedglob to global environment. 2015-05-21 12:36:21 -07:00
epelletier
7b478d75a3 Detect the .venv in any parent directory of the current directory 2015-05-21 17:34:24 +02:00
delphiki
a1ed87a8a1 Added environment based shortcuts in symfony2 plugin 2015-05-13 16:55:54 +02:00
Jad Bitar
6504a2d386 Add CakePHP3 plugin 2015-05-12 13:23:05 -04:00
Diego Rabatone Oliveira
4d0aca48da Differing upgrade and safe-upgrade
Improving with "safe-upgrade" for aptitude and "upgrade" for apt-get
2015-05-09 18:46:54 -03:00
Andrew Dwyer
2449e41248 Add file completion as optional argument 2015-05-09 15:43:30 +09:30
Andrew Dwyer
de769058b9 Fix awk command. \s only working in gawk 2015-05-09 14:33:01 +09:30
ncanceill
5b75cc7880 Many updates to git plugin (see #2790) 2015-05-08 16:00:22 +02:00
Aleks
9a5e1a0552 Use $EDITOR 2015-05-06 10:26:05 +01:00
Satoshi Ohmori
d60d4f68aa Add alias of bundle clean 2015-05-05 14:29:38 +09:00
Toni Ristola
83cf909ad6 Added aliases for docker compose 2015-05-04 07:59:54 +03:00
Cooper Maruyama
d80918bf98 add markdown extension to README 2015-05-02 07:16:27 -07:00
Cooper Maruyama
24552f0225 Add readme and add new alias cfpc: paste+compile+copy 2015-05-02 07:14:21 -07:00
Robby Russell
140034605e Merge pull request #3825 from kennedyoliveira/master
Some fixes for Docker plugin
2015-05-01 08:21:06 -07:00
Cooper Maruyama
a315ddc075 typofix 2015-05-01 01:37:55 -07:00
Cooper Maruyama
8e8cdc0502 Add coffeescript aliases: cf, cfc, cfp
cf: compile and show output
cfc: compile & copy
cfp: compile from pasteboard & print
2015-05-01 01:34:20 -07:00
Kennedy Oliveira
2dbf9951d9 Fixing some issues where show repeated weird values, and fixed commands that need the container autocomplete without being running, like start, now it autocompletes showing all the containers so you can start without knowing the right name 2015-04-29 15:17:11 -03:00
Will Mendes
590d393595 Add autocomplete for frontend-search 2015-04-26 11:43:45 -03:00
Matthew Ziegelbaum
551d68ad11 Fixes gradle autocomplete. Regex did not include subproject tasks before. 2015-04-25 16:08:26 -04:00
Will Mendes
05f2ad3dbb fix stackoverflow url in search 2015-04-23 00:38:25 -03:00
dnixx
7f0b577b14 Use the newest Vundle commands
Vundle changed the command names during an interface update. The old commands will be deprecated. https://github.com/gmarik/Vundle.vim/blob/v0.10.2/doc/vundle.txt#L372-L396
2015-04-21 21:34:26 +02:00
Will Mendes
eea77b7cb7 Add stackoverflow link 2015-04-18 20:59:13 -03:00
Robby Russell
8301040383 Merge pull request #3683 from jameswomack/fix_3640
Use camelCase for npm aliases
2015-03-30 07:37:40 -07:00
Robby Russell
1b6af54676 Merge pull request #3692 from XerWandeRer/master
Update _adb
2015-03-20 22:20:04 -07:00
Abner Chen
0dde9943c9 [Modify] Update django.plugin.zsh for Django 1.7.6 2015-03-17 03:26:44 +08:00
XerWandeRer
a414b5e3d9 Update _adb
Added support for `tcpip` option
2015-03-16 13:55:35 +08:00
James Womack
c58c623305 Use camelCase for npm aliases 2015-03-11 14:20:47 -07:00
wyldphyre
01ec37e5f8 Added missing 'stt' command alias 2015-02-24 21:05:58 +08:00
wyldphyre
2e1b964c00 Add README.md file 2015-02-24 20:58:50 +08:00
Robby Russell
6ddd44a341 Merge pull request #3622 from koddsson/notifier-plugin-if-order
Re-order OS detection if..else statement in bgnotify plugin.
2015-02-23 15:14:00 -08:00
Robby Russell
656db4dfac Merge pull request #3623 from uberspot/nmap_feat
Add nmap plugin with some aliases for scan modes
2015-02-23 09:33:06 -08:00
Kristján Oddsson
1308515d1c Re-order OS detection if..else statement.
This patch will re-order the if statements when checking what operating
system the user is running.

This is useful for people that already have a `notify-send` binary in
their $PATH but are running OSX. An example of such requirements is
anyone running `vagrant-notify` is required to have a `notify-send`
binary on their $PATH.

See [link](https://github.com/fgrehm/vagrant-notify#os-x).
2015-02-23 17:25:55 +00:00
uberspot
0dc7b5c049 add nmap plugin with some aliases for scan modes 2015-02-23 19:15:29 +02:00
Robby Russell
31e29e1efb Merge pull request #3625 from tandrup/master
Fixing spaces in title and message given to bgnotify on OS X
2015-02-23 07:30:13 -08:00
Michał Ordon
8b45118f26 Update Grunt plugin to 0.1.2 2015-02-23 11:43:19 +00:00
Mads Mætzke Tandrup
7fc47e7ebc Fixing spaces in title and message given to bgnotify on OS X 2015-02-22 22:14:37 +01:00
Robby Russell
677acc3a8c Merge pull request #3486 from ckesc/master
Sublime Text plugin: sst alias for sudo run sublime
2015-02-22 10:46:44 -08:00
Robby Russell
bd792f09a1 Merge pull request #3444 from lululau/httpie-pr
Add completion for httpie
2015-02-22 10:46:24 -08:00
Robby Russell
9aa11c3bb5 Merge pull request #3458 from rexk/feature/go-plugin-upgrade
go plugin upgrade for version 1.4
2015-02-22 10:45:12 -08:00
Robby Russell
86a41a864d Merge pull request #3480 from dskecse/add-rails-rdms-alias
Add rdms alias to rails plugin
2015-02-22 10:44:00 -08:00
Robby Russell
d28917d53f Merge pull request #1999 from akatov/carton
cask completion plugin
2015-02-22 10:39:53 -08:00
Robby Russell
78cfe75c12 Merge pull request #3301 from t413/master
Background notifications on long-running commands
2015-02-22 10:34:14 -08:00
Robby Russell
43531625ab Merge pull request #2407 from mgalgs/gmt-compdef
Fix gmt compdef
2015-02-22 10:24:39 -08:00
Robby Russell
237304a64c Merge pull request #2346 from zsiciarz/master
Updated cabal plugin with Cabal 1.18-1.20 commands.
2015-02-22 10:24:21 -08:00
Robby Russell
272854367f Merge pull request #3508 from joshtronic/patch-1
Update git-flow.plugin.zsh
2015-02-22 10:23:51 -08:00
Robby Russell
07ebfd84ab Merge pull request #3497 from hsingh23/patch-1
Adds completions to wp-cli plugin
2015-02-22 10:22:55 -08:00
Robby Russell
9c0b643027 Merge pull request #3509 from joshtronic/patch-2
Update git-hubflow.plugin.zsh
2015-02-22 10:18:53 -08:00
Robby Russell
e2fd99a485 Merge pull request #3526 from DariusPHP/master
added server:run alias
2015-02-22 10:17:03 -08:00
Robby Russell
be63e8b776 Merge pull request #3518 from mfaerevaag/master
[wd] Update to v0.4.1
2015-02-22 10:15:08 -08:00
Robby Russell
6809b42b65 Merge pull request #3541 from agios/tmuxinator
Tmuxinator plugin improvements
2015-02-22 10:14:28 -08:00
Robby Russell
983c0c94a1 Merge pull request #3615 from mopsfelder/hgprompt
plugins: mercurial: Update the order prompt vars are displayed
2015-02-22 10:14:05 -08:00
Robby Russell
49a3dd1364 Merge pull request #3608 from idjaw/master
Adding ssh-config to vagrant plugin autocomplete. Was missing
2015-02-22 10:13:47 -08:00
Robby Russell
c4c3d32d60 Merge pull request #3544 from tejasbubane/add-all-alias-in-git-plugin
Add alias for git add --all
2015-02-22 10:13:34 -08:00
Robby Russell
7649c29926 Merge pull request #2009 from akatov/grunt
grunt completion
2015-02-22 10:11:35 -08:00
Robby Russell
9d0a9b8078 Merge pull request #3559 from WarFox/feature/mvn-plugin-src-docs
Added alias for downloading maven dependencies' sources and javadocs
2015-02-22 10:10:32 -08:00
Robby Russell
7c2d84f49d Merge pull request #3569 from avalent/master
Add cab autocompletion to the cabal plugin
2015-02-22 10:09:30 -08:00
Robby Russell
2f23f33067 Merge pull request #3577 from jameswomack/npm_convenience_aliases
Add convenience aliases for installation of npm modules
2015-02-22 10:08:51 -08:00
Robby Russell
e1bcd770b2 Merge pull request #3601 from nextgenthemes/master
Create Ubuntu/Debian/Mint/... plugin, based on Debian plugin
2015-02-22 10:06:57 -08:00
Robby Russell
56bc1c37f5 Merge pull request #3609 from craigp/added_local_hex_to_mix_plugin
Added the 'mix local.hex' command to plugin completions for mix
2015-02-22 10:03:33 -08:00
Robby Russell
43bdea4c2f Removing say() function in perl plugin so that it doesn't overwrite OSX comand line utility. Closes #2562 2015-02-22 09:57:42 -08:00
Robby Russell
ce607d3fcb Adding keystrong return to oascrupt per suggestion by @enzzzy. Fixes #2913. 2015-02-22 09:51:22 -08:00
Robby Russell
6713aef977 Merge branch 'master' of github.com:robbyrussell/oh-my-zsh 2015-02-22 09:29:41 -08:00
Robby Russell
aa16e18644 Updating histoby-substring-search README to instruct user to load plugins via .zshrc. Closes #1832. 2015-02-22 09:29:31 -08:00
Robby Russell
7b71dccbaf Merge pull request #3610 from bderrly/zle-active-check
Verify zle is active before trying to reset-prompt.
2015-02-22 09:17:17 -08:00
Brian Derr
d7837c6041 Shorten the zle check and reset-prompt into one line. 2015-02-21 18:08:54 -08:00
Andrew Janke
cb0718c147 chucknorris: locate plugin dir using $0 instead of hardcoded $ZSH 2015-02-21 18:24:07 -05:00
Murilo Opsfelder Araujo
0a99ca0df0 plugins: mercurial: Update the order prompt vars are displayed
If a user sets ZSH_THEME_HG_PROMPT_* as the following, he ends up with
%{$reset_color%} resetting the bold style of last character ")" because
_SUFFIX was expanded before calling hg_dirty():

    ZSH_THEME_HG_PROMPT_PREFIX="%{$fg_bold[blue]%}hg:(%{$fg[white]%}"
    ZSH_THEME_HG_PROMPT_SUFFIX="%{$reset_color%}"
    ZSH_THEME_HG_PROMPT_DIRTY="%{$fg[blue]%}) %{$fg[yellow]%}✗%{$reset_color%}"
    ZSH_THEME_HG_PROMPT_CLEAN="%{$fg[blue]%})"

With this patch, the variable ZSH_THEME_HG_PROMPT_SUFFIX is lastly
displayed, following the same order as in git_prompt_info(),
i.e. <prefix><dirty><suffix>.
2015-02-20 16:12:39 -02:00
Robby Russell
77140a2ea7 Merge pull request #3603 from alx741/master
Plugins: vi-mode
2015-02-19 22:02:38 -08:00
Andrew Janke
5f90781783 plugins/chucknorris: Add automatic updating of the compiled fortune data file. Use local variable for readability, and anonymous function to provide a scope for the local variable. 2015-02-19 23:53:48 -05:00
Brian Derr
bc8abe5ea2 Verify zle is active before trying to reset-prompt. 2015-02-19 13:30:50 -08:00
nextgenthemes
aff01d920e Update readme.md 2015-02-19 19:43:31 +01:00
nextgenthemes
393676387a Markdown bolds to capital letters 2015-02-19 19:37:54 +01:00
Craig Paterson
8ce1245770 added the 'mix local.hex' command to plugin completions 2015-02-19 17:55:32 +02:00
wajdi
e10470f6a3 Adding ssh-config to vagrant plugin autocomplete. Was missing 2015-02-19 10:34:51 -05:00
Robby Russell
223197b4e0 Merge pull request #3533 from maff/chucknorris-fortune
Chuck Norris fortune
2015-02-18 15:10:41 -08:00
Robby Russell
8d561aa008 Merge pull request #3573 from mcornella/fix-taskwarrior-first-completion
Fix first-tab completion in task command
2015-02-18 15:09:09 -08:00
Robby Russell
dcc08b0dc0 Merge pull request #3545 from BilalBudhani/ember-cli-plugin
Plugin for Ember-cli
2015-02-18 15:07:39 -08:00
Robby Russell
9a58e8dab7 Merge pull request #3578 from ctroncoso/patch-1
docker containers based on defined names
2015-02-18 15:07:02 -08:00
Robby Russell
67fff6026d Merge pull request #3589 from miguxbe/master
Add initial JHBuild plugin support
2015-02-18 15:05:04 -08:00
Robby Russell
84a318be87 Merge pull request #3590 from voronkovich/master
Fix composer completion: "\s" is a gawk-specific regexp operator.
2015-02-18 15:04:24 -08:00
Robby Russell
5b429b6e48 Merge pull request #3596 from kossmac/master
added stats command to docker plugin
2015-02-18 15:04:10 -08:00
Daniel Campoverde [alx741]
33900dfd32 PLUGINS: vi-mode: allow ctrl-h, ctrl-?, ctrl-w for char and word deletion
Allow ctrl-h, ctrl-?, ctrl-w after changes in normal mode.
2015-02-18 14:29:44 -05:00
Daniel Campoverde [alx741]
099246dd9e PLUGINS: vi-mode: allow ctrl-p, ctrl-n for history navigation
Allow ctrl-p, ctrl-n for history navigation while in insert mode.
2015-02-18 14:25:15 -05:00
nextgenthemes
d8b9932138 Update readme.md 2015-02-17 07:49:55 +01:00
nextgenthemes
660eeb19c7 Update readme.md 2015-02-17 07:48:01 +01:00
nextgenthemes
3120b9ad45 Update readme.md 2015-02-17 07:36:23 +01:00
nextgenthemes
f50b3fe710 Create ubuntu plugin, based on debian plugin.
* Easy to remember aliases
* Simplified
* Added aar() function for `sudo apt-add-repository xxxx && apt-get upgrade && apt-get install xxxx`
2015-02-17 07:33:45 +01:00
nextgenthemes
6b29aab37a Create readme.md 2015-02-17 07:27:38 +01:00
Oleg Voronkovich
8b5950b812 Fix: "\s" is a gawk-specific regexp operator. 2015-02-17 01:24:21 +03:00
Karsten Kosmala
cd36deda23 added stats command to docker plugin 2015-02-16 12:04:37 +01:00
pi0
7c73a3aea4 Laravel 5 support 2015-02-16 11:58:54 +03:30
Alexandros Giouzenis
b39dbec7e9 Fix tmuxinator completion for symlinked dirs
Tmuxinator start command can be ommited
Fix #2812
2015-02-15 18:29:26 +02:00
Miguel Vaello Martínez
ec9525b94e Add initial JHBuild plugin support
This is a bunch of alias for the JHBuild tool.
A well known tool in the GNOME dev project.
2015-02-15 15:39:50 +01:00
Andrew Janke
a9e97e5d2d Remove terminalapp plugin and fold its implementation in to lib/termsupport.zsh. Replaces the redundant Terminal.app support that was recently added to termsupport. 2015-02-14 19:05:27 -05:00
Marc Cornellà
4b20bfe0ee Fix first-tab completion in task command
This is done by calling `_task` at the end of the _task completion file,
as is standard in completion files.
2015-02-13 17:29:44 +01:00
ctroncoso
68955f17ad docker containers based on defined names
docker container autocomplete listing uses containers ID instead of names.
Most users identify their containers by name. ID is only needed and used on a dynamic environment more suited in scripts.
2015-02-13 09:49:54 -03:00
James Womack
6967393fe6 Add convenience aliases for installation of npm modules 2015-02-12 23:19:43 -08:00
Neal
f1d12c598b Add .ipsw to the extract plugin. 2015-02-11 16:48:31 -08:00
Ashley Valent
3b6a695b60 Merge branch 'master' of github.com:avalent/oh-my-zsh 2015-02-11 11:22:15 +11:00
Ashley Valent
3ba10ad0a2 Added cab autocompletion to the cabal plugin.
cab is a wrapper for ghc-pkg and cabal that provides some nice features
like listing outdated packages.
See https://hackage.haskell.org/package/cab for more details on the cab
program.
2015-02-11 11:19:42 +11:00
Marc Cornellà
732c7b8070 Simplify adding workon_cwd to chpwd hook 2015-02-10 20:32:52 +01:00
Marc Cornellà
b62911660d Organize error checking in virtualenwrapper plugin 2015-02-10 20:32:52 +01:00
Brandon Sandrowicz
4161aa4f9d Fixing virtualenvwrapper plugin for Ubuntu (and Debian)
Ubuntu and Debian store the system-installed virtualenvwrapper in
/etc/bash_completion.d/virtualenvwrapper, so that it gets automatically sourced
at startup in Bash. By not putting it somewhere in $PATH, they end up excluding
others (e.g. Zsh) that might want to use that file. Oops!

The virtualenvwrapper plugin should account for this so that Ubuntu (or Debian)
users don't end up with this message:

zsh virtualenvwrapper plugin: Cannot find virtualenvwrapper.sh. Please install with `pip install virtualenvwrapper`.

even when they have a virtualenvwrapper installed to a known location.
2015-02-10 20:32:52 +01:00
Robby Russell
8830f65c4d Merge pull request #3467 from mcornella/fix-composer-plugin
[Plugin composer] Multiple fixes
2015-02-10 11:22:40 -08:00
Robby Russell
f0bbd308fe Merge pull request #3443 from mcornella/better-web-search-plugin
Refactor and improve web-search plugin
2015-02-10 11:22:25 -08:00
Robby Russell
9b8e88d5ac Merge pull request #3483 from ai/fedora-not-found
Add Fedora support for command-not-found plugin
2015-02-10 11:21:36 -08:00
Robby Russell
52177162f7 Merge pull request #3479 from faceleg/patch-1
Removing 'local' usage to prevent issue when installed with antigen
2015-02-10 11:20:52 -08:00
Robby Russell
49b4e675e0 Merge pull request #3547 from martong/vi_mode_trapwinch
Added trapwinch to vi-mode plugin.
2015-02-10 11:20:42 -08:00
Robby Russell
0a0a27857e Merge pull request #3413 from mcornella/fix-dircycle-plugin
dircycle plugin: clean and fix logic once and for all
2015-02-10 11:20:08 -08:00
Robby Russell
412a92e45e Merge pull request #3141 from muggenhor/sudo-maintain-cursor-pos
sudo: maintain cursor position
2015-02-10 11:18:32 -08:00
Marc Cornellà
6fb866183d Remove composer.json file requirement
This is because we can't be sure which arguments require a json file
and which don't, so the `else' statement will always be difficult to
check for correctness.
2015-02-10 19:32:59 +01:00
Maxime Fabre
ef220f0928 Add aliases for composer global 2015-02-10 19:32:59 +01:00
Andrey Janzen
5f4e8e57da Allow completion for 'composer.phar', not only 'composer'
Use $_comp_command1 for command list generation instead of 'composer':

  `$_comp_command1` contains the command written in the command line.
  This allows us to have a different composer name
2015-02-10 19:32:59 +01:00
Julien Pepy
0cc3afe277 Fix get command list for recent composer versions 2015-02-10 19:32:59 +01:00
Marc Cornellà
02d75684f3 Force using https in Yandex search engine 2015-02-10 19:32:52 +01:00
Marc Cornellà
e8daf8150e Fix yahoo search URL in web-search plugin 2015-02-10 19:32:52 +01:00
Marc Cornellà
c45885093f Add support for cygwin open in web-search plugin 2015-02-10 19:32:52 +01:00
Marc Cornellà
adaea31ca0 Silence nohup output in web-search plugin 2015-02-10 19:32:52 +01:00
Marc Cornellà
80ba54a94f Add Yandex support to web-search plugin 2015-02-10 19:32:52 +01:00
Marc Cornellà
80d856e165 Clean up web-search plugin logic to allow easier changes 2015-02-10 19:32:52 +01:00
Marc Cornellà
2193135ebc Clean up appearance lib file and redundant colors calls in other files 2015-02-10 19:22:50 +01:00
LFDM
724143c329 Deletes dot aliases from common-aliases.
They are implemented in lib anyway.
2015-02-10 19:22:39 +01:00
LFDM
ace98846ea 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.
2015-02-10 19:22:38 +01:00
Marc Cornellà
282240bf37 Account for iTerm2 sent keys in dircycle plugin 2015-02-10 19:18:15 +01:00
Marc Cornellà
999bab187c Emulate zsh in zlewidgets instead of static setopt command
This way the user can keep their preferred pushd syntax while enabling
us to use a standard syntax in our defined functions.

To explain further, without a clear value on the PUSHD_MINUS option, we
could be changing the +1/-0 values all we want, that some user would
find that it didn't work for him.

We have two options, then:
- Setting a particular value, which was my first approach.
- Using `emulate -L zsh` to ensure all options defined in the function's
  body won't be passed along to the main zsh instance.
  For more info see:
  http://zsh.sourceforge.net/Doc/Release/Shell-Builtin-Commands.html#index-emulate
2015-02-10 19:18:15 +01:00
Marc Cornellà
e93fd939ad Run pushd command directly and trigger prompt redraw 2015-02-10 19:18:15 +01:00
Marc Cornellà
5fe22fcbc6 Clean up and fix +1/-0 syntax to work as expected
This change follows this proposed behaviour:

 Ctrl+Shift+Left:  move to last visited directory
 Ctrl+Shift+Right: move to next visited directory

an alternative behaviour would be:

 Ctrl+Shift+Left:  move directory to the left in `dirs` output
 Ctrl+Shift+Right: move directory to the right in `dirs` output

It also introduces `setopt nopushdminus` as a way to standardise
pushd syntax. It's value wasn't clear before, which has been the
cause of so many pull requests regarding this plugin not working
in some environments.
2015-02-10 19:18:14 +01:00
Robby Russell
13e5afe805 Merge pull request #3164 from nailor/fix-deactivate-bug
virtualenvwrapper: Deactivate only if in virtualenv
2015-02-10 07:28:51 -08:00
Robby Russell
811f1f9eb9 Merge pull request #3329 from capeterson/master
Improved ant completion
2015-02-10 07:28:39 -08:00
Chris Peterson
349493a0b8 Fix for ant targets with leading dash
As suggested in https://github.com/robbyrussell/oh-my-zsh/pull/3329#issuecomment-72062236
2015-02-09 13:12:02 -08:00
Chris Peterson
013b2bffcf Change ant target enumeration
Make use of ant's project help feature instead of trying to parse XML with regex (see: http://stackoverflow.com/a/1732454/740787).
This is a behavioral change that does a few things:
 • adds support for ant imports, which were previously not recognized as possibly containing targets
 • supresses targets with no description, as these are conventionally for internal use only
2015-02-09 13:12:02 -08:00
Chris Peterson
7f636ba590 Backwards logic in newer check.
Regen .ant_targets only if it's newer than build.xml? Yeah, that seems wrong.
2015-02-09 13:12:02 -08:00
Deepu Mohan Puthrote
fc606d91a0 Added alias for downloading maven dependencies' sources and javadocs 2015-02-07 16:57:53 +00:00
Mathias Geat
2e0da6864b add chucknorris plugin 2015-02-05 07:43:42 +01:00
Gabor Marton
7de44dbdb7 Added trapwinch to vi-mode plugin. 2015-02-04 12:56:58 +01:00
Bilal Budhani
431faa924e Creates Ember-cli plugin and Adds its aliases 2015-02-04 15:39:34 +05:30
Tejas Bubane
8cb97d6f22 Add alias for git add --all 2015-02-04 12:24:17 +05:30
Michael Robinson
8ccfc3d444 Removing 'local' usage to prevent issue when installed with antigen
Error encountered when installed with antigen: "chpwd:2: no such file or directory:".  Solution described in https://github.com/zsh-users/antigen/issues/75
2015-02-02 11:52:07 +13:00
Marc Cornellà
e60458793a Switch newer-than logic to get the desired behavior
In the old version, the function returned true (0) if the cache file
was newer than the Cakefile, which was *always* unless the Cakefile
had been updated. Therefore we generated the file every time unless
the Cakefile was updated, which was precisely when we needed to
regenerate the cache file.

Now it generates the cache file only when the Cakefile has been
updated.
2015-02-01 23:32:38 +01:00
Robby Russell
550ccca91c Merge pull request #3478 from stephenrjohnson/custom_cache_dir
Allow custom cache dir
2015-01-31 06:23:50 -06:00
Robby Russell
147ebd60d9 Merge pull request #3490 from lmartins/master
Fix Plugin commands
2015-01-31 06:09:01 -06:00
Darius Grigalevicius
c4d3de1ea0 added server:run alias 2015-01-28 14:02:36 +02:00
Markus Faerevaag
4533c7a31c [wd] Update to v0.4.1 2015-01-26 00:13:39 +01:00
Josh Sherman
49549d9558 Update git-hubflow.plugin.zsh 2015-01-20 21:25:07 -05:00
Josh Sherman
fd3a34844f Update git-flow.plugin.zsh 2015-01-20 21:24:41 -05:00
Harsh Singh
b2f8764855 Adds completions to wp-cli plugin 2015-01-15 12:55:32 -06:00
Luis Martins
3abc2a4375 Fix Plugin commands 2015-01-12 17:26:04 +00:00
Yu Jiang
3c4998319a Update django.plugin.zsh
activate django plugin on command "django-admin"
2015-01-12 21:57:00 +08:00
CkEsc
5b90092555 Sublime Text plugin: added sst alias for sudo run sublime 2015-01-11 17:52:08 +03:00
Andrey Sitnik
f997ed7ed8 Add Fedora support for command-not-found plugin 2015-01-10 15:38:49 +01:00
Dzianis Dashkevich
a55a313328 Add rdms alias to rails plugin 2015-01-09 16:46:02 +03:00
Stephen
ceb42ecdb6 Update /home/srj/.oh-my-zsh/cache references 2015-01-08 16:38:05 +00:00
Jyrki Pulliainen
833e6f5958 virtualenvwrapper: Deactivate only if in virtualenv
If user manually deactivates the virtualenv when using this mode, zsh
will produce following error:

    deactivate:12: command not found: virtualenv_deactivate

To avoid this, check that the VIRTUAL_ENV flag is set before trying to
automatically deactivate the virtual environment.

Fixes #2185
2015-01-07 18:17:29 +01:00
rexk
8790fa3723 go plugin upgrade for version 1.4 2014-12-30 14:53:31 -08:00
liuxiang
957564ab9f Add completion for httpie 2014-12-27 23:56:57 +08:00
Robby Russell
da1ca8876e Merge pull request #3404 from ekaragodin/master
Added Yii2 command completion
2014-12-20 12:40:47 -08:00
Robby Russell
0c47d8cfe4 Merge pull request #3146 from typekpb/tmux-aliases
additional tmux aliases
2014-12-20 12:38:43 -08:00
Robby Russell
304e8f0480 Merge pull request #3338 from eripa/chruby_fix
Fix chruby plugin to not complain if chruby is *not* installed
2014-12-20 12:37:18 -08:00
Robby Russell
b0ad3d7c70 Merge pull request #3352 from benjaoming/virtualenvwrapper_workon_unset
Throw an error message when $WORKON_HOME is not set
2014-12-20 12:37:05 -08:00
Robby Russell
fe2ccb30af Merge pull request #3397 from peteches/master
Fixed output issues webith websearch plugin.
2014-12-20 12:36:27 -08:00
Robby Russell
5167450ef9 Merge pull request #3424 from bergvandenp/docker_exec
added exec command to docker plugin
2014-12-19 20:30:59 -08:00
Robby Russell
4a56c6b30b Merge pull request #3303 from iml/brew-update
Remove deprecated brew commands, update core commands
2014-12-19 20:27:54 -08:00
Robby Russell
1b2d7fd9e9 Merge pull request #3362 from emarashliev/master
Added Xcode alias for deleting Derived Data.
2014-12-19 20:26:50 -08:00
Robby Russell
dc9af89669 Merge pull request #3372 from bbiao/compatible-with-new-autojump
autojump installed from github has mv the autojump.zsh to $HOME/.autojum...
2014-12-19 20:26:08 -08:00
Robby Russell
9e794a5d3e Merge pull request #3410 from Superbil/master
Fix aws.plugins.zsh check rule
2014-12-19 20:20:21 -08:00
Paul van den Berg
9e5f0f0e9d added exec command to docker plugin 2014-12-18 23:22:48 +01:00
Christophe Coevoet
f7deb52c47 Update the list of Heroku Postgres commands 2014-12-16 17:35:08 +01:00
Superbil
7931d5ce1a
Fix aws.plugins.zsh check rule
Check _aws_zsh_completer_path had exist or not
2014-12-16 00:51:22 +08:00
ekaragodin
00ff1bbd1c Updated Yii2 command completion 2014-12-15 21:37:38 +06:00
spacewander
0c77e4ba6f update git-extras plugin 2014-12-15 12:41:22 +08:00
ekaragodin
7488e9b510 Add yii2 readme 2014-12-15 08:18:18 +06:00
Robby Russell
0a96bb1577 Merge pull request #2094 from frantzmiccoli/phing-fix
Phing plugin improvment
2014-12-14 16:44:06 -08:00
Robby Russell
fe75c968ef Merge pull request #3399 from ryan-robeson/add-itunes-shuffle-command-to-osx-plugin
Add itunes shuffle command to OSX plugin.
2014-12-14 16:35:45 -08:00
Robby Russell
77bfdc69ab Merge pull request #3395 from vmalloc/patch-1
Fix dircycle plugin
2014-12-14 16:35:02 -08:00
Robby Russell
eced76e0fd Merge pull request #3326 from DanielFGray/master
ignore any grep aliases that might be defined
2014-12-14 16:32:11 -08:00
ekaragodin
08b9f8d677 Added Yii2 command completion 2014-12-14 11:43:52 +06:00
Ryan Robeson
43a2e24c25 Add itunes shuffle command to OSX plugin.
Added shuffle functionality to the itunes command in the OSX plugin.
iTunes 12 doesn't support setting the "shuffle" property on the playlist
from what I've read, so this simulates the user interacting with the
iTunes interface. The toggle option "clicks" the shuffle button in the
Now Playing area. This has the effect of toggling the shuffle setting on
whatever is currently playing. The on and off options use the Shuffle
menu bar items.

Usage: itunes shuffle [on|off|toggle]
2014-12-12 17:48:17 -05:00
Pete "Peteches" McCabe
1d2c1e8ab8 Fixed output issues webith websearch plugin.
- if user has rm set as an alias to 'rm -i' user is prompted to whether to
  remove the nohup.out file.

 $ ddg fools
	nohup: ignoring input and appending output to ‘nohup.out’
	rm: remove regular empty file ‘nohup.out’?

- if output redirected to a file nohup will not create nohup.out and rm is
  unecessary.
2014-12-12 17:37:35 +00:00
Rotem Yaari
9677cfb34e Fix dircycle plugin
dircycle right did not behave as expected and was fixed
2014-12-11 23:41:47 +02:00
ZHANG Biao
a19d1d1f05 autojump installed from github has mv the autojump.zsh to $HOME/.autojump/share/autojump/autojump.zsh 2014-12-04 11:38:37 +08:00
Ion Marusic
011f25d492 Fixed command autocomplete for Symfony 2.6.x 2014-12-02 20:10:47 +02:00
Emil Marashliev
575bb91b5f Added Xcode alias for deleting Derived Data. 2014-12-01 13:34:18 +02:00
benjaoming
4b05e548d0 Throw an error message when $WORKON_HOME is not set
Took me a while to figure this one out, and I have a default installation of virtualenvwrapper -- this is a soft fix, just put an error message. But perhaps the fix should be to use the default value `~/.virtualenvs`.
2014-11-28 14:41:34 +01:00
Robby Russell
43aa3783f8 Merge pull request #2448 from gawashburn/master
Fix autojump script to support Nix installations
2014-11-27 20:03:06 -08:00
Robby Russell
5acfdf5c90 Merge pull request #2871 from wrboyce/extract-pigz
use pigz if available in extract plugin
2014-11-27 20:02:40 -08:00
Robby Russell
4610add16d Merge pull request #3092 from MWers/aws-brew-issue
[aws plugin] Changed brew cmd to properly report if awscli is installed via homebrew
2014-11-27 20:02:08 -08:00
Will Boyce
db8eacf6fd use pigz if available in extract plugin 2014-11-26 14:20:00 +00:00
Eric Ripa
1dfadc734c Fix chruby plugin to not complain if chruby is *not* installed 2014-11-24 09:54:50 +01:00
Kravchuk S.V
0c04470f63 [~] fix plugin pj
bce74975d0
2014-11-16 22:38:27 +03:00
DanielFGray
00ec11d3c0 ignore any grep aliases that might be defined 2014-11-16 02:47:35 -06:00
Geoffrey Washburn
923d2c85b4 Fix autojump script to support Nix installations 2014-11-15 13:32:34 -05:00
Manfred Touron
b7fcdc7364 [tmux-cssh plugin] Initial version 2014-11-13 19:00:27 +01:00
Manfred Touron
95d5f2c641 [boot2docker plugin] Initial version 2014-11-13 18:59:04 +01:00
Tim O'Brien
fd69c34e0c Add screenshots to readme 2014-11-08 14:20:37 -08:00
Tim O'Brien
98fc8dd91a Fix for OS X when no window id is returned (like on the desktop) 2014-11-08 14:16:56 -08:00
Ian Lancaster
8bd8597e12 Remove deprecated brew commands, update core commands
`brew services` and `brew server` were moved to homebrew-boneyard.
2014-11-08 05:03:24 -05:00
Tim O'Brien
cbec1d77b2 Add window ID fallback for windows.
- maybe someday use GetForegroundWindow() from User32.lib ...
2014-11-07 10:58:11 -08:00
Tim O'Brien
3d376bbd5b Fix renamed method issue. 2014-11-07 08:35:31 -08:00
Benjamin Stier
11253336cf Fixes the profiles-plugin
An error was introduced with 7f75bb9, which uses special vars. This is the
fix.
2014-11-07 10:47:27 +01:00
Tim O'Brien
adafe271f0 add cygwin windows support with notifu, add to readme 2014-11-06 10:35:07 -08:00
Tim O'Brien
0b0cc2cdea Fixed math on linux, removed debug echo. 2014-11-06 10:34:47 -08:00
Tim O'Brien
e16d3e45d3 Add bgnotify plugin, a cross-platform background notifier! 2014-11-06 10:34:26 -08:00
Marc Cornellà
95d795e8ca Change all hostname calls for $HOST or $SHORT_HOST 2014-11-06 18:33:56 +01:00
Marc Cornellà
4310a15de5 Change all pwd calls for $PWD variable
This avoids spawning additional processes as $PWD **always** contains
the current working directory.
2014-11-06 18:33:56 +01:00
Marc Cornellà
74177c5320 Change all whoami calls for $USER variable
This avoid spawning additional processes, as the $USER variable will
**always** contain the current logged-in user.
2014-11-06 18:33:56 +01:00
Robby Russell
7034b01cd1 Merge pull request #3213 from nikhgupta/features/fix-emoji-clock
added support for GNU version of `date`
2014-11-06 09:28:30 -08:00
Robby Russell
8a51bfd76b Merge pull request #3108 from mfaerevaag/master
[wd] New minor version (v0.4)
2014-11-06 09:28:08 -08:00
Robby Russell
35f1a23735 Merge pull request #3131 from halilim/remove-j-alias
Remove j alias for autojump
2014-11-06 09:27:56 -08:00
Robby Russell
510055a03a Merge pull request #3081 from pavoljuhas/master
update the scd plugin for smart change of directory.
2014-11-06 09:27:43 -08:00
Robby Russell
6118446575 Merge pull request #2974 from elliottwilliams/patch-1
Fix osx function: "not valid in this context"
2014-11-06 09:27:16 -08:00
Robby Russell
e423ca04c8 Merge pull request #2976 from shammellee/patch-1
typo
2014-11-06 09:26:56 -08:00
Robby Russell
57ff83db59 Merge pull request #2946 from moinakg/master
Solaris portability tweaks.
2014-11-06 09:26:48 -08:00
Robby Russell
1b65c55fcf Merge pull request #2959 from crkochan/fix_rake_command
Fix for recusion limit hit for _rake_command alias
2014-11-06 09:19:49 -08:00
Robby Russell
2984d2dc4b Merge pull request #2168 from riyad/modernize-virtualenv
Modernize the virtualenv plugin
2014-11-06 09:14:17 -08:00
Robby Russell
ed01122804 Merge pull request #1604 from franklouwers/master
Improve pj-plugin to support projects with spaces in their names + optimise code
2014-11-06 09:13:56 -08:00
Robby Russell
548b9c447d Merge pull request #3224 from Neal/xcode-simulator-fix
Update path for the iOS simulator.
2014-11-06 09:13:40 -08:00
Robby Russell
ba6bf248b4 Merge pull request #3230 from willmendesneto/fix-compass-doc-search
Fix error using compass search alias
2014-11-06 09:13:24 -08:00
Pavol Juhas
b6012bc2c3 Update to the upstream smart-change-directory.
Synced with the master branch
pavoljuhas/smart-change-directory@20b5a80cf0.
2014-11-02 12:33:56 -05:00
Neal
071de5fb39 Make the simulator alias work with older Xcode versions as well. 2014-10-27 22:17:26 -05:00
Marc Cornellà
b452cafb16 Follow-redirect and silent mode curl throughout gitignore
This commit completes previous efforts and standardizes both curl commands
into using silent mode and following redirects in case the URL changes
again in the future.
2014-10-22 18:13:15 +02:00
WooParadog
04d1428fcb Fix gitignore curl, should follow redirects 2014-10-22 18:13:15 +02:00
Alex Shaindlin
69a0b280c7 Fix misspellings in gitignore plugin 2014-10-22 18:13:15 +02:00
Andrii Kostenko
b9a11b16fe fixed URL on github.io
github.io moved to https and http returns 301 redirect
2014-10-22 18:13:15 +02:00
Markus Faerevaag
9f801ff48d [wd] fix space in path 2014-10-21 09:54:15 +02:00
willmendesneto
6f1eb081e3 Fix error using compass search alias 2014-10-18 11:06:24 -03:00
Neal
d794a502f6 Update path for the iOS simulator. 2014-10-14 13:57:19 -05:00
Nikhil Gupta
71ee0d7b2b added support for GNU version of date 2014-10-14 20:44:31 +05:30
André König
8f9a72aa7b Moved plugin. 2014-09-18 19:55:44 +02:00
Moinak Ghosh
5f38a537ce Update Solaris changes to use OSTYPE and zsh datetime module. 2014-09-16 22:29:52 +05:30
Peter Butkovic
eb0549750f additional tmux aliases 2014-09-16 10:35:43 +02:00
Giel van Schijndel
1e7c6743a7 sudo: maintain cursor position
I.e. when prefixing the current command-line with 'sudo ' maintain the
current cursor position instead of jumping to the end of the line.
2014-09-15 15:36:34 +02:00
Halil Özgür
7a5d68c963 Remove j alias for autojump
j alias conflicts with autojump's j() function. Fixes #2989
2014-09-13 10:30:16 +03:00
Markus Faerevaag
b5093859af [wd] Minor bug fix in show command 2014-09-08 09:09:44 +02:00
Markus Faerevaag
6855dd4727 [wd] New minor version (v0.4) 2014-09-07 21:56:34 +02:00
Robby Russell
96e4e5dd03 Merge pull request #2811 from stucki/multiple-vagrant-machines
Support dynamically defined Vagrant machines
2014-09-05 21:16:23 +02:00
Robby Russell
4bba11dbef Merge pull request #2744 from docwhat/ostype-not-uname
Use $OSTYPE instead of uname to speed things up
2014-09-05 21:15:57 +02:00
Robby Russell
5e25913178 Revert "Exit early from git plugin if not in git repo." 2014-09-04 12:53:43 +02:00
Matt Walker
87fb118dd2 Changed brew cmd to properly report if awscli is installed via homebrew 2014-09-03 12:01:29 -07:00
Michael Stucki
ae901fa0d5 Support dynamically defined Vagrant machines 2014-09-03 16:08:27 +02:00
Philipp Wahala
8d2dd8cc6a Symfony2 plugin autocomplete for app/console and bin/console 2014-09-03 11:58:52 +02:00
Philipp Wahala
677d8b1a21 Symfony2 plugin look for files only 2014-09-03 11:36:22 +02:00
Philipp Wahala
ed6c2c9106 Symfony2 plugin use first console found 2014-09-03 11:13:21 +02:00
Ján Koščo
a6ab704482 Added a short description of the plugin 2014-09-01 20:08:29 +02:00
Robby Russell
da94f45f9c Merge pull request #3073 from ajhenriques/master
add git difftool alias (gdt)
2014-09-01 13:02:55 +02:00
Robby Russell
d21e3ee422 Merge pull request #2996 from joshmedeski/master
WP-CLI plugin init
2014-09-01 13:02:34 +02:00
Robby Russell
003f3677db Merge pull request #3070 from stucki/vagrant-vm-list-fix
Improve support for Vagrant VM definitions
2014-09-01 13:01:36 +02:00
Robby Russell
a910aef0c4 Revert "Add Composer's local binaries to PATH" 2014-09-01 13:01:01 +02:00
Joshua Medeski
b8e10ca16d add wp-cli plugin readme 2014-08-31 23:33:43 -05:00
AJ Henriques
f0d5cfdc33 add git difftool alias (gdt) 2014-08-31 20:30:42 -07:00
Michael Stucki
e7fdb028b5 Improve support for Vagrant VM definitions 2014-08-31 23:50:59 +02:00
Tobias Preuss
65f97a66c7 Add README.md for adb-autocompletion plugin. 2014-08-31 21:42:49 +02:00
Robby Russell
23bbf3cc2b Merge pull request #2986 from Guerki/master
Run web-search in background
2014-08-31 12:16:38 -07:00
Robby Russell
99fde07b8f Merge pull request #3000 from bigtiger/add-git-add-patch
Add gap (git add --patch)
2014-08-31 12:10:04 -07:00
Robby Russell
1f9b24e56b Merge pull request #2997 from cchacin/master
TomEE maven plugin + integration-test in common life-cycle
2014-08-31 12:08:08 -07:00
Robby Russell
eae6c38ea8 Merge pull request #3010 from celsomiranda/patch-1
Add support for local aur databases
2014-08-31 11:46:07 -07:00
Robby Russell
244a6f23e5 Merge pull request #3011 from cherrry/master
rounding to emoji clock
2014-08-31 11:45:10 -07:00
Robby Russell
58491bda21 Merge pull request #3012 from abstractj/git-gpg-signatures
Inclusion of aliases for sign git commits and tags
2014-08-31 11:44:57 -07:00
Robby Russell
74e7510a7d Merge pull request #3014 from allister-lundberg/git_alias_gitbranchremote
New alias for git plugin: gbr == git branch --remote
2014-08-31 11:43:59 -07:00
Robby Russell
fc365f5bdc Merge pull request #2963 from bezoerb/symfony2-autocomplete-fix
#2914 fixed symfony2 autocomplete
2014-08-31 11:36:08 -07:00
Robby Russell
5e842cf4f1 Merge pull request #3041 from takac/master
Update jira plugin to allow lookup of issues
2014-08-31 11:34:12 -07:00
Robby Russell
c22658e15d Merge pull request #3059 from chrisfsmith/feature/bbedit
Adding BBEdit plugin (OS X only)
2014-08-31 11:26:14 -07:00
Robby Russell
b88d68279e Merge pull request #3060 from chrisfsmith/feature/marked
Adding Marked 2 plugin (OS X only)
2014-08-31 11:25:58 -07:00
Robby Russell
3577fba612 Merge pull request #3058 from chrisfsmith/feature/textastic
Adding Textastic plugin (OS X only)
2014-08-31 11:25:29 -07:00
Robby Russell
c207c83968 Merge pull request #1755 from johnjohndoe/feature/adb-autocompletion
Add autocompletion for adb
2014-08-31 11:04:55 -07:00
Chris Smith
9bf5b90c81 Adding README.md and renaming plugin 2014-08-31 13:01:21 -05:00
Robby Russell
c07bf981c3 Merge pull request #1504 from jediant/master
Exit early from git plugin if not in git repo.
2014-08-31 10:59:55 -07:00
Chris Smith
d7f77f818d Adding README.md 2014-08-31 12:56:23 -05:00
Chris Smith
a8dad6fa87 Adding README.md 2014-08-31 12:55:46 -05:00
Robby Russell
6caed46356 Merge pull request #2941 from mcornella/fix-pass-completion
Update pass completion and fix syntax and autoloading
2014-08-31 10:55:35 -07:00
Robby Russell
3e30b4d2d1 Merge pull request #2922 from ncanceill/easymerge
Easy-to-Merge via @ncanceill... our hero!
2014-08-31 10:46:31 -07:00