Commit graph

541 commits

Author SHA1 Message Date
Gaetan Semet
cf1c065d71 Merge remote-tracking branch 'cadusk/master'
Conflicts:
	README.textile
	lib/aliases.zsh
	templates/zshrc-linux.zsh
	templates/zshrc-mac.zsh
	templates/zshrc.zsh-template
2014-10-07 11:53:12 +02:00
Carlos Cardoso
c4520bca74 Merged latest changes from upstream in
* blessed/master:
  Revert "Exit early from git plugin if not in git repo."
  Support dynamically defined Vagrant machines
  Symfony2 plugin autocomplete for app/console and bin/console
  Symfony2 plugin look for files only
  Symfony2 plugin use first console found
  fix missing add-zsh-hook in pygmalion.zsh-theme
  Use $OSTYPE instead of uname to speed things up
  Trust but verify 'scutil' to return ComputerName
2014-10-02 10:09:58 -03:00
Halil Özgür
ba3a026ece Use the library function for ruby prompt
Not everyone uses rvm and the library has already got a function for this.
2014-09-18 15:59:46 +02:00
Adam Poskitt
83e89d0fa3 Update half-life.zsh-theme
Add spaces before bullet-points to more easily distinguish them from one another and the rest of the prompt when using smaller font-sizes and do not add a blank line prior to prompt output; if there's a desire for spacing, one can use their terminal's line-height to achieve this.
2014-09-18 15:56:01 +02:00
Letian Zhang
22ce742aac fix missing add-zsh-hook in pygmalion.zsh-theme
Fix "command not found: add-zsh-hook" since #3053 removes `autoload -U add-zsh-hook`
2014-09-17 14:15:18 +02:00
Halil Özgür
f92249fb7e Use the library function for ruby prompt
Not everyone uses rvm and the library has already got a function for this.
2014-09-17 14:15:18 +02:00
Alex Shadrin
8b31ef2341 Resets the font colour to original 2014-09-17 14:15:17 +02:00
Adam Poskitt
c039771d63 Update half-life.zsh-theme
Add spaces before bullet-points to more easily distinguish them from one another and the rest of the prompt when using smaller font-sizes and do not add a blank line prior to prompt output; if there's a desire for spacing, one can use their terminal's line-height to achieve this.
2014-09-17 14:15:17 +02:00
Robby Russell
a8ef111a79 Merge pull request #3072 from clippit/patch-1
Fix missing add-zsh-hook in pygmalion.zsh-theme
2014-09-03 15:51:50 +02:00
Carlos Cardoso
c95561b79f merged upstream in 2014-09-03 01:15:27 -03:00
Letian Zhang
9c1255d358 fix missing add-zsh-hook in pygmalion.zsh-theme
Fix "command not found: add-zsh-hook" since #3053 removes `autoload -U add-zsh-hook`
2014-09-01 09:49:31 +08:00
Halil Özgür
2b83accbf8 Use the library function for ruby prompt
Not everyone uses rvm and the library has already got a function for this.
2014-09-01 04:14:03 +03:00
Robby Russell
56d9acfbaf Merge pull request #3044 from alexshd/patch-1
Resets the font colour to original
2014-08-31 12:11:05 -07:00
Alex Shadrin
eee7345f1f Resets the font colour to original 2014-08-20 13:57:28 +03:00
Adam Poskitt
fdb30392b1 Update half-life.zsh-theme
Add spaces before bullet-points to more easily distinguish them from one another and the rest of the prompt when using smaller font-sizes and do not add a blank line prior to prompt output; if there's a desire for spacing, one can use their terminal's line-height to achieve this.
2014-08-04 15:10:11 +01:00
Gaetan Semet
cdcda28bca Merge remote-tracking branch 'upstream/master' 2014-07-15 17:47:03 +02:00
Andy Hayden
aa82bd7400 terminal party show exit status with color 2014-07-08 21:51:48 -07:00
Gaetan Semet
ec49ae1a98 Merge remote-tracking branch 'upstream/master'
Conflicts:
	lib/git.zsh
	plugins/common-aliases/common-aliases.plugin.zsh
	plugins/repo/repo.plugin.zsh
	templates/zshrc.zsh-template
