Commit graph

3449 commits

Author SHA1 Message Date
Robby Russell e3d305e221 Merge branch 'skv-headless-rails-rake-test' 2015-09-19 08:55:23 -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 0bb3e0188c Merge pull request #3940 from apjanke/diagnostic-dump-function
Add omz_diagnostic_dump() to help with bug reporting
2015-09-19 08:50:23 -07:00
Robby Russell 8cf88f2b04 Merge pull request #3911 from mbologna/git_remote_status_equal
added ZSH_THEME_GIT_PROMPT_EQUAL_REMOTE
2015-09-19 08:49:57 -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 5e45c16701 Merge pull request #2751 from drm00/fix-openbsd-colorls
add check for colored ls on openbsd. (retry of #2225)
2015-09-19 08:46:13 -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
Robby Russell 56cdec7534 Merge pull request #3889 from leycec/compaudit
Repair `zsh` Path Permissions on `oh-my-zsh` Startup under Cygwin
2015-09-19 08:40:34 -07: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
Robby Russell 9c08641d7c Merge pull request #4299 from mcornella/refactor-frontend-search-plugin
Refactor frontend-search plugin
2015-09-04 22:30:44 -07:00
Andrew Janke 46ddd88fe0 diagnostics: switch to shasum, filter sysinfo using lines
shasum seems more widely available than md5/md5sum, and we don't have to worry about dealing with the different signatures and output formats of md5 and md5sum then.

sysinfo outputs localized message labels, so we can't just grep for "OS Type". But OS is the first thing it outputs, so we can probably just grab those lines by line number. Switched to doing that.
2015-09-04 14:13:00 -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
Eric Bottard ef4a315630 Fix invocation of gradlew 2015-09-02 20:17:03 +02: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
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
Robby Russell 01b378357b Merge pull request #4302 from kyleheyne/patch-1
thefuck-alias -> thefuck --alias
2015-08-31 21:27:47 -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 69f098a63c Mentioning that you can set the theme to 'random' and it'll possibly bake you a pie. 2015-08-30 21:58:52 -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 ccaaa992c7 Merge pull request #4241 from heartinpiece/master
Check if Zsh is installed prior to installing Oh My Zsh
2015-08-30 21:44:38 -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 a228604e69 Merge pull request #4249 from KrauseFx/patch-1
Use https instead of http
2015-08-30 21:38:33 -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 9bb99e1f7b Merge pull request #4284 from gsklee/patch-1
Update README.markdown
2015-08-30 21:34:14 -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 b3f167d998 Merge pull request #3613 from apjanke/remove-sed-i
Installer: Remove "sed -i" for portability and hygiene
2015-08-30 09:13:04 -07:00