Commit graph

2187 commits

Author SHA1 Message Date
LFDM a6671919ab Fixes _rails_command
Changes precedence of the conditional clause, more recent versions come
first now. Fixes problems when users update their app and still have
the old rails files inside of their file tree.
Closes #2405 - check the discussion there for further info.
2014-01-10 22:52:18 +01:00
Robby Russell e2838f75f0 Merge pull request #2396 from soluwalana/master
Fix WIP false positive
2014-01-02 16:01:28 -08:00
Sam O d60522c7a2 escape dashes 2014-01-02 15:53:34 -08:00
Sam O 827d9dfcb4 Update git.plugin.zsh 2014-01-02 15:48:09 -08:00
Robby Russell a38af27991 Revert "Cancel update if the current user doesn't have write permissions for the oh-my-zsh directory."
This reverts commit 152e1e07e0.
2013-12-18 17:03:33 -08:00
Robby Russell c9e5adb637 Merge pull request #2358 from n-st/master
Cancel update if the current user doesn't have write permissions for the oh-my-zsh directory.
2013-12-18 17:01:01 -08:00
n.st 152e1e07e0 Cancel update if the current user doesn't have write permissions for the oh-my-zsh directory. 2013-12-18 18:27:20 +01:00
Robby Russell 357ab4912b Merge pull request #2316 from BBonifield/master
Making auto-correction off by default.

