Commit graph

2,519 commits

Author SHA1 Message Date
Gaetan Semet
d9e9109ffa Merge remote-tracking branch 'dlintw/master' 2014-02-18 12:03:56 +01:00
Daniel YC Lin
0493da89a3 Merge branch '2024-list-theme-features' of https://github.com/dlintw/oh-my-zsh into 2024-list-theme-features 2014-02-17 11:45:50 +08:00
Gaetan Semet
071b14b85d don't use aliases in function
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2014-02-14 13:52:14 +01:00
Gaetan Semet
6e01a3852b new cdp alias
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2014-02-14 10:45:04 +01:00
Gaetan Semet
0ea04a6b80 Merge remote-tracking branch 'upstream/master' 2014-02-13 09:20:56 +01:00
Gaetan Semet
105e184612 new git alias: gPum
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2014-02-13 09:20:20 +01:00
Robby Russell
4ce7f0a37f Merge pull request #2515 from nupfel/plugins/iwhois
provides iwhois command to use CNAMES under whois.geek.nz to find most accurate whois server
2014-02-11 19:18:10 -08:00
Robby Russell
2ed99037c1 Merge pull request #2516 from lukesteensen/patch-1
Add 'services' command to homebrew completion
2014-02-11 19:17:05 -08:00
Luke Steensen
0d212bb218 Add 'services' command to homebrew completion 2014-02-11 21:14:02 -06:00
Tobias Kirschstein
0cb2ecff80 provides iwhois command to use CNAMES under whois.geek.nz to find most accurate whois server 2014-02-11 20:05:59 +13:00
Gaetan Semet
5498409f7e Merge remote-tracking branch 'upstream/master' 2014-02-10 11:52:47 +01:00
Gaetan Semet
21b5890ee6 updated readme
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2014-02-10 11:51:54 +01:00
Robby Russell
ec37c05cb3 Merge pull request #2465 from klange/master
change nyancat telnet server
2014-02-03 22:23:46 -08:00
Robby Russell
7a6e2c05af Merge pull request #2342 from blackjid/master
Prevents oh-my-zsh loading the .zshenv twice
2014-02-03 22:23:11 -08:00
Robby Russell
41d9717252 Merge pull request #2402 from bric3/battery_level_gauge
Adds a method that print a battery gauge
2014-02-03 22:22:36 -08:00
Gaetan Semet
e026833132 typo 2014-02-03 14:26:21 +01:00
Gaetan Semet
571f0838d7 restored official git plugin
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2014-02-03 14:26:14 +01:00
Gaetan Semet
644aac2bf5 moved my git plugin to git2
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2014-02-03 14:18:06 +01:00
Gaetan Semet
c38877c19b backslash gitk aliases
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2014-02-03 14:09:01 +01:00
Gaetan Semet
287635e6e1 do not add git alias in aliases.zsh
(this is a modification added by cadusk branch)

Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2014-02-03 14:08:59 +01:00
Gaetan Semet
c9f6076140 Merge remote-tracking branch 'upstream/master' 2014-01-30 15:44:17 +01:00
Gaetan Semet
1279533359 fix gclean (*.BASE.*)
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2014-01-30 15:44:09 +01:00
Gaetan Semet
e4786d1153 new aliases for buildbot
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2014-01-30 15:44:09 +01:00
Robby Russell
df0305aba5 Merge pull request #2368 from lumbric/master
fix name schema for sudo plugin
2014-01-28 16:22:14 -08:00
Kevin Lange
a48fd1e808 Update nyan.plugin.zsh 2014-01-24 10:27:41 -08:00
Kevin Lange
9b3344dd80 change nyancat telnet server
miku.acm.uiuc.edu was decommissioned a while ago; this is a sanctioned mirror
2014-01-23 20:58:23 -08:00
Brice Dutheil
cc8b09366b Adds a method that print a battery gauge
It is especially useful for themes, this function is a port of the code written by Steve Losh
and made available on [this blog entry](http://stevelosh.com/blog/2010/02/my-extravagant-zsh-prompt/#my-right-prompt-battery-capacity)
2014-01-18 13:58:42 +01:00
Gaetan Semet
43da92c071 Merge remote-tracking branch 'upstream/master' 2014-01-18 12:09:59 +01:00
Robby Russell
d485044169 Merge pull request #2389 from driver2000/patch-1
Fix bad right prompt placing.
2014-01-06 20:06:10 -08:00
Robby Russell
a609fd5616 Merge pull request #2398 from phstc/fixes-tmuxinator-plugin-find
Fixes tmuxinator plugin `find` on OSX
2014-01-06 20:03:43 -08:00
Pablo Cantero
4354f91171 Fixes tmuxinator plugin find on OSX 2014-01-03 11:52:33 -02: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
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
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
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