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
Robby Russell
1f284071de
Merge pull request #1298 from nickhutchinson/fishy
...
Update fishy theme to collapse working directory in PROMPT
2012-12-02 13:02:22 -08:00
Robby Russell
ce20cba7e3
Merge pull request #1382 from fushunpoon/master
...
Unroll for-loops in .oh-my-zsh so that running zsh-5.0.0 on Terminal.app on Snow Leopard will work.
2012-12-02 12:58:50 -08:00
Robby Russell
d19e01b140
Merge pull request #1191 from r-darwish/themes-plugin
...
Themes plugin
2012-12-02 12:50:40 -08:00
Robby Russell
275e7cba8f
Merge pull request #1235 from henryyan/master
...
Improved maven plugin added a lot of auto complection, add git-extras plugin
2012-12-02 12:48:45 -08:00
Robby Russell
4cad0a48fd
Merge pull request #1241 from agrimaldi/git-extras
...
plugin for git-extras
2012-12-02 12:46:30 -08:00
Robby Russell
127a47b2bd
Merge pull request #1249 from korjavin/aptitude
...
alias at=aptitude broke /usr/bin/at scheduler.
2012-12-02 12:45:03 -08:00
Robby Russell
aa382b572e
Merge pull request #1255 from SuprDewd/master
...
Added a "please" alias for sudo
2012-12-02 12:44:17 -08:00
Robby Russell
e89f950985
Merge pull request #1256 from seegno/master
...
Added sf Symfony2 binary alias
2012-12-02 12:43:59 -08:00
Robby Russell
96f35e6949
Merge pull request #1259 from bwl/sublime-fix
...
Adding logic for ~/Applications folder installs of Sublime Text 2
2012-12-02 12:43:07 -08:00
Robby Russell
9977afc0b5
Merge pull request #1263 from tedv/headless-git
...
Make git use sha when branch name is missing.
2012-12-02 12:42:38 -08:00
Robby Russell
2e5a689c05
Merge pull request #1265 from aletessier/ssh-completion
...
Fix ssh plugin completion
2012-12-02 12:42:08 -08:00
Robby Russell
ac90eed387
Merge pull request #1274 from sc68cal/feature/git_decorate_log
...
[Git Plugin] Add shortcut for showing log of all branches
2012-12-02 12:39:55 -08:00
Robby Russell
215d6da3de
Merge pull request #1277 from waveface/master
...
git flow completion enhancement
2012-12-02 12:39:41 -08:00
Robby Russell
44edb3ed60
Merge pull request #1278 from bitboxer/forklift
...
new forklift plugin
2012-12-02 12:39:23 -08:00
Sean Jones
5991bf3ac1
Fixed Kernel Detection in battery plugin
2012-12-02 20:39:01 +00:00
Robby Russell
f28041e41f
Merge pull request #1284 from obmarg/feature/debianwhichfix
...
Debian plugin now pipes which stderr to stdout
2012-12-02 12:38:56 -08:00
Robby Russell
66df0f8089
Merge pull request #1317 from thcipriani/junkfood_theme
...
Added junkfood theme
2012-12-02 12:36:32 -08:00
Robby Russell
245eee128b
Merge pull request #1319 from skatkov/master
...
Replace cp -verbose with rsync
2012-12-02 12:35:20 -08:00
Robby Russell
93f41fc5fc
Merge branch 'master' of github.com:robbyrussell/oh-my-zsh
2012-12-02 12:30:51 -08:00
Trae Robrock
fe094712fb
resolving conflict in termsupport plugin
2012-12-02 12:30:46 -08:00
Robby Russell
04d08577e2
Merge pull request #1336 from aelesbao/plugin-systemd
...
systemd plugin
2012-12-02 12:27:36 -08:00
Robby Russell
b2b77be56f
Merge pull request #1341 from markusscherer/master
...
fix title setting bug in xterm and urxvt
2012-12-02 12:27:04 -08:00
Robby Russell
e10552b403
Merge pull request #1354 from F30/master
...
Set the '-R' option for less not in $PAGER, but as $LESS
2012-12-02 12:26:41 -08:00
Robby Russell
5ed75de5ce
Merge pull request #1353 from a-b/master
...
Prompt symbol update
2012-12-02 12:26:12 -08:00
Robby Russell
7004ac9ec4
Merge pull request #1371 from rdrey/master
...
Fixed node-docs
2012-12-02 12:25:02 -08:00
Robby Russell
d5eddc653f
Merge pull request #1376 from javageek/master
...
Updated code
2012-12-02 12:22:19 -08:00
