Commit graph

2667 commits

Author SHA1 Message Date
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
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
Robby Russell
178bce287e Merge branch 'master' of github.com:robbyrussell/oh-my-zsh 2012-12-04 08:27:13 -08:00
Robby Russell
0118b5b759 Merge pull request #1248 from grahamc/add-symfony
Adding a symfony plugin, for symfony 1
2012-12-04 06:56:59 -08:00
Robby Russell
78e3f38db7 Merge pull request #1258 from caio/git-branch-status
Add branch status support to git_prompt_status
2012-12-04 06:56:43 -08:00
Robby Russell
d100354d0d Merge pull request #778 from rschmukler/plugin-osx
Added vsplit_tab and split_tab for iTerm.
2012-12-04 06:55:25 -08:00
Robby Russell
462136a9d6 Merge pull request #794 from markdrago/cloud_parameter
add ability to set custom prefix for cloud theme
2012-12-04 06:52:32 -08:00
Robby Russell
5aed0aed4e Merge pull request #875 from ttddyy/prompt_git-remove
prompt git-rm as deleted
2012-12-04 06:45:17 -08:00
Robby Russell
d88fad3392 Merge pull request #880 from darrenclark/fix-mac-terminal-app-echo-issue
Fixed Mac OS X Terminal.app related issue with extra newlines echoed
2012-12-04 06:45:01 -08:00
Robby Russell
24188fda80 Merge pull request #1181 from paulmars/master
Plugin for git_remote_branch autocomplete.
2012-12-04 06:39:49 -08:00
Robby Russell
dbeb74ece8 Merge pull request #1189 from petemounce/yum-quote
Fix mismatched quote in yum plugin
2012-12-04 06:38:41 -08:00
Robby Russell
5f41ecd7b8 Merge pull request #1186 from r-darwish/history
Added history plugin
2012-12-04 06:38:28 -08:00
Robby Russell
bd9a86051f Merge pull request #1247 from drnic/git-cmds
Added 'gcl'for 'git config --list'; and gd for 'git diff'
2012-12-04 06:37:18 -08:00
Robby Russell
421a738b49 Merge pull request #1273 from ystein/master
Typo in cd-wrapper
2012-12-04 06:36:45 -08:00
Robby Russell
63deae380c Merge branch 'master' of github.com:robbyrussell/oh-my-zsh 2012-12-04 06:36:08 -08:00
Robby Russell
868a5138f6 Resolving conflict in merge of #1313 2012-12-04 06:35:59 -08:00
Robby Russell
3199d2ed8d Merge pull request #1387 from jimhester/vi-mode-patch
Fixes for vi-mode terminal overwriting bugs
2012-12-04 06:34:02 -08:00
Robby Russell
43ca5d8cbe Merge pull request #1458 from ranman/master
lazyload virtualenvwrapper
2012-12-04 06:33:41 -08:00
Robby Russell
9ae128983a Merge pull request #1454 from gAmUssA/patch-4
Update plugins/sublime/sublime.plugin.zsh
2012-12-04 06:33:13 -08:00
Robby Russell
b204ce8f67 Merge pull request #1462 from aliasbind/master
Add last command's 'exit status' display to mortalscumbag theme
2012-12-03 07:26:25 -08:00
Robby Russell
26b3e1015d Merge pull request #1460 from tresni/patch-4
urltools for everyone
2012-12-03 07:25:51 -08:00
Robby Russell
2f0717cb76 Merge pull request #1459 from tresni/patch-3
Backwards Compatible Jira URLs #1378
2012-12-03 07:25:35 -08:00
Robby Russell
1ad2104d7a Merge pull request #1463 from syphar/fix_last_working_dir
plugin last-working-dir: create cache-directory if it doesn't exist
2012-12-03 07:25:08 -08:00
Andrei Gorgan
8925cff334 Fix prompt color: Change it back to green 2012-12-03 12:29:45 +02:00
Denis Cornehl
98bd19a036 plugin last-working-dir: create cache-directory if it doesn't exist 2012-12-03 11:13:13 +01:00
Andrei Gorgan
e096e4041f Print last exit status in mortalscumbag prompt 2012-12-03 12:03:43 +02:00
Brian Hartvigsen
80f151e56d urltools for Everyone
#1445 is great, if you use node.  For those that don't this should mean we can find a reasonable fallback.
Users can force urltools to use a specific system by setting `URLTOOLS_METHOD` to one of:
* `node`
* `python`
* `ruby`
* `php`
* `perl`

Note that you can't (currently) choose which `perl` sublibrary to use, it will use either `URI::Encode`, `URI::Escape`, or regular expressions in that order of preference.
2012-12-02 23:06:11 -07:00
Brian Hartvigsen
39e5c9a6d7 Backwards Compatible Jira URLs #1378
Adds support for Rapid Board without breaking backwards compatibility (like #1378)
Allows JIRA url to be set in .zshrc, current directory, and/or home directory.
2012-12-02 22:59:05 -07:00
J. Randall Hunt
b9d5a39098 use lazy load for virtualenvwrapper
Using lazy loading for virtualenvwrapper gives a mariginal speed
improvement and doesn't stop workon_cd from working. It has the
undesired effect of forcing you to call certain virtualenv commands
twice before they work (only once per shell instantiation).
2012-12-02 16:40:40 -05:00
Lucas Sampaio
51e05b7579 hg_current_branch added to mercurial plugin 2012-12-02 13:11:55 -08:00
Robby Russell
5193a1dbc9 Merge branch 'master' of github.com:robbyrussell/oh-my-zsh 2012-12-02 13:11:02 -08:00
Robby Russell
f8343b0fd9 Merge pull request #1457 from NeuralSandwich/master
Battery plugin: Fixed Kernel type detection
2012-12-02 13:08:30 -08:00
Robby Russell
13998bb2cc Merge branch 'master' of github.com:robbyrussell/oh-my-zsh 2012-12-02 13:08:12 -08:00
Probably Not
dfbafe6d58 Fixing conflict in install scripts 2012-12-02 13:08:06 -08:00
Robby Russell
fcc8b19253 Merge pull request #1328 from mfoo/master
Fix autojump plugin error on Linux with manual installation of autojump
2012-12-02 13:05:28 -08:00
Robby Russell
228c3fc89f Merge pull request #1301 from bencao/master
fix rvm plugin auto complete not work problem
2012-12-02 13:04:14 -08:00
Robby Russell
ef4e2aa26d Merge pull request #1293 from cenkalti/master
Look virtualenvwrapper plugin in PATH
2012-12-02 13:03:28 -08:00
Robby Russell
fdf3a3998f Merge pull request #1295 from XL64/master
Fixed johnathan-zsh.theme if rbenv doesn't exists
2012-12-02 13:02:38 -08:00