GitHub Merge Button
c9891bcef0
Merge 093a18a07a into 757fa3314d
2011-10-10 11:15:53 -07:00
Jocelyn Mallon
093a18a07a
Merge branch 'master' of git://github.com/robbyrussell/oh-my-zsh
2011-10-10 11:12:18 -07:00
Robby Russell
757fa3314d
Merge pull request #505 from masnick/master
...
Add new theme (fino.zsh-theme)
2011-10-10 05:50:44 -07:00
Robby Russell
b8ade4815a
Merge pull request #529 from dbb/master
...
Merge 'deb' and 'debian' plugins
2011-10-10 05:48:49 -07:00
Robby Russell
03fc819bee
Merge pull request #552 from Tricon/master
...
Purple Apple Logo Theme
2011-10-10 05:46:08 -07:00
Robby Russell
833c856b84
Merge pull request #579 from hakanensari/bundler-plugin-patch
...
Bundler plugin patch
2011-10-10 05:45:19 -07:00
Robby Russell
dfc7319491
Merge pull request #594 from sirech/fix-bundle-compl
...
Fix completion for bundled commands using the bundler plugin
2011-10-10 05:44:26 -07:00
Robby Russell
cceb387e0b
Merge pull request #595 from zachriggle/grails-plugin
...
Grails plugin
2011-10-10 05:42:56 -07:00
Robby Russell
0fe2462af8
Merge pull request #554 from toolbear/549-fix-auto-upgrade
...
Fix auto upgrade failure from non-exported ZSH env var
2011-10-10 05:40:38 -07:00
Robby Russell
167f84dacd
Merge pull request #607 from vddgil/patch-1
...
Textmate plugin update to take Gemfile and cucumber features in account
2011-10-10 05:40:01 -07:00
Robby Russell
c5e6dbf76b
Merge pull request #613 from rkj/master
...
Please merge my theme.
2011-10-10 05:39:35 -07:00
Robby Russell
15d7a4c225
Merge pull request #614 from philippbosch/feature/terminitor-plugin
...
terminitor plugin
2011-10-10 05:38:57 -07:00
Robby Russell
85fd141ff9
Merge pull request #622 from foozmeat/master
...
This is the correct way to check the return value
2011-10-10 05:36:39 -07:00
Robby Russell
ebd0523a4a
Merge pull request #626 from nickstenning/upstream
...
Better cake completion
2011-10-10 05:36:23 -07:00
Robby Russell
72adfb6cc7
Merge pull request #631 from danshearmur/git-merge-alias
...
added git merge as gm
2011-10-10 05:35:16 -07:00
Robby Russell
57f04b921e
Merge pull request #645 from mr-szymanski/master
...
Add "wuffers" theme
2011-10-10 05:33:55 -07:00
Robby Russell
1228638b41
Merge pull request #648 from SFEley/d926a55872b5a12ab8b987e9d86c02358d0c825e
...
New theme - Crunch
2011-10-10 05:33:12 -07:00
Robby Russell
26b20e21e1
Merge pull request #418 from ptrv/master
...
Added Mercurial plugin
2011-10-10 05:31:54 -07:00
Robby Russell
11a0c33323
Merge pull request #441 from Gonzih/master
...
Create gnzh theme and vundle plugin
2011-10-10 05:30:55 -07:00
Robby Russell
cc82ac1ed6
Merge pull request #273 from blueyed/hub-alias-only-with-ruby
...
Minor fix for the github plugin: check for `ruby`.
2011-10-10 05:27:33 -07:00
Robby Russell
490177d48b
Merge pull request #225 from Soliah/plugin-bundler
...
Add tab completion to bundler plugin
2011-10-10 05:26:28 -07:00
Robby Russell
7b6b6f1d92
Merge pull request #205 from sorin-ionescu/plugin-gnu-utils
...
gnu-utils plugin
2011-10-10 05:24:38 -07:00
Robby Russell
84c20ce6dd
Merge pull request #482 from volpino/master
...
Theme chooser + fox's theme
2011-10-10 05:17:21 -07:00
Robby Russell
e91e384497
Merge pull request #428 from matthewmccullough/gradleplugin
...
Added a gradle build tool plugin
2011-10-10 05:12:43 -07:00
Robby Russell
e59a9cbbaa
Merge pull request #338 from norm2782/master
...
Added my norm theme to oh-my-zsh
2011-10-10 05:10:27 -07:00
Robby Russell
6cc4389304
Merge pull request #319 from sorin-ionescu/plugin-npm
...
Replace npm 0.x completion with 1.0 completion.
2011-10-10 05:10:03 -07:00
Robby Russell
1ab0054dc6
Merge pull request #275 from tristan0x/require_tool
...
New script $ZSH/tools/require_tool.sh to ensure version of tool
2011-10-10 05:08:38 -07:00
Robby Russell
6e8c0c178d
Merge pull request #274 from diofeher/master
...
A python plugin
2011-10-10 05:07:35 -07:00
Robby Russell
14bb3105d3
Merge pull request #525 from kibs/master
...
Option for setting a different path to your custom files and plugins.
2011-10-10 04:57:57 -07:00
Jocelyn Mallon
59e2f43237
Added battery charge gauge from: http://stevelosh.com/blog/2010/02/my-extravagant-zsh-prompt/ to themes
...
Battery gauge requires a python script, 'battcharge.py' added to $ZSH/lib/ directory to work properly.
Cleaned up zshmarks again, now uses proper return codes in case bookmark not found, etc.
2011-10-08 13:06:09 -07:00
Jocelyn Mallon
2dc12882af
Just still tweaking my new themes/prompts, cleaning up color consistency, etc.
2011-10-07 13:54:56 -07:00
Jocelyn Mallon
caf35710b5
Fixed all variations of new prompt theme to obey re-enable oh-my-zsh auto-title support. Themes will obey the global DISABLE_AUTO_TITLE="true" setting in .zshrc file now too
...
Plus minor tweaking to the color schemes, jocelyn_new2 = white lineart, jocelyn_new3 = blue lineart
2011-10-06 19:12:43 -07:00
Jocelyn Mallon
ea1cf305fe
added a couple new color variations on my new prompt theme. also switched to proper 'unset' syntax in zshmarks, instead of destroying variable by setting to null string
2011-10-05 23:07:06 -07:00
Jocelyn Mallon
279af3301c
Still tweaking new theme, added a really hack-ish method of colorizing command/input text, had to remove right prompt for this to work, and also moved exit codes >0 to the left of git prompt info.
2011-10-05 17:55:35 -07:00
Jocelyn Mallon
b39fa51746
quick update to new theme to 'bold' the git status symbols
2011-10-05 16:33:34 -07:00
Jocelyn Mallon
cd8af85db3
Added another custom theme, based on theme information from: http://aperiodic.net/phil/prompt/
2011-10-05 16:33:01 -07:00
Jocelyn Mallon
858da593a9
revert green color for stdin in prompt
2011-10-04 20:35:56 -07:00
Jocelyn Mallon
06a077e570
slight tweaks to prompt/theme, and modified alias file to add a few new directory (ls) command options
2011-10-04 19:52:05 -07:00
Mark Szymanski
c373c7153b
Fix up some wonkiness
2011-10-04 21:30:32 -05:00
Mark Szymanski
40cc4dabfb
Add new theme: wuffers
2011-10-04 21:27:36 -05:00
Jocelyn Mallon
c103b091d4
name change to 'zshmarks' to better represent that this comes from 'bash marks'
...
added a new function to manually edit the ~/.bookmarks file, using whatever $EDITOR the use has registered
2011-10-03 19:25:26 -07:00
Jocelyn Mallon
820a027d47
bash marks port to zsh, with completion and my own personal theme
2011-10-03 16:48:28 -07:00
Dan Shearmur
c1c7b0e4af
added git merge as gm
2011-09-26 14:44:42 +01:00
Nick Stenning
8287cc177e
Better cake completion: don't barf on options, and don't clobber user's namespace
2011-09-24 17:22:20 +01:00
James Moore
b2703a3c8a
This is the correct way to check the return value
2011-09-23 10:51:20 -07:00
James Moore
c2d0cdd533
This needs to explicitly check the return value
2011-09-23 10:18:09 -07:00
Roman Kamyk
d22b253ce2
split rkj into two themes.
2011-09-20 10:18:17 +02:00
Philipp Bosch
0d285e3a0f
terminitor plugin: add autocompletion also for edit, delete and setup subcommands.
2011-09-15 15:39:10 +02:00
Philipp Bosch
47d0735b5f
terminitor plugin: add autocompletion for start subcommand.
2011-09-15 15:39:10 +02:00
Philipp Bosch
1ad8fde027
Add basic autocompletion for terminitor ( https://github.com/achiu/terminitor ).
2011-09-15 15:39:10 +02:00