Okay, I don't feel so strongly these days about this.
2013-12-04 21:02:58 -08:00
Bob Bonifield f082d7a245 Making auto-correction off by default
- Allows for the user to turn on auto-correction using the
$ENABLE_CORRECTION variable
- Adds aliases regardless of variable assignment to aid users that use
setopt to turn correction back on in their zshrc
2013-12-04 20:59:57 -07:00
Robby Russell 8c93142b13 Merge pull request #2303 from petervanderdoes/git-flow-avh
Update git-flow-avh 1.7.0
2013-12-03 12:51:39 -08:00
Robby Russell 6fa64b7199 Merge pull request #2296 from pstadler/master
check_for_upgrade.sh: source ~/.profile only if it exists
2013-12-03 12:51:00 -08:00
Peter van der Does 2ffca06806 Update git-flow-avh 1.7.0 2013-12-03 08:56:18 -05:00
Patrick Stadler 858c515df2 source ~/.profile only if it exists 2013-12-03 09:52:51 +01:00
Robby Russell 4e34588a5b Merge pull request #2208 from onemouth/master
Update git.plugin.zsh
2013-12-03 00:20:36 -08:00
Robby Russell 032ca0d67c Merge pull request #2173 from jeffrey4l/venv
Add support .venv folder as virtual env
2013-12-03 00:19:21 -08:00
Robby Russell 7d1b668f41 Merge pull request #2159 from pungoyal/master
removing a github redirect during install
2013-12-03 00:18:44 -08:00
Robby Russell f0a7adcd3d Merge pull request #2176 from dejanlukan/spectrum
Added the spectrum_bls function, which prints all 256 colors set as the background.
2013-12-03 00:18:17 -08:00
Robby Russell b8c1566835 Merge pull request #2194 from kevinxucs/gitignore-fix
Minor gitignore fix.
2013-12-03 00:16:59 -08:00
Robby Russell 83c18f8553 Merge pull request #2195 from KevinBongart/command_blacklist_for_bundler_plugin
Add command blacklist support to bundler plugin
2013-12-03 00:16:22 -08:00
Robby Russell aed9cff57a Merge pull request #2215 from posva/rand-quote
Update rand-quote plugin
2013-12-03 00:15:24 -08:00
Robby Russell b422b073f1 Merge pull request #2255 from shadyproject/plugin/xcode-support
basic command line xcode functionality
2013-12-03 00:04:00 -08:00
Robby Russell 4be8c51446 Merge pull request #2258 from amilaperera/master
getting the projects name correctly and making compdef to work with mux ...
2013-12-03 00:03:34 -08:00
Robby Russell b764fad271 Merge pull request #2262 from mfaerevaag/master
Fixed and improved wd plugin
2013-12-03 00:02:47 -08:00
Robby Russell cd219f70a4 Merge pull request #1520 from prooftechnique/master
add symbol in darcs repos to match git and mercurial (smt theme)
2013-12-02 23:55:46 -08:00
Robby Russell f974fa31dc Merge pull request #1574 from adben/master
updated theme adben
2013-12-02 23:55:25 -08:00
Robby Russell a762b3e85b Merge pull request #1683 from mnme/master
replace hostname -s with hostname in ys theme for compatibility
2013-12-02 23:54:12 -08:00
Robby Russell 0d352109e9 Merge pull request #1087 from avit/install-template
Add configuration placeholders to installer template
2013-12-02 23:49:00 -08:00
Robby Russell de35b55141 Merge pull request #1136 from koraa/pull_req_fastfile
On-the-fly creation and usage for file/dir shortcuts
2013-12-02 23:47:40 -08:00
Robby Russell 4bb8bd8007 Merge pull request #1135 from koraa/pull_req_sinchar
Singel character aliases (and combinations) for grep, wegt, cat, pagers, xargs, sudo and more
2013-12-02 23:47:30 -08:00
Robby Russell 1dd9c43e12 Merge pull request #1134 from koraa/pull_req_helpers
Helpers for default variables and alias value access
2013-12-02 23:47:21 -08:00
Robby Russell c9dd778ec0 Merge pull request #1201 from koraa/pull_req_debian
Fix Debian Plugin Auto Completion
2013-12-02 23:46:32 -08:00
Robby Russell 5a32796fc5 Merge pull request #2088 from Stibbons/gsemet_push_pep_pylint_completion
Completion for python, pep8, autopep8 and pylint
2013-12-02 23:45:35 -08:00
Robby Russell 19ce09c008 Merge pull request #2086 from Stibbons/gsemet_push_repo
New aliases for repo plugin
2013-12-02 23:44:55 -08:00
Robby Russell f48d6759e6 Merge pull request #1883 from Stibbons/gsemet_push_source_profile_for_upgrade
source ~/.profile for upgrading (to source the proxy configuration)
2013-12-02 23:43:43 -08:00
Robby Russell bc79f61901 Merge pull request #1866 from Stibbons/gsemet_push_common_aliases
New plugin 'common-aliases' for optional cutting edge zsh aliases
2013-12-02 23:42:46 -08:00
Robby Russell 7c3665bd2e Merge pull request #2003 from dongweiming/update-gem
Update gem completion
2013-12-02 23:41:31 -08:00
Robby Russell c0a6f8a8a2 Merge pull request #1950 from dongweiming/add-systemadmin-plugin
Add a plugin for systemadmin ops and developer
2013-12-02 23:41:09 -08:00
Robby Russell 573830ba37 Merge pull request #1947 from dongweiming/add-sudo
Add sudo plugin
2013-12-02 23:40:12 -08:00
Robby Russell 2f3bddccfb Merge pull request #1931 from dongweiming/update-urltools
Add shell built method
2013-12-02 23:39:26 -08:00
Robby Russell 027c9ee4cd Merge pull request #1942 from dongweiming/update-powify
Update powify for displayed parameter is not enough, and when there is no directory error
2013-12-02 23:39:06 -08:00
Robby Russell b93f3b9f5a Merge pull request #1940 from dongweiming/update-supervisor
Add version option
2013-12-02 23:38:45 -08:00
Robby Russell 44c7fd976b Merge pull request #1928 from dongweiming/add-hist-stamp
Add option for show in the command execution time stamp in the history
2013-12-02 23:38:26 -08:00
Robby Russell f574849c0a Merge pull request #1927 from dongweiming/modify
Modify determine the oh-my-zsh installed in non-default path of the installed
2013-12-02 23:37:49 -08:00
Robby Russell 533e31f2cc Merge pull request #1956 from emesix/patch-1
Update jonathan.zsh-theme
2013-12-02 23:32:56 -08:00
Robby Russell 3ff772d68b Merge pull request #2022 from Zhann/master
Updates Zhann theme
2013-12-02 23:30:25 -08:00
Robby Russell bbadcf77e3 Merge pull request #2034 from kasperisager/master
Add Pure theme
2013-12-02 23:27:45 -08:00
Robby Russell b38db4a2d2 Merge pull request #2097 from natecox/master
Added virtualenv plugin data to af-magic theme.
2013-12-02 23:26:03 -08:00
Robby Russell b6f4a887ac Merge pull request #2131 from stevschmid/patch-1
Fix gallois theme
2013-12-02 23:24:01 -08:00
Robby Russell 4fc0806123 Merge pull request #1030 from solnic/master
[themes/josh] Use $(current_branch) in prompt
2013-12-02 23:21:41 -08:00
Robby Russell 7a6caf679a Merge pull request #950 from sonicradish/master
sonicradish - 256 color oh-my-zsh theme [dark/solarized]
2013-12-02 23:19:10 -08:00