Commit graph

1,485 commits

Author SHA1 Message Date
Sean Jones
5bcf6c9b1e Merge fc6f3fc603 into fce68bbba0 2013-02-21 23:58:42 -08:00
Robby Russell
fce68bbba0 Merge pull request #1594 from jbhannah/rbenv-gems-fix
Fix rbenv gems helper
2013-02-09 11:55:30 -08:00
Robby Russell
1a362c11a8 Merge pull request #1583 from To1ne/pj.plugin
added pj.plugin
2013-02-09 11:55:03 -08:00
Jesse B. Hannah
dace87ae36 Fix rbenv gems helper
Fixes gem versions with words (beta, pre) in the version or with
multiple installed versions not being highlighted, and compatibility
with GNU sed (related to robbyrussell/oh-my-zsh#1579).
2013-02-08 19:11:40 -07:00
Robby Russell
6e6cf43037 Merge pull request #1586 from HeroicEric/master
add rspec alias to zeus plugin
2013-02-07 19:30:03 -08:00
Eric Kelly
a5a6f6bb6c add alias for rspec to zeus plugin 2013-02-07 16:26:41 -05:00
Toon Claes
631a8473e2 added pj.plugin 2013-02-05 09:45:00 +01:00
Sean Jones
fc6f3fc603 Removed Mercurial prompt info from theme 2013-01-29 12:05:05 +00:00
Sean Jones
555b094403 Updated installer to use my github 2013-01-29 12:02:25 +00:00
Sean Jones
feb578881f Changed links for installer to My github 2013-01-29 11:52:54 +00:00
Sean Jones
4efd990ff1 Added the inifinite symbol 2013-01-29 11:40:12 +00:00
Sean Jones
b0b8455638 Update plugins/battery/battery.plugin.zsh
Edited Linux portion of script to update after each command.
2013-01-29 11:22:40 +00:00
Sean Jones
9da9b2d468 Merge branch 'master' of git://github.com/robbyrussell/oh-my-zsh 2013-01-21 20:08:29 +00:00
Robby Russell
615e41b0ec Adding MIT-LICENSE Closes #655 2013-01-15 06:45:27 -08:00
Robby Russell
cf03ee6d88 Merge pull request #1534 from gberenfield/master
Tested fix for Issue #1479
2013-01-10 22:39:37 -08:00
Robby Russell
312da3ea05 Merge pull request #941 from dcreager/configurable-blinks-theme
blinks theme works with light and dark Solarized
2013-01-10 22:37:25 -08:00
Robby Russell
9ef7e8a191 Merge pull request #1077 from Mezzle/add-option-to-show-git-status
Add option to disable status notification
2013-01-10 22:36:16 -08:00
Robby Russell
a634d50645 Merge pull request #1054 from ptillemans/master
Updated subcommands for leiningen plugin
2013-01-10 22:34:23 -08:00
Robby Russell
64db7b56f2 Merge pull request #1164 from fuksito/master
More usable aliases
2013-01-10 22:33:47 -08:00
Robby Russell
ae7bce34fd Merge pull request #837 from stacksmashing/master
Fix sprunge-plugin behaviour.
2013-01-10 22:32:26 -08:00
Greg Berenfield
93c90a6bf5 Fix the fix for Issue #1479 2013-01-02 19:14:57 -05:00
Greg Berenfield
003dd8f4b6 fix for Issue 1479 2013-01-02 16:20:22 -05:00
Peter Tillemans
587832f155 Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh 2013-01-02 09:42:14 +01:00
Robby Russell
80a6032596 Merge pull request #1510 from agnoster/agnoster-classic
agnoster "classic"
2012-12-31 05:27:46 -08:00
Robby Russell
07c19b66d3 Merge pull request #1517 from thisiskun/master
provide the unbundled commands
2012-12-31 05:26:40 -08:00
Robby Russell
c5ecb4e136 Fixes #1489
Revert "Fixed Mac OS X Terminal.app related issue with extra newlines being printed out sometimes"

This reverts commit 8f89d4d5a5.
2012-12-31 05:25:07 -08:00
thisiskun
a09cd713b4 add unbundled command 2012-12-24 17:27:23 +08:00
Isaac Wolkerstorfer
e4624c6a36 Revert "agnoster theme shows error code instead of an "x""
This reverts commit f09af57179.

It is far more aesthetically pleasing, and conveys the correct amount of information. The exact numeric status code is extremely rarely of use, and increases cognitive parsing burden on the user.
(cherry picked from commit 8f664edcaf55adcc540f0fe43d4205b66e4f9fb6)
2012-12-21 11:45:57 -05:00
Sean Jones
e288ef7056 Merge branch 'master' of git://github.com/robbyrussell/oh-my-zsh 2012-12-14 23:05:20 +00:00
Robby Russell
397c085a19 Merge pull request #1473 from bsteuber/fix-git-flow-feature-completion
use feature names instead of failing branch names in "git flow feature"
2012-12-09 09:04:02 -08:00
Robby Russell
bc7157ba75 Merge pull request #1475 from westonplatter/master
fixes #1474 add zeus to bundle exec list
2012-12-09 09:03:32 -08:00
Robby Russell
d8162cdded Merge pull request #1477 from madsgraphics/git_prompt_showstashstate
Add Stash toogle to display if there's some stash or not in `git_prompt_status`
2012-12-09 09:03:02 -08:00
MAD
b9a989fea5 Add Stash toogle to display if there's some stash or not in git_prompt_status 2012-12-07 10:25:02 +01:00
Weston Platter
f3fea45dd2 fixes #1474 add zeus to bundle exec listx 2012-12-06 18:30:15 -06:00
Benjamin Teuber
1b91c84d2b use feature names instead of failing branch names in "git flow feature" 2012-12-06 14:09:09 +01:00
Sean Jones
d83c6116f5 Added check for zsh installation (@TomDiddle commit:f80b2727) 2012-12-05 16:45:54 +00:00
Sean Jones
056ec42bbe Merge branch 'master' of github.com:NeuralSandwich/oh-my-zsh 2012-12-05 16:43:59 +00:00
Sean Jones
9f12eeded6 Merge branch 'master' of git://github.com/robbyrussell/oh-my-zsh 2012-12-05 16:43:06 +00:00
Robby Russell
6d7a275972 Merge pull request #1084 from avit/bwana-plugin
Bwana plugin for reading man pages in the browser
2012-12-05 07:21:33 -08:00
Robby Russell
046fc5a1d8 Merge pull request #1133 from mappleconfusers/605ad8725b06cc15f8523404f59060b6a71bb7a2
Cat alias: :3
2012-12-05 07:19:18 -08:00
Robby Russell
083da66c0b Merge pull request #1139 from mappleconfusers/pull_req_git
Add aliases for git-remote
2012-12-05 07:16:36 -08:00
Robby Russell
ed5d2fff1f Merge pull request #1233 from mugenken/knife-check-cwd
check for knife.rb in cwd
2012-12-05 07:15:34 -08:00
Robby Russell
dc2558c52d Merge pull request #1467 from timothyandrew/patch-1
Added a `migrate` alias.
2012-12-05 07:14:29 -08:00
Robby Russell
4154eccb31 Merge pull request #1468 from larrylv/unset-config-file-variable
Unset `config_file` variable in oh-my-zsh.sh
2012-12-05 07:14:13 -08:00
Larry Lv
6c5e63022d Unset config_file variable in oh-my-zsh.sh
`config_file` variable will mess up with `cd` auto-complete command.

eg. I have a local dir named `Code`, and when I type `cd co<Tab>`,
config_file will show up, and doesn't make any sense...
2012-12-05 16:13:53 +08:00
Timothy Andrew
f7fc164377 Added a migrate alias.
It migrates the DB and prepares the test DB.
2012-12-05 08:21:42 +05:30
Sean Jones
7a0be72ecf Changed URLs back to officals 2012-12-05 00:52:09 +00:00
Sean Jones
95d90d3134 Merge remote-tracking branch 'upstream/master' 2012-12-05 00:50:16 +00:00
Sean Jones
45b13a2215 Working install on Debian 2012-12-05 00:41:27 +00:00
Sean Jones
a3f56be2b4 Changed URLs to work from my fork 2012-12-05 00:22:32 +00:00