Commit graph

97 commits

Author SHA1 Message Date
Gaetan Semet
92ed38cb85 Merge remote-tracking branch 'cadusk/master'
Conflicts:
	lib/aliases.zsh
	templates/zshrc-linux.zsh
	templates/zshrc-mac.zsh
	tools/install.sh
2014-03-24 11:56:16 +01:00
Carlos Cardoso
c31f9e6f09 Cleanup .orig files. 2014-03-23 20:18:19 -03:00
Carlos Cardoso
ad4e88bc23 Merged blessed. 2014-03-23 19:58:16 -03: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
47b0d754ae Fixing a few quirks in the latest installer updates (quoting /Users/robbyrussell/.oh-my-zsh and such). Also mentioining our twitter account after install 2014-03-13 10:15:18 -07:00
Andrew Vit
da1fa3b06a Abort installer on errors 2014-03-08 13:17:16 -08:00
Andrew Vit
2e11e2ab5a Write install path into .zshrc 2014-03-08 13:16:46 -08:00
Andrew Vit
5bd590ceb3 Reference default install path from ZSH variable 2014-03-08 13:13:52 -08:00
Robby Russell
6a2e65f4c8 Merge pull request #1402 from sergeylukin/master
Fix install.sh compatibility with /bin/sh
2014-03-08 08:39:34 -08: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
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
0fb7e54b90 Merged upstream configuration. 2013-12-17 01:26:27 -02:00
Gaetan Semet
e7dbded054 Merge remote-tracking branch 'upstream/master' 2013-12-09 10:52:48 +01:00
Patrick Stadler
858c515df2 source ~/.profile only if it exists 2013-12-03 09:52: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
Robby Russell
0d352109e9 Merge pull request #1087 from avit/install-template
Add configuration placeholders to installer template
2013-12-02 23:49:00 -08:00
Robby Russell
f48d6759e6 Merge pull request #1883 from Stibbons/gsemet_push_source_profile_for_upgrade
source ~/.profile for upgrading (to source the proxy configuration)
2013-12-02 23:43:43 -08:00
Robby Russell
f574849c0a Merge pull request #1927 from dongweiming/modify
Modify determine the oh-my-zsh installed in non-default path of the installed
2013-12-02 23:37:49 -08:00
Gaetan Semet
b53d132c5d trying to fix theme_chooser 2013-11-25 11:35:04 +01:00
Valentin Shevko
7c56364dc4 Add update statistics
After the upgrade is interesting to know what's new.
2013-11-22 02:34:33 +03:00
Carlos Cardoso
7062f131f0 merge upstream 2013-11-12 22:43:28 -02:00
Andrew Vit
1e9f55f09d Add configuration placeholders to installer template
Although the zshrc template adds a PATH= string, this is overwritten by the installer script.
This allows it to be placed anywhere in the file instead of having to append at the end.
2013-10-25 14:50:27 -07:00
Gaetan Semet
fc27f4088b Merge remote-tracking branch 'dlintw/2024-list-theme-features' 2013-09-11 15:33:29 +02:00
Gaetan Semet
0fcb7dd55e Display right prompt in theme chooser
I didn't found the way to right-align the right prompt
properly.

Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2013-09-10 11:28:31 +02:00
Gaetan Semet
e91604d729 Theme chooser display right prompt
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2013-08-28 10:41:38 +02:00
Daniel YC Lin
8da2cbd2e7 added my theme as path3 example 2013-08-06 18:35:15 +08:00
Daniel YC Lin
089cab61e3 support %2~ 2013-08-06 18:14:47 +08:00
Daniel YC Lin
eb271d6eb5 support vcs,vcs_info,vcs_info_msg as features 2013-08-06 17:47:40 +08:00
Daniel YC Lin
8f18bd38fd show themes featues by grep 2013-08-06 17:03:21 +08:00
Carlos Cardoso
b5205c12d4 Merge remote-tracking branch 'upstream/master'
* upstream/master: (41 commits)
  fixed typo in tmux plugin
  Update coffee completion
  The current version of bower is completely unavailable, plugin depth modification
  rvm plugin: update to ruby version helpers and rvm-update
  Change duplicated alias name
  Add autocompletion for Rails3.
  Add more capable hg incoming and outgoing count handling
  Add celery completion
  add virtualenv prompt support for agnoster theme
  git-pull add --rebase option
  Typo
  Prevent starting multiple gpg-agents
  Not loading home tmux confs when iTerm2 tmux integration is enabled
  Adding support for iTerm2 tmux integration via option '-CC'
  remove unused function
  autocomplete required packages as second argumet
  debian plugin: ignore alias in sudo/aptitude check
  Add new plugin for homebrew installed version of postgres
  Do not clear tab when calling it with an argument.
  Correctly detect Rapid Board
  ...
