Commit Graph

3549 Commits

Author SHA1 Message Date
Chris McCuller
e6ccd37b05 Merge master (rebase being super annoying). Fix conflicts 2015-09-21 22:19:15 -04:00
Robby Russell
76a26a2a59 Merge pull request #4372 from afh/pull/emotty_theme
Fix issues with character widths in emotty theme
2015-09-21 18:10:20 -07:00
Alexis Hildebrandt
1a51100d09 Fix issues with character widths in emotty theme 2015-09-20 11:45:30 +02:00
Robby Russell
918d26e7db Merge pull request #3664 from apjanke/installer-portable-colors
installer: Use printf and terminfo for portability
2015-09-19 14:17:15 -07:00
Andrew Janke
6cddf7202b Merge branch 'master' into installer-portable-colors 2015-09-19 15:07:36 -04: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
183026f79c Merge pull request #4316 from bronzdoc/feature/rvm_amuse_theme
Display rvm ruby version
2015-09-19 09:22:49 -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
85f53b008f Merge pull request #4359 from noseglid/patch-1
Use local gradlew
2015-09-19 09:19:36 -07:00
Robby Russell
ff780ba546 Merge pull request #4371 from afh/pull/emotty_theme
Add emotty theme
2015-09-19 09:17:47 -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
51677da85f Merge pull request #4091 from apjanke/agnoster-clarify-powerline
agnoster: Use current Powerline chars everywhere, and clarify behavior
2015-09-19 09:05:57 -07:00
Robby Russell
36884cca36 Merge pull request #4189 from bmdhacks/master
agnoster: speed up git prompt
2015-09-19 09:05:41 -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
3b5300c2b3 Merge pull request #4252 from Fice-T/master
Fix graphical bug in cypher theme when return status is non-zero
2015-09-19 09:02:55 -07:00
Robby Russell
9bd88bb9aa Merge pull request #4251 from mcornella/fix-completion-dots
Fix completion waiting dots function
2015-09-19 09:01:55 -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
576453cdb5 Merge pull request #4173 from sharkySharks/master
Devanagari Om fixed in dogenpunk theme
2015-09-19 09:00:20 -07:00
Robby Russell
bb5bc64e2a Merge pull request #4155 from honnix/fix_color
[theme] Fix color problem of steeef theme
2015-09-19 08:59:49 -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
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
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
adaf89caa8 Merge pull request #4113 from apjanke/gnzh-remove-eval
gnzh theme: fix "eval" and related scope problems.
2015-09-19 08:53:14 -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
1324e6126c Merge pull request #4050 from mbologna/michelebologna_fix_git_prompt
Change to use omz git_prompt* functions
2015-09-19 08:51:37 -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
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
Alexis Hildebrandt
550573bfb8 Add emotty theme 2015-09-19 00:11:41 +02:00