de1f803de9
Merge pull request #1620 from hreese/gpg-agent_with_sensible_ssh-agent
...
Disable ssh-agent support in gpg-agent-plugin if another ssh-agent is already available.
2013-04-23 20:37:48 -07:00
84d9b020c2
Merge pull request #1490 from khrt/master
...
Added support for Subversion 1.7 for SVN plugin
2013-04-23 20:36:59 -07:00
685c746cc7
Merge pull request #1565 from serdardalgic/autoenv-plugin
...
Add autoenv plugin, which adopts using Kenneth Reitz's autoenv.
2013-04-23 20:33:50 -07:00
a2c8db9eb3
Resolving conflict in #1266 merge
2013-04-23 20:30:21 -07:00
7cdb6d667c
Resolving conflict when merging in 1570
2013-04-23 20:21:18 -07:00
d6a36b1756
Merge pull request #1575 from mguindin/agnoster-change
...
[agnoster-theme] modifying theme for dirty/staged files
2013-04-23 20:17:40 -07:00
b61555d7c0
Merge pull request #1582 from To1ne/pushdminus
...
use pushdminus
2013-04-23 20:16:41 -07:00
8fea507b5c
Merge pull request #1608 from swanandp/m_lion_terminal_same_tab_support
...
Mountain Lion Terminal App: Support for opening tabs and windows in the same folder.
2013-04-23 20:04:08 -07:00
de8bcef476
Merge pull request #1622 from hacfi/patch-1
...
Fix Symfony2 command completion 'permission denied'
2013-04-23 20:03:26 -07:00
cb8ccaf3cc
Merge pull request #1634 from Anahkiasen/patch-1
...
Add alias for "composer dump-autoload"
2013-04-23 20:03:10 -07:00
7787d1da6e
Merge pull request #1641 from NeuralSandwich/master
...
Battery plugin updates
2013-04-23 20:01:40 -07:00
1235b77eff
Merge pull request #1702 from mbauhardt/copyfile
...
a plugin (function) which copies the content of a file into the clipboar...
2013-04-23 19:59:51 -07:00
42127bee6d
Merge pull request #1715 from dbohdan/master
...
Fixed a UTF-8 problem in the theme "fishy"
2013-04-23 19:58:59 -07:00
966108a082
Merge pull request #1724 from miry/rails_aliases
...
Added global aliases to use RAILS_ENV.
2013-04-23 19:58:30 -07:00
6daaae6347
Merge pull request #1703 from marcparadise/mp/knife-chef-11-initial-support
...
initial support for chef 11 integrated knife-essentials
2013-04-23 19:56:44 -07:00
73edf1f1eb
Merge pull request #1704 from laggyluke/st3
...
Support for Sublime Text 3
2013-04-23 19:56:26 -07:00
1ae16a20d8
Merge pull request #1718 from toctan/master
...
command-not found support for Arch Linux
2013-04-23 19:55:46 -07:00
2badd62c0e
Merge pull request #1721 from z2v/hgplugin
...
Mercurial: add alias for 'hg bookmarks'
2013-04-23 19:55:30 -07:00
108fe7c933
Merge pull request #1707 from bkg/django-static
...
Add django plugin command
2013-04-23 19:53:50 -07:00
b01a48d056
Merge pull request #1714 from f0y/07738ea86330b7b77127fc6f18474b3da2c6ecec
...
Colorize plugin
2013-04-23 19:53:33 -07:00
51d7d57331
Merge pull request #1719 from MatthR3D/master
...
Improved the archlinux plugin
2013-04-23 19:50:21 -07:00
2a2cc81ea5
Merge pull request #1726 from rkj/master
...
Slightly changed my themes to include return code of last invoked command.
2013-04-23 19:49:12 -07:00
d8b6acd0af
Merge pull request #1728 from szines/patch-1
...
Update rvm.plugin.zsh to the latest ruby versions
2013-04-23 19:48:55 -07:00
b5ead7be01
Merge pull request #1729 from statschner/master
...
Added git-flow-avh plugin
2013-04-23 19:48:15 -07:00
91cb7955cb
Merge pull request #1739 from felipec/fc/gitfast
...
Updates to gifast
2013-04-23 19:46:54 -07:00
e953fcf516
Merge pull request #1749 from johnjohndoe/feature/zeus-auto-completion
...
Add auto-completion for zeus.
2013-04-23 19:46:09 -07:00
81ed18f722
Merge pull request #1733 from jaseg/patch-1
...
The safe-paste plugin now works with tmux, too
2013-04-23 19:45:29 -07:00
78bb69968d
Merge pull request #1734 from cborgia/master
...
simple grammar change in template file
2013-04-23 19:45:15 -07:00
bba45753ca
Merge pull request #1737 from hron84/feature-bundler-add-cleanup
...
Adding undocumented clean command to completion
2013-04-23 19:44:28 -07:00
56b4d4d639
Merge pull request #1738 from ronshapiro/master
...
Battery plugin changes
2013-04-23 19:44:11 -07:00
d8d9da025b
Merge pull request #1748 from tobiassjosten/patch-1
...
Added 'jekyll' to list of bundled commands
2013-04-23 19:43:26 -07:00
30b0eb3ffa
Merge pull request #1740 from felipec/fc/git
...
git: fix parse_git_dirty()
2013-04-23 19:42:58 -07:00
adb86fa83d
Merge pull request #1750 from JamesFerguson/master
...
Make git_remote_branch plugin git-flow friendly
2013-04-23 19:42:33 -07:00
d4d8939410
Only trim remote names; be git-flow friendly
...
- don't remove everything before the last /
- do remove <remote_name>/
- allows flow style feature/foobar branch names
2013-04-24 09:11:52 +10:00
8cd1b21b93
Update rails4.plugin.zsh
...
added alias for rake db:create
2013-04-24 01:40:09 +04:00
d537193f26
Add auto-completion for zeus.
2013-04-23 10:41:58 +02:00
680302c9f6
Added 'jekyll' to list of bundled commands
2013-04-23 09:35:27 +03:00
93ee939383
Merge pull request #1745 from jtheoof/master
...
Added option to allow untracked files as non dirty
2013-04-22 19:08:55 -07:00
5f32c8e155
Merge pull request #1747 from dhemmerling/mvn_tomcat-redeploy
...
mvn plugin was missing "redeploy" completion for tomcat.
2013-04-22 19:07:07 -07:00
785b1c6337
mvn plugin was missing "redeploy" completion for tomcat.
2013-04-22 16:01:09 -07:00
e41714d72c
Added option to allow untracked files as non dirty
...
In this commit, the option only works for git but it should not be to hard for
someone who knows svn to so the same.
This commit is largely inspired by @yoavweiss, I only added an option to use
it.
2013-04-22 10:59:08 +02:00
c944f8b465
gitfast: fix prompt
...
Certain themes need the 'clean' mark, and some people like to have the
'dirty' one, just like the original git_promp_info().
We probably shouldn't be modifying that function, there's no other clean
way to achieve our own status information, so let's try to emulate the
original as much as possible.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com >
2013-04-21 02:57:05 -05:00
72a8c08cc8
gitfast: synchronize with upstream
...
Up to version 1.8.2.1.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com >
2013-04-21 02:57:05 -05:00
d615f64374
git: fix parse_git_dirty()
...
If oh-my-zsh.hide-status is configured, the 'clean' code won't be
generated, and some themes might end up distorted. Let's generate the
'clean' code even when we don't want the show the dirty status.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com >
2013-04-21 02:56:39 -05:00
bc385531b0
Separate the battery_pct_remaining data into it's own function so that it can be obtained even if the battery is connected.
2013-04-20 22:37:36 -04:00
a08f626f1c
Adding undocumented clean command to completion
...
Clean command is undocumented (not included in
bundle help output), however that is very useful,
especially in RVM environment you can clean up
outdated gems in gemset.
2013-04-20 21:40:15 +02:00
52dc3b99f9
Edited Grammar in template file
2013-04-18 16:43:54 -04:00
f2b915c567
The safe-paste plugin now works with tmux, too
2013-04-17 17:08:36 -07:00
7db2b20fc4
Added git-flow-avh plugin.
...
git-flow-avh is a fork of gitflow, see: https://github.com/petervanderdoes/gitflow
2013-04-17 15:07:53 +02:00
0b3d560866
Update rvm.plugin.zsh to the latest ruby versions
...
Ruby version numbers update:
1.8.7-p371
1.9.3-p392
2.0.0-p0
2013-04-17 15:07:11 +02:00