2013-07-12 14:26:59 -03:00
dongweiming
d4a9467f89 Modify determine the oh-my-zsh installed in non-default path of the installed 2013-06-30 18:08:48 +08:00
UncleBill
87a1d8a02d git-pull add --rebase option 2013-06-25 12:08:02 +08:00
Gaetan Semet
17a7a47fc0 Rebase on update
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2013-06-18 11:28:32 +02:00
Gaetan Semet
3f44f51e9c source ~/.profile for upgrading (to source the proxy configuration)
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2013-06-11 14:51:26 +02:00
Gaetan Semet
5817a61e59 source ~/.profile for upgrading (to source the proxy configuration)
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2013-06-11 14:50:32 +02:00
Gaetan Semet
781364a35a Merge remote-tracking branch 'upstream/master'
Conflicts:
	lib/theme-and-appearance.zsh
	plugins/tmux/tmux.plugin.zsh
2013-06-05 11:10:38 +02:00
Carlos Cardoso
ee3267f30d Merged official branch changes. 2013-06-03 22:12:29 -03:00
Marcus Müller
39b46f526c eliminated unnecessary cd and failing substitution
Changing the working directory in a sub-subshell
does not change the working directory of the executing
shell.

The substitution was broken for me on _all_ my machines,
so I started looking into the business.
2013-04-29 09:51:21 +02:00
Robby Russell
d8e700c1b6 Merge pull request #1651 from deepusudhakar/master
Escape $ZSH path in upgrade_oh_my_zsh
2013-04-12 05:56:50 -07:00
Robby Russell
f2a927f9b2 Merge pull request #1696 from henryyan/master
Added $PATH to PATH in install shell
2013-04-12 05:56:24 -07:00
Gaurav Misra
32a42f27b6 Escape spaces in folder name so script won't fail
If the current directory has spaces, the script fails to change paths and fails.
2013-04-09 11:45:16 -07:00
Henry Yan
d55262b6a1 Added $PATH to PATH in install shell 2013-04-07 20:59:01 +08:00
Gaetan Semet
853d99fa98 Fixed file name issues
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2013-03-27 10:13:03 +01:00
Carlos Cardoso
fb15c83086 Updated repository references. 2013-03-27 10:10:33 +01:00
Deepu Sudhakar
9991401aaa Escape /Users/desudhak/.oh-my-zsh path (previously broke spaces in path) 2013-03-10 14:36:39 -05:00
Probably Not
dfbafe6d58 Fixing conflict in install scripts 2012-12-02 13:08:06 -08:00
Robby Russell
9a88e76823 Merge pull request #1370 from ericmathison/syntax-fix
Fix color syntax
2012-12-01 11:58:21 -08:00
Eric Danielson
200a25818a Add UPDATE_ZSH_DAYS setting 2012-11-26 11:35:16 -08:00
Sergey Lukin
ebeae4abe9 Fix /bin/sh compatibility issue in install.sh 2012-11-09 23:53:22 +02:00
Carlos Cardoso
bc1e35d3b5 Merge remote-tracking branch 'rrussell/master' 2012-10-25 15:56:36 -02:00