summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-11-27Merge pull request #3309 from jarinudom/superjarinRobby Russell
Simplify superjarin theme and support chruby
2014-11-19Merge pull request #3333 from mcornella/fix-git-hide-dirtyRobby Russell
Switch back to oh-my-zsh.hide-dirty setting again
2014-11-19Merge pull request #3323 from alfss/fix-pjRobby Russell
[~] fix plugin pj
2014-11-19Switch back to oh-my-zsh.hide-dirty setting againMarc Cornellà
Commit 81004dfaba509ff62a13ba303ab941938d619326 reverted the change in 9b811fb625c03c30a766191cdf65a1c7c1fd96b2 when editing the merge conflict from #2928. This commit fixes that so that we don't make the same mistake again. First seen in http://git.io/Cdaj5Q
2014-11-16[~] fix plugin pjKravchuk S.V
https://github.com/robbyrussell/oh-my-zsh/commit/bce74975d055529cbd186782e2fd99e6da840460
2014-11-10Merge simplified superjarin themeJarin Udom
2014-11-07Merge pull request #3299 from apoxa/fix-profilesRobby Russell
Fix for the profile plugin.
2014-11-07Fixes the profiles-pluginBenjamin Stier
An error was introduced with 7f75bb9, which uses special vars. This is the fix.
2014-11-06Merge pull request #3223 from mcornella/use-special-varsRobby Russell
Use special variables where we can
2014-11-06Change all hostname calls for $HOST or $SHORT_HOSTMarc Cornellà
2014-11-06Change all pwd calls for $PWD variableMarc Cornellà
This avoids spawning additional processes as $PWD **always** contains the current working directory.
2014-11-06Change all whoami calls for $USER variableMarc Cornellà
This avoid spawning additional processes, as the $USER variable will **always** contain the current logged-in user.
2014-11-06Merge pull request #3213 from nikhgupta/features/fix-emoji-clockRobby Russell
added support for GNU version of `date`
2014-11-06Merge pull request #3108 from mfaerevaag/masterRobby Russell
[wd] New minor version (v0.4)
2014-11-06Merge pull request #3131 from halilim/remove-j-aliasRobby Russell
Remove j alias for autojump
2014-11-06Merge pull request #3081 from pavoljuhas/masterRobby Russell
update the scd plugin for smart change of directory.
2014-11-06Merge pull request #2974 from elliottwilliams/patch-1Robby Russell
Fix osx function: "not valid in this context"
2014-11-06Merge pull request #2976 from shammellee/patch-1Robby Russell
typo
2014-11-06Merge pull request #2946 from moinakg/masterRobby Russell
Solaris portability tweaks.
2014-11-06Merge branch 'simonbuchan-master'Robby Russell
2014-11-062928 merge conflictRobby Russell
2014-11-06Merge pull request #2959 from crkochan/fix_rake_commandRobby Russell
Fix for recusion limit hit for _rake_command alias
2014-11-06Merge pull request #2648 from dfarrell07/masterRobby Russell
Fixed which output at each new shell creation
2014-11-06Merge pull request #2323 from michaelorr/slow-git-fixRobby Russell
Renaming config for parse_git_dirty() to avoid collision
2014-11-06Merge pull request #2168 from riyad/modernize-virtualenvRobby Russell
Modernize the virtualenv plugin
2014-11-06Merge pull request #1604 from franklouwers/masterRobby Russell
Improve pj-plugin to support projects with spaces in their names + optimise code
2014-11-06Merge pull request #3224 from Neal/xcode-simulator-fixRobby Russell
Update path for the iOS simulator.
2014-11-06Merge pull request #3230 from willmendesneto/fix-compass-doc-searchRobby Russell
Fix error using compass search alias
2014-11-06Merge pull request #3226 from mcornella/fix-plugin-gitignoreRobby Russell
[Plugin: gitignore] Several fixes in the plugin
2014-11-02Update to the upstream smart-change-directory.Pavol Juhas
Synced with the master branch pavoljuhas/smart-change-directory@20b5a80cf05f72c07e88a9b166593f52517029e4.
2014-10-27Make the simulator alias work with older Xcode versions as well.Neal
2014-10-22Follow-redirect and silent mode curl throughout gitignoreMarc Cornellà
This commit completes previous efforts and standardizes both curl commands into using silent mode and following redirects in case the URL changes again in the future.
2014-10-22Fix gitignore curl, should follow redirectsWooParadog
2014-10-22Fix misspellings in gitignore pluginAlex Shaindlin
2014-10-22fixed URL on github.ioAndrii Kostenko
github.io moved to https and http returns 301 redirect
2014-10-22Merge pull request #3252 from mcornella/fix-auto-named-dirs-promptRobby Russell
Don't set auto_name_dirs because it messes up prompts
2014-10-22Don't set auto_name_dirs because it messes up promptsMarc Cornellà
From http://zsh.sourceforge.net/Doc/Release/Options.html#Completion-4 > AUTO_NAME_DIRS > Any parameter that is set to the absolute name of a directory immediately > becomes a name for that directory, that will be used by the ‘%~’ and > related prompt sequences, and will be available when completion is performed > on a word starting with ‘~’. > (Otherwise, the parameter must be used in the form ‘~param’ first.) Explained in more detail in https://github.com/wayneeseguin/rvm/issues/3091#issuecomment-60083194 Related issues: https://github.com/robbyrussell/oh-my-zsh/issues/2857 https://github.com/robbyrussell/oh-my-zsh/issues/3238 https://github.com/wayneeseguin/rvm/issues/3091
2014-10-21[wd] fix space in pathMarkus Faerevaag
2014-10-18Fix error using compass search aliaswillmendesneto
2014-10-14Update path for the iOS simulator.Neal
2014-10-14added support for GNU version of `date`Nikhil Gupta
2014-10-14Change to epoch target in days instead of seconds.Moinak Ghosh
2014-09-17Convert epoch_target from days to seconds.Moinak Ghosh
2014-09-16Update Solaris changes to use OSTYPE and zsh datetime module.Moinak Ghosh
2014-09-13Remove j alias for autojumpHalil Özgür
j alias conflicts with autojump's j() function. Fixes #2989
2014-09-08[wd] Minor bug fix in show commandMarkus Faerevaag
2014-09-07[wd] New minor version (v0.4)Markus Faerevaag
2014-09-05Merge pull request #2811 from stucki/multiple-vagrant-machinesRobby Russell
Support dynamically defined Vagrant machines
2014-09-05Merge pull request #2744 from docwhat/ostype-not-unameRobby Russell
Use $OSTYPE instead of uname to speed things up
2014-09-04Merge pull request #3095 from robbyrussell/revert-1504-masterRobby Russell
Revert "Exit early from git plugin if not in git repo." due to #3082