Commit graph

5874 commits

Author SHA1 Message Date
Marc Cornellà
e1b04cfecd Fix logic of bureau_git_status function
This separates the gathering of file status, repository status and
stash.
2016-04-04 20:39:10 +02:00
Marc Cornellà
286c3e5e28 Merge pull request #4961 from aesopwolf/patch-1
Add git user profile functions for prompt display
2016-03-31 23:24:54 +02:00
Aesop Wolf
69e1506ad9 Add git user profile functions for prompt display 2016-03-31 14:16:46 -07:00
Marc Cornellà
c4582777fc Merge pull request #4957 from TorrentKatten/master
localization support for clock in candy theme
2016-03-31 00:51:15 +02:00
Jon-Erik Johnzon (TorrentKatten)
e8a9d0ee1a localization support for clock in candy theme
Now uses 12-hour clock or 24-hour clock depending
on user locale
2016-03-30 21:46:39 +02:00
Marc Cornellà
c3b3de5f29 Merge pull request #4956 from RobLoach/asdf
Add asdf version manager plugin
2016-03-30 20:54:03 +02:00
Rob Loach
616ac67924 Add 'asdf' plugin 2016-03-30 02:05:07 -04:00
Marc Cornellà
b4a85eca9d Merge pull request #4728 from atk91/4727
Remove --color flag from git log aliases

The way to colorize `git log` output is by setting the `color.ui` configuration.
2016-03-30 04:46:22 +02:00
Marc Cornellà
7cc1eab6fa Merge pull request #2752 from isqua/bureau_theme_fix
Fix checkmark for clean repo in bureau theme
2016-03-30 04:36:41 +02:00
Marc Cornellà
c74681a199 Merge pull request #2392 from s7anley/master
Geeknote autocomplete and alias
2016-03-30 04:31:09 +02:00
Marc Cornellà
d1a5fad25b Merge pull request #4943 from MattLewin/master
Update 'tm' function to take multiple files on the command-line
2016-03-30 04:29:56 +02:00
Marc Cornellà
dfccac312c Merge pull request #3892 from delphiki/sf2-plugin
Added environment based shortcuts in symfony2 plugin
2016-03-30 03:40:55 +02:00
Marc Cornellà
8daa52d56c Merge pull request #4809 from aried3r/patch-1
Add missing alias to README of bundler plugin
2016-03-30 03:19:14 +02:00
Robby Russell
5365cca76a Merge pull request #4849 from gkotian/master
Minor README fixes
2016-03-26 10:49:18 -07:00
Robby Russell
7697c402da Merge pull request #4939 from AntouanK/feature/npm-outdated
Add alias for "npm outdated"
2016-03-26 10:47:44 -07:00
Matthew Lewin
fc89773413 Update 'tm' function to take multiple files on the command-line 2016-03-25 11:57:09 -07:00
Marc Cornellà
9280f2c874 Merge pull request #4940 from ysmood/optimize-ys-theme
Optimize the ys.zsh-theme: make it simpler
2016-03-25 00:06:31 +01:00
Marc Cornellà
186f009ecc Update README.markdown 2016-03-24 23:34:41 +01:00
Marc Cornellà
2cc5976d26 Merge pull request #4941 from getaaron/patch-1
Remove "Mac" from "Mac OS X"
2016-03-24 23:32:00 +01:00
Aaron Brager
e0246ed5b7 Remove "Mac" from "Mac OS X" 2016-03-24 10:53:49 -05:00
Yad Smood
9cc3e8bf29 Optimize the ys.zsh-theme make it simpler 2016-03-24 15:29:24 +08:00
Antonis Karamitros @antouank
097cc70f7b [feature/npm-outdated]
- add alias for "npm outdated" to check outdated npm modules
2016-03-24 07:28:26 +00:00
Marc Cornellà
8ac1859f37 Update GitHub download URLs in README
From `raw.github.com' to `raw.githubusercontent.com'

Fixes #4933
2016-03-19 20:46:36 +01:00
Robby Russell
83cf8dc16f Merge pull request #4790 from lckarssen/avit-theme-fixes
Avit theme fixes
2016-03-11 00:18:00 -08:00
Robby Russell
fdff70006c Merge pull request #4863 from ysmood/optimize-ys-theme
Optimize the ys.zsh-theme make it more expressive
2016-03-11 00:17:14 -08:00
Robby Russell
bbedad8f46 Merge pull request #4847 from kennethreitz/patch-1
Update kennethreitz.zsh-theme
2016-03-11 00:16:34 -08:00
Johan K. Jensen
d189236f75 Add iTerm2 v3 support 2016-03-08 13:17:23 +01:00
L.C. Karssen
55fed4f8cd Fix use of CARETCOLOR in avit theme
$CARETCOLOR was not to actually colour the caret, so change to root user
wouldn't show in the prompt. Now both ▶ and ◀ follow $CARETCOLOR.
2016-03-07 22:15:45 +01:00
L.C. Karssen
9c36248439 Better visible colours in avit for Ubuntu terminal
Make some colours in the avit theme bold for better visibility in the
default Ubuntu terminal theme.
2016-03-07 22:14:33 +01:00
L.C. Karssen
cfac963772 Merge branch 'master' of git://github.com/robbyrussell/oh-my-zsh 2016-03-07 22:09:02 +01:00
Marc Cornellà
bd6dbd1d9b Merge pull request #4866 from willmendesneto/master
Fix bug in compass docs search
2016-02-21 14:28:38 +01:00
Will Mendes
480ad804a6 Fix bug in compass docs search 2016-02-22 00:09:27 +11:00
Yad Smood
9a2376bd29 add: exit code 2016-02-21 02:42:42 +08:00
Yad Smood
aeca2ad899 Optimize the ys.zsh-theme make it more expressive 2016-02-21 01:39:01 +08:00
Marc Cornellà
0d0042aad3 Merge pull request #4857 from depressiveRobot/master
fix terminal color pollution
2016-02-19 13:03:51 +01:00
Marvin Frommhold
31614f8c40 fix terminal color pollution, see issue https://github.com/robbyrussell/oh-my-zsh/issues/4856 2016-02-18 15:50:15 +01:00
Gautam Kotian
eee6f08421 Minor README fixes 2016-02-15 10:51:17 +01:00
Kenneth Reitz
568f4812f2 update kennethreitz.zsh-theme 2016-02-14 04:19:46 -05:00
Kenneth Reitz
07424c92a8 Update kennethreitz.zsh-theme 2016-02-14 03:44:31 -05:00
Marc Cornellà
534bf2c608 Merge branch 'psiclops/github-fix' 2016-02-12 23:42:05 +01:00
Marc Cornellà
3d522ff3a6 Remove non-working symbols and tidy up logic 2016-02-12 23:39:47 +01:00
Nick Russo
20b8b6cc74 Sets spacing to 1 when git is absent for consistency 2016-02-12 01:20:47 -08:00
Marc Cornellà
fd223067c8 Merge branch 'add-dnf-plugin'
Close #2452
2016-02-11 23:38:36 +01:00
Marc Cornellà
624518054b Add README to dnf plugin 2016-02-11 21:45:24 +01:00
Marc Cornellà
c0b12523fe Fix deprecated dnf commands
Update -> upgrade
Erase -> remove
2016-02-11 21:38:10 +01:00
George Machitidze
ee86f1a627 Create dnf plugin
Adds some useful aliases
2016-02-11 21:37:50 +01:00
Marc Cornellà
26064c635b Merge pull request #4841 from FiloSottile/patch-1
git.plugin: remove the conflicting gvt alias
2016-02-10 20:21:35 +01:00
Filippo Valsorda
52737b1828 git.plugin: remove the conflicting gvt alias
See FiloSottile/gvt#19 and FiloSottile/gvt#4
2016-02-10 18:31:49 +00:00
Marc Cornellà
a38d7cf54a Merge pull request #4836 from alias1/patch-1
Update _brew to match latest
2016-02-10 02:00:29 +01:00
Glenn / devalias
2a0be1aad4 Add hash imported from 2016-02-10 10:17:18 +11:00