2014-07-03 16:18:02 +02:00
Clemens Werther
999bd355f7 fix root mode not working in bureau 2014-06-08 14:04:50 +02:00
Menno Pruijssers
aee8877988 fixed rvm warning 2014-06-08 10:43:26 +02:00
Marc Cornellà
fbf4a78acf Show user prompt in gnzh theme regardless of UID
Fixes #2008.
2014-06-06 11:27:53 +02:00
Gaetan Semet
e82a43b2b4 Merge remote-tracking branch 'ysmood/update_ys_theme' 2014-06-04 14:21:28 +02:00
Yad Smood
041df86ca1 upd: Update ys.zsh-theme 2014-05-29 11:58:19 +08:00
Yuanxuan Wang
6bf7f39345 Steeef theme checks untracked files instead of directories 2014-05-28 11:20:41 +02:00
Carlos Cardoso
ff0650d3f7 updated cadusk theme 2014-05-02 22:26:16 -03:00
Carlos Cardoso
17b6871994 cadusk theme customization 2014-04-28 22:16:14 -03:00
Carlos Cardoso
9e29eb0645 update cadusk theme 2014-04-27 00:41:52 -03:00
Carlos Cardoso
53838bb9d1 theme customization based on avit and sporty_256 2014-04-26 23:29:34 -03:00
Gaetan Semet
316c46767e Merge remote-tracking branch 'upstream/master'
Conflicts:
	tools/install.sh
2014-04-23 14:45:49 +02:00
tcasparro
53323abdb1 Added git mode support for merging, rebasing, and bisecting
<B> Designates Bisecting
>M< Designates Merging
>R> Designates Rebasing
2014-03-26 10:37:56 -07:00
Gaetan Semet
5afa441d66 Merge remote-tracking branch 'upstream/master'
Conflicts:
	templates/zshrc.zsh-template
2014-03-24 11:54:41 +01:00
Robby Russell
ae1a9e25a1 Merge pull request #995 from wting/fix_gnzh_ruby_detection
Fix gnzh theme to detect local rvm installations
2014-03-22 15:40:00 -07:00
Kory Prince
d3babe0d79 Don't show useless '[]' when chruby_prompt_info is empty 2014-03-17 11:02:47 -05:00
Gaetan Semet
4888217c85 Merge remote-tracking branch 'upstream/master'
Conflicts:
	README.textile
	lib/aliases.zsh
	templates/zshrc.zsh-template
	tools/install.sh
2014-03-14 16:50:51 +01:00
Robby Russell
ee21fe9447 Merge pull request #2380 from rkh/chruby-gallois
add chruby info to gallois theme
2014-03-13 16:18:55 -07:00
Robby Russell
8d8df3fd7a Merge pull request #2435 from tompelka/master
Adding commit hash to branch name in my favorit rjk-repos theme.
2014-03-13 16:18:30 -07:00
Robby Russell
d943d23aa0 Merge pull request #2466 from jarus/steeef-virtualenv-fix
Improve virtualenv prompt in steeef theme
2014-03-13 16:18:06 -07:00
Robby Russell
07c2bdf45d Merge pull request #2588 from kerimdzhanov/remote-themes-copyright-info
Remove all copyright information in themes. Closes #2587
2014-03-13 16:15:51 -07:00
Robby Russell
86a272ef81 Merge pull request #2596 from ryanwmarsh/fixing_bureau_scrollback
Fixes #2467 tab completion scrolls back in terminal when using bureau
2014-03-11 07:44:30 -07:00
Ryan Marsh
c3c8cc318d Fixes #2467 tab completion scrolls back in terminal when using bureau theme 2014-03-10 18:36:51 -05:00
Dan Kerimdzhanov
c249c69065 Remove all copyright information in themes. Closes #2587 2014-03-08 23:51:59 +06:00
Robby Russell
e744bf22ca Merge pull request #2479 from mrbfrank/theme-agnoster
theme agnoster: update characters to match latest powerline fonts
2014-03-08 08:39:54 -08:00
Robby Russell
ae9a9b7f70 Merge pull request #2481 from felds/master
highlight the username when root
2014-03-08 08:15:29 -08:00
Robby Russell
2208854597 Cleaning up conflict with merge of #2330 2014-03-08 08:02:23 -08:00
Felds Liscia
4d83da770a highlight the username when root 2014-01-30 15:15:57 -02:00
mrbfrank
685ea4a361 theme agnoster: remove trailing space
re-implemented expired pull request https://github.com/robbyrussell/oh-my-zsh/pull/1759
2014-01-29 13:35:21 -06:00
mrbfrank
7daaa188da corrected branch character
changed ± to 
2014-01-28 21:54:00 -06:00
mrbfrank
78ffa71cb6 updated url to latest powerline-patched fonts
clearing up some confusion in issue#1906
2014-01-28 18:02:40 -06:00
Christoph Heer
3d41804fbc Improve virtualenv prompt in steeef theme 2014-01-24 23:01:35 +01:00
Gaetan Semet
43da92c071 Merge remote-tracking branch 'upstream/master' 2014-01-18 12:09:59 +01:00