Commit graph

2,676 commits

Author SHA1 Message Date
Gaetan Semet
ad426a6579 Merge remote-tracking branch 'cadusk/master'
Conflicts:
	templates/zshrc-mac.zsh
2014-01-02 10:46:36 +01:00
Daniele
3e5e2d45e9 Fix bad right prompt placing. 2013-12-31 12:41:28 +01:00
LFDM
c6aacf611d Refactors ruby_prompts.zsh 2013-12-31 02:45:09 +01:00
LFDM
8a887c5052 Joins ruby prompt files and adds ruby_prompt_info. 2013-12-31 02:11:02 +01:00
LFDM
7aa766168c Adds chruby_prompt_info dummy function. 2013-12-31 01:44:51 +01:00
LFDM
ae6ded5ad7 Returns false when rbenv is not found. 2013-12-31 01:15:35 +01:00
LFDM
468b24a8d5 Returns false when rvm is not found. 2013-12-31 01:06:14 +01:00
LFDM
bbbff94cca Fixes rvm_prompt_info() in lib/rvm.zsh 2013-12-31 00:35:57 +01:00
Konstantin Haase
f6bb74e452 add chruby info to gallois theme 2013-12-27 14:25:06 +01:00
Carlos Cardoso
abb50b956a Merge remote-tracking branch 'origin/master'
* origin/master:
  Added appengine to path for linux.
2013-12-21 23:15:40 -02:00
Carlos Cardoso
00b58b872a Updated linux template. 2013-12-21 23:15:29 -02:00
Carlos Cardoso
506ddcf190 Updated zshrc template for mac 2013-12-21 23:12:27 -02:00
lumbric
b58b996b40 fix name schema for sudo plugin
Plugin won't load automatically if added to variable $plugins, if name schema different than $name/$name.plugin.zsh is used (see is_plugin() in oh-my-zsh.sh).
2013-12-21 19:49:44 +01:00
chuancong
e41b6acd2a Add support to command "show" 2013-12-19 11:24:38 -08:00
Gaetan Semet
2a0ecb9baf Merge remote-tracking branch 'upstream/master' 2013-12-19 17:28:00 +01:00
Gaetan Semet
4ab34ba94c Merge remote-tracking branch 'cadusk/master'
Conflicts:
	README.textile
	lib/aliases.zsh
	templates/zshrc-linux.zsh
	templates/zshrc-mac.zsh
	templates/zshrc.zsh-template
2013-12-19 17:27:55 +01:00
Gaetan Semet
4bd8bf4d7f new alias: apt get update saguagu
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2013-12-19 17:25:02 +01:00
Gaetan Semet
f0f805d455 better bb_ function
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2013-12-19 17:24:41 +01: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
Carlos Cardoso
41b9bac3ec Added appengine to path for linux. 2013-12-18 12:52:56 -02:00
Carlos Cardoso
7728107eba Merged upstream changes. 2013-12-17 01:31:15 -02:00
Carlos Cardoso
0fb7e54b90 Merged upstream configuration. 2013-12-17 01:26:27 -02:00
Juan Ignacio Donoso
dbdd23d0fa Prevents oh-my-zsh loading the .zshenv twice 2013-12-13 19:05:35 -03:00
Gaetan Semet
f85a067dac rra. and rs. aliases in repo plugin 2013-12-12 12:52:21 +01:00
Gaetan Semet
6604587f5b doc in git plugin
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2013-12-12 12:52:04 +01:00
Gaetan Semet
afc63fd398 git plugin: new alias for gfa + gpr
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2013-12-11 16:01:34 +01:00
Gaetan Semet
e80764134a git plugin: git rewrite history aliases + fix gclean
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2013-12-11 15:59:56 +01:00
Mikhail Nikalyukin
fdfc907052 Add rdmtc alias for rails plugin. 2013-12-11 11:42:11 +02:00
Andy Fleming
c05a28a7d9 typo fix 2013-12-10 00:11:22 +00:00
Eduardo San Martin Morote
44b23ae194 catimg: fix exit without using source
supresses errors from convert whilen converting, as they
are usually just warnings
2013-12-09 22:18:20 +01:00
Eduardo San Martin Morote
349fa15b18 Fixed a dirs bug for catimg 2013-12-09 22:07:19 +01:00
Andy Fleming
cbd63f220d Fix for virtualenv support - fixes #2328, fixes #2297, resolves #2319 2013-12-09 19:38:27 +00:00
Gaetan Semet
4470dc59ec Fix in git plugin
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2013-12-09 11:19:06 +01:00
Gaetan Semet
e7dbded054 Merge remote-tracking branch 'upstream/master' 2013-12-09 10:52:48 +01:00
Gaetan Semet
4d9b06d3bc reworked cactus merge scripts
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2013-12-09 10:52:42 +01:00
Eduardo San Martin Morote
0185d9920b catimg plugin
allow to print an image to the stdout using convert
2013-12-09 08:54:38 +01:00
Foivos
e97811913b Improve comments 2013-12-08 07:16:40 +02:00
Foivos
be6b1b3b8f Improve comments 2013-12-08 07:11:33 +02: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
Gaetan Semet
5c71237045 add gitclean alias
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2013-12-03 18:05:46 +01:00
Peter van der Does
2ffca06806 Update git-flow-avh 1.7.0 2013-12-03 08:56:18 -05:00
Gaetan Semet
4fb40a1f04 fix git checkout master
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2013-12-03 10:25:32 +01:00
Patrick Stadler
858c515df2 source ~/.profile only if it exists 2013-12-03 09:52:51 +01:00
Gaetan Semet
7499bbbf04 reorganised git plugin
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2013-12-03 09:49:51 +01:00
Gaetan Semet
24f2838f0b Merge remote-tracking branch 'upstream/master'
Conflicts:
	README.textile
	lib/aliases.zsh
	plugins/repo/repo.plugin.zsh
	templates/zshrc.zsh-template
	themes/ys.zsh-theme
2013-12-03 09:41:48 +01:00