Commit graph

1111 commits

Author SHA1 Message Date
Chris Martin
51b273a66f basic command line xcode functionality 2013-11-14 16:04:38 -08:00
Pedro Henrique Passalini
dcf7c7cce0 add aliases to readme 2013-11-14 14:36:20 -02:00
Pedro Henrique Passalini
ae6b26327a add new alias to zeus 2013-11-14 14:31:24 -02:00
Robby Russell
1cc1906347 Merge pull request #2244 from marcoccchan/master
Use environment specific open command when creating a new Jira issue.
2013-11-13 13:28:01 -08:00
Robby Russell
a4f4ed037a Merge pull request #2243 from sabarishcrri/bundle_plugin_nobundle_fix
bundle plugin throwing error when bundle is not in path while initializing
2013-11-12 19:34:09 -08:00
Carlos Cardoso
c6dce05fab python3 clean updated. 2013-11-12 22:55:28 -02:00
Amila Perera
4e7b0fe083 getting the projects name correctly and making compdef to work with mux alias 2013-11-13 00:35:19 +05:30
Marco Chan
bb2064e92b Use environment specific open command when creating a new Jira issue. 2013-11-12 15:55:16 +08:00
Sabarish Kumar R
27f9747143 bundle plugin throwing error when bundle is not in path while initializing 2013-11-12 12:31:13 +05:30
Zsolt Sz. Sztupák
96798c42f0 Fix issues with special characters when running mvn
Setting the locale to C will stabilize sed, so it won't stop processing
the mvn output when it encounters invalid characters (like binary data)

This makes it also more viable to add the `alias mvn='mvn-color`, as
the coloring is less obtrusive, and there won't be any issues with sed
breaking because of an invalid character inside the stream
2013-11-11 18:09:33 +00:00
James Seward
8cfc7d6677 Prevent errors in prompts if no info available.
Define empty functions instead of none at all if we can't figure out the
platform.
2013-11-04 21:00:11 -05:00
nishigori
dd4f57010c Fix bad ps syntax in ssh-agent plugin 2013-11-05 08:40:13 +09:00
Robby Russell
b2376c3770 Merge pull request #1529 from aquaplanet/fix-sshagent-openbsd
Fix ssh-agent plugin for OpenBSD, making it more portable
2013-11-04 12:29:42 -08:00
Robby Russell
0d36ecfe38 Merge pull request #2174 from oxnz/master
plugins/osx/osx.plugin.zsh: add itunes function to control itnues from the terminal
2013-11-02 10:35:18 -07:00
Eduardo San Martin Morote
37be62ffb7 randquote plugin
correcting an issue about encoding some people was having
added a message when the user doesn't have curl
added varibles for colors->easier to customize
2013-10-31 13:38:12 +01:00
Brandon W Maister
008e57aa5a Make the pip cache work with djangopypi2
Also add a test function that allows messing with the cache-creating
regex with some assurance that you're not trampling other people's
index-parsing.
2013-10-30 21:00:08 -04:00
Brandon W Maister
78df6e96f5 pip: successfully cache all the packages
Switch to using curl and regular expressions to generate a local cache
file so that we don't need to hit pypi.python.org every time.
This (obviously) results in a massive speed improvement, especially if
you spawn new shells frequently.

This also makes the autocompletion work for me, it didn't before. (pip
would always time out.)

And, also, for fun: This allows you to explicitly set which pip indexes
to use. Technically the old version of the plugin should have had this
behavior automatically -- without having to do more than configure pip
-- but the install completion never worked for me so this is a net gain
in functionality.
2013-10-29 23:33:23 -04:00
onemouth
c81e42f050 Update git.plugin.zsh
add command to ignore changes to file temporarily
2013-10-30 11:05:35 +08:00
Alexandre Joly
0eb86f82d6 updated to the latest version of cocoapods 0.27.1 2013-10-29 10:33:37 +01:00
Kaiwen Xu
f731d6c16f themes plugin now picks a random theme if no argument is provided. 2013-10-28 11:06:10 -04:00
Adrien Dudouit-Exposito
103fc334d6 Add "options" as a valide 1st argument 2013-10-26 11:43:59 +02:00
Kevin Bongart
7567fd7f27 Re-add whitespace 2013-10-25 12:01:28 -04:00
Kevin Bongart
03dc3a8463 Add command blacklist support to bundler plugin 2013-10-25 11:54:56 -04:00
Robby Russell
90c28b786a Merge pull request #1688 from mbauhardt/z
ohmyzsh plugin of the z project: https://github.com/rupa/z
2013-10-24 20:29:10 -07:00
Robby Russell
9f88fb5229 Merge pull request #2165 from kevinxucs/custom-gitignore-fix
gitignore fix for custom folder.
2013-10-24 20:26:20 -07:00
Robby Russell
e44c147e25 Merge pull request #1963 from shajra/pr/gpg-fix
fix gpg-agent "running already" check
2013-10-24 20:25:33 -07:00
Robby Russell
86d57e83ed Merge pull request #2078 from tbuehl/master
Add commonly used git stash aliases to git plugin
2013-10-24 20:24:59 -07:00
Robby Russell
07ad2bad66 Merge pull request #2192 from kevintraver/tmux-aliases
Add tmux aliases
2013-10-24 20:23:40 -07:00
Robby Russell
8f2e53c33e Merge pull request #2107 from maxd/master
Check bundler version to avoid error with unsupported command line arguments
2013-10-24 13:13:10 -07:00
Kevin Traver
d01ca03635 Add tmux aliases 2013-10-23 23:17:43 -07:00
oxnz
500e5a73b6 add itunes function to control itnues from the terminal 2013-10-16 16:43:03 +08:00
Lei Zhang
c0c9fc0254 Add support .venv folder as virtual env 2013-10-16 15:50:52 +08:00
Wes Morgan
3ca3c5a126 don't clobber existing RBENV_ROOT & follow Homebrew's default behavior 2013-10-14 09:59:20 -06:00
Kaiwen Xu
c5902d3f34 Moved misplaced plugins. 2013-10-14 07:39:59 -04:00
Robby Russell
c79e5a97a9 Merge pull request #2132 from jkaving/forklift2
Add support for ForkLift 2 to the ForkLift plugin
2013-10-08 19:26:28 -07:00
Timo Sand
671db71d21 Added '.jar' 2013-10-03 13:00:12 +03:00
Timo Sand
387de3a57e Added '.war' extension to unzip 2013-10-03 09:48:49 +03:00
kaving
2be4158d8f Add support for ForkLift 2 to the ForkLift plugin
The ForkLift plugin now supports ForkLift 2 as well as ForkLift 1.
If ForkLift is not running it also waits for it to be running before
trying to switch to the specified directory
2013-10-02 10:51:21 +02:00
Steven Schmid
05b3ea342a Fix work_in_progress in empty git repos
I noticed that the function ``work_in_progress``, which is used in the "gallois"-theme, would print ``fatal: bad default revision 'HEAD'`` in a new folder after ``git init``.

This is the fix.
2013-10-01 18:08:15 +02:00
Maxim Dobryakov
e8c3619486 Check bundler version to avoid error with unsupported command line arguments 2013-09-24 13:58:48 +04:00
Robby Russell
0582bd193c Merge pull request #1763 from jonilicious/master
RVM plugin - Fixes wrong variable used in 'rb20' function
2013-09-19 06:58:51 -07:00
Robby Russell
26e936e645 Merge pull request #1967 from tchaudhri/gdc_git_alias
Added a 'git diff --cached' alias -> 'gdc'
2013-09-19 06:56:58 -07:00
Robby Russell
4275e68bb3 Merge pull request #2079 from paulmelnikow/subl
Sublime Text: Harmonize alias with the Sublime Text install instructions
2013-09-19 06:56:35 -07:00
Robby Russell
9d93608740 Merge pull request #2077 from paulmelnikow/nvm
Plugin for Node Version Manager
2013-09-19 06:52:42 -07:00
Robby Russell
ea4d3367b9 Merge pull request #2060 from dchusovitin/bug-node-doc
Fixed opening documentation on Linux (node)
2013-09-19 06:50:05 -07:00
Robby Russell
91c9d98bd8 Merge pull request #2066 from agronemann/patch-1
Update bundler.plugin.zsh
2013-09-19 06:49:28 -07:00
Robby Russell
d5701784b0 Merge pull request #2098 from monstermunchkin/master
jump plugin: fix autocompletion with single mark
2013-09-19 06:48:13 -07:00
Robby Russell
d72ebc0824 Merge pull request #2043 from quodlibetor/fix-pip
Improve pip plugin options support
2013-09-18 23:39:59 -07:00
Robby Russell
fc70d76788 Merge pull request #2053 from fluxrad/mosh
Add support for mosh (remote-shell) tab completion.
2013-09-18 23:39:12 -07:00
Robby Russell
a712579a2a Merge pull request #2099 from mchaisse/master
Added WIP (work in progress) feature to git.plugin
2013-09-18 23:38:11 -07:00
yleo77
0240ac6496 Merge remote-tracking branch 'robbyrussell/master' 2013-09-19 12:40:45 +08:00
Maxime Chaisse-Leal
095a01d92a Added WIP (work in progress) feature to git.plugin 2013-09-18 21:54:23 +02:00
Thomas Hipp
91b6a6b5a4 jump plugin: fix autocompletion with single mark
Autocompletion fails if there's only one mark, since the ls command
will not display the parent directory with the trailing colon.
Handling the single mark case separately and validating the symlink
explicitly, resolves the issue.
2013-09-18 17:13:12 +02:00
Robby Russell
b51c2a0d0b Merge pull request #1987 from zvirusz/patch-1
Added 'reinstall' command to brew completion
2013-09-11 06:20:22 -07:00
Robby Russell
045323160a Merge pull request #2002 from stibinator/master
added duckduckduck go to the web-search plugin
2013-09-11 06:20:10 -07:00
Robby Russell
e99a8fb9c2 Merge pull request #2080 from Mehonoshin/bundler-parallel-installing
Support of parallel bundle install
2013-09-11 06:16:30 -07:00
Robby Russell
cf4eded921 Merge pull request #1975 from fff/master
fix typo error in tmux plugin
2013-09-11 06:15:26 -07:00
Alexandre Joly
40b1cf0103 repo list search one level deeper
the folder structure changed '.cocoapods/' -> '.cocoapods/repos'
2013-09-10 15:20:57 +02:00
Gaetan Semet
4543852876 Completion for python, pep8, autopep8 and pylint
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2013-09-10 11:33:58 +02:00
Gaetan Semet
8735dfd87e New aliases for repo plugin
This helps a lot in day to day android development:
- rs: repo sync (git fetch on all projects)
- rra: auto rebase for all projet without loosing uncommited changes
- rsrra: do both steps at once

Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2013-09-10 11:20:07 +02:00
Alexandre Joly
bdb2cabaa6 typo 2013-09-10 09:17:09 +02:00
Alexandre Joly
f6fb34845d updated the arguments list to the newest version (0.24.0) of cocoapods 2013-09-10 09:14:24 +02:00
Jeroen Janssens
d3e005d6b4 Fix aliasing pwd 2013-09-06 15:29:14 -04:00
Jeroen Janssens
255b0c4f5e Mark function asks for confirmation and uses basename of directory when no argument is given 2013-09-06 09:55:43 -04:00
Jeroen Janssens
55d4873f91 Change marks function and remove 'function' keyword as suggested by pielgrzym in https://github.com/robbyrussell/oh-my-zsh/pull/2045#issuecomment-22820224 2013-09-06 09:40:44 -04:00
Jeroen Janssens
4517db6acc Add _completemarks function as suggested by pielgrzym in https://github.com/robbyrussell/oh-my-zsh/pull/2045#issuecomment-22826540 2013-09-06 09:34:27 -04:00
Stanislav Mekhonoshin
69ce2362d6 Support of parallel bundle install 2013-09-05 20:22:46 +04:00
Justin Aiken
a265acee4f Better filename matching 2013-09-05 10:00:14 -06:00
Justin Aiken
128cd3f566 Filter out missing links with jump autocomplete 2013-09-05 09:39:22 -06:00
Paul Melnikow
4da4d12d33 Sublime Text: Harmonize alias with the Sublime Text install instructions
The typical command is `subl`, not `st`. Leaving both for backward compatibility.

See http://www.sublimetext.com/docs/2/osx_command_line.html
2013-09-05 10:12:12 -04:00
Paul Melnikow
3007f96090 NVM: Avoid providing completions when nvm is not installed 2013-09-05 10:09:19 -04:00
Torsten Bühl
5bf20572cc Add commonly used git stash aliases 2013-09-05 14:37:37 +02:00
Paul Melnikow
e3c02bfeba Plugin for Node Version Manager 2013-09-04 18:07:58 -04:00
Alexander Gronemann
958c847f54 Update bundler.plugin.zsh
Added taps to bundled_commands
2013-08-29 16:20:40 +02:00
yleo77
fda5afaebc Merge remote-tracking branch 'robbyrussell/master' 2013-08-29 13:41:42 +08:00
dchusovitin
300118ec05 Fixed opening documentation on Linux (node) 2013-08-24 13:12:03 +04:00
Aaron Mills
f11934e00c Add support for mosh (remote-shell) tab completion. 2013-08-19 16:28:09 -06:00
Jeroen Janssens
73c22c146c Add tab completion for jump plugin 2013-08-18 14:16:26 -04:00
Jeroen Janssens
e368bf1d4a Add jump plugin, which allows you to easily jump around the file system 2013-08-15 10:32:01 -04:00
Brandon W Maister
e4d0b2b385 Improve pip plugin options support
* -r, --record now looks for a local file instead of trying to cache
  the entire package index
* add --editable because it's useful
* add --single-version-externally-managed because it is too long
* add --record and --root because they're required by
  --single-version-externally-managed
2013-08-14 23:19:16 -04:00
stibinator
b9474c411b changed duck to ddg for alias 2013-08-14 14:04:06 +10:00
Robby Russell
434f3bc05c Merge pull request #2028 from AeonAxan/master
Add Docker Autocompleteion
2013-08-13 06:21:53 -07:00
Robby Russell
f6dbe212e8 Merge pull request #1672 from miry/rails3_command_fix
Use new style of rails command.
2013-08-13 06:21:14 -07:00
Robby Russell
39a5e36c37 Merge pull request #1790 from simlegate/master
change git  alias
2013-08-13 06:20:53 -07:00
Robby Russell
00183d1199 Merge pull request #1961 from brenttheisen/issue_1952_pr
Copy and paste of two functions from Ubuntu 13.04's version of /usr/s… …hare/zsh/functions/Completion/Unix/_git that were referenced in 46f0d8d.
2013-08-13 06:20:05 -07:00
Robby Russell
89067b5387 Merge pull request #1960 from mekanics/plugin-pod
Plugin pod
2013-08-13 06:18:37 -07:00
Ahmed Azaan
e724a63b24 Merge branch 'master' of https://github.com/AeonAxan/oh-my-zsh 2013-08-07 22:13:20 +05:30
Ahmed Azaan
2d1a07a3f7 fixed minor errors 2013-08-07 22:11:49 +05:30
Ahmed Aeon Axan
0a62f6636d Update README.md 2013-08-07 21:29:53 +05:30
Ahmed Azaan
619ecb5f4f add docker autocomplete plugin 2013-08-07 21:19:21 +05:30
stibinator
0456664463 added duckduckgo to web-search 2013-07-26 11:53:53 +10:00
stibinator
25913cf144 added duckduckgo to web-search 2013-07-26 11:49:40 +10:00
Andrey Janzen
c8dbadd3da Added completion for second argument for 'brew reinstall' 2013-07-23 21:32:55 +07:00
Robby Russell
5fcb6e1263 Merge pull request #1988 from jwarwick/mix
Added autocompletion support for Elixir mix command
2013-07-23 07:24:58 -07:00
Robby Russell
dde7aefc67 Merge pull request #1992 from jeromemacias/patch-1
Fix symfony command completion 'permission denied'
2013-07-23 07:24:27 -07:00
Robby Russell
34ce86e4c8 Merge pull request #1994 from kennethgeerts/master
Updated gem plugin zsh completion (gem 2.0.3).
2013-07-23 07:23:59 -07:00
Kenneth Geerts
107d196f94 Updated gem plugin zsh completion (gem 2.0.3). 2013-07-23 15:51:35 +02:00
Andrey Janzen
b456541cc3 In capistrano completion show also tasks without description 2013-07-23 15:52:44 +07:00
Jérôme Macias
d0e312fc13 Fix symfony command completion 'permission denied' 2013-07-22 15:51:16 +02:00
John Warwick
4b8e109584 Added autocompletion support for Elixir mix command 2013-07-19 23:19:11 -04:00
Andrey Janzen
cbbdc0dfeb Added 'reinstall' command to brew completion 2013-07-20 10:12:06 +07:00
Robby Russell
2cc4801bd2 Merge pull request #1980 from awidegreen/upstream
Fix ssh-agent plugin identities comment for using multiple identities.
2013-07-16 20:45:19 -07:00
Trae Robrock
9a9e6e9299 No cat, and hide errors for missing cache file 2013-07-16 17:01:58 -07:00
Trae Robrock
00ccee1f33 Add knife_ssh command to make connecting to servers managed with chef easier 2013-07-16 16:58:55 -07:00
Armin Widegreen
5c529b5daa Fix ssh-agent plugin identities comment for using multiple identities. 2013-07-16 17:24:07 +02:00
yleo77
6041e4938c set default value --max-count=10 2013-07-16 16:54:54 +08:00
yleo77
67b2781f62 Merge remote-tracking branch 'robbyrussell/master' 2013-07-16 16:37:18 +08:00
Sukant Hajra
cf8d76094c PLUGIN: gpg-agent: export SSH_* environment variables too
If using the gpg-agent with --enable-ssh-support, the SSH_AUTH_SOCK and
SSH_AGENT_PID environment variables need to be exported once sourced
from GPG_ENV.  Otherwise, we get no benefit from the persisting these
values to GPG_ENV; subsequent openned terminals don't see the existent
gpg-agent as a process for an SSH daemon.
2013-07-15 08:51:08 -05:00
Alexandre Joly
ba7fe6df62 show file liste on 'pod push [REPO]' and tab, 'pod spec lint' and 'pod podfile-info' 2013-07-15 14:37:31 +02:00
fff
849c80b02d fixed typo in tmux plugin 2013-07-15 09:25:18 +08:00
Tehmasp Chaudhri
57a2327ddf Added a 'git diff --cached' alias -> 'gdc' 2013-07-12 12:03:44 -06:00
Sukant Hajra
3d204883a6 fix gpg-agent "running already" check
The GPG_ENV file is sourced before doing the gpg-connect-agent check,
but this file (unlike the SSH_ENV file) doesn't export GPG_AGENT_INFO,
so the check always fails.  This results in new gpg-agents continuously
being spawned.

All this commit does is put in the single export to fix the problem.
2013-07-11 01:36:50 -05:00
Brent Theisen
05d8fdf3d5 Copy and paste of two functions from Ubuntu 13.04's version of /usr/share/zsh/functions/Completion/Unix/_git that were referenced in 46f0d8d. Fixes #1952. 2013-07-09 23:15:43 -05:00
mekanics
45314ee5b7 correct filename in the comments 2013-07-10 00:14:08 +02:00
Alexandre Joly
0892bce00b supplemented with options 2013-07-09 14:41:41 +02:00
dongweiming
4d6b59f041 Add a plugin for systemadmin ops and developer 2013-07-05 19:27:43 +08:00
Alexandre Joly
c48822b3a3 show repos on pod push 2013-07-05 11:28:00 +02:00
Alexandre Joly
1d636fe8ab pod-list
pod-lib removed. whyever I described it...
2013-07-05 11:17:33 +02:00
Alexandre Joly
cf5ca2f4f3 commands and subcommands 2013-07-05 11:07:29 +02:00
Alexandre Joly
c26facb582 first few lines for the autocompletion of cocoapods 2013-07-05 00:58:05 +02:00
dongweiming
744f3654e2 Add sudo plugin 2013-07-04 19:18:52 +08:00
dongweiming
426f5f4839 Update powify for displayed parameter is not enough, and when there is no directory error 2013-07-03 22:29:42 +08:00
dongweiming
44a26df8fd Add version option 2013-07-03 11:57:31 +08:00
Matei Trusca
9cec52c449 fixed typo in tmux plugin 2013-07-02 11:29:25 +03:00
dongweiming
c164f2aab6 Add shell built method 2013-07-02 00:22:25 +08:00
dongweiming
15509ce047 Update gem completion 2013-06-30 17:29:02 +08:00
Robby Russell
b0e4381471 Merge pull request #1764 from johnjohndoe/feature/rails3-autocompletion
Add autocompletion for Rails3.
2013-06-28 12:50:04 -07:00
Robby Russell
b36f53cced Merge pull request #1920 from dongweiming/update-coffee
Update coffee completion
2013-06-28 12:49:10 -07:00
Robby Russell
3072a2093e Merge pull request #1916 from okuramasafumi/master
Change duplicated alias name
2013-06-28 12:48:38 -07:00
Robby Russell
db82b8e8d8 Merge pull request #1919 from dongweiming/breaking-change-bower
The current version of bower is completely unavailable, plugin depthmodification
2013-06-28 12:47:47 -07:00
dongweiming
4fe4db5128 Update coffee completion 2013-06-28 15:08:26 +08:00
dongweiming
012afe2381 The current version of bower is completely unavailable, plugin depth modification 2013-06-28 11:47:03 +08:00
Brandon Black
644728bd22 rvm plugin: update to ruby version helpers and rvm-update
* the current patch levels hard-coded here are pretty dated. I updated the ruby version helpers to use loose ruby version matchers so they don't continually need to be updated with every new patch level release.

* `rvm get head` actually performs an `rvm reload` in the post install. there's no need to do again here in rvm-update so I've removed that.
2013-06-27 11:46:41 -07:00
Okura Masafumi
c51ef9dce6 Change duplicated alias name 2013-06-27 22:28:14 +09:00
Tobias Preuss
10bd036dfe Add autocompletion for Rails3.
+ Originally published by Christopher Chow.
+ Source:
30620d4638/plugins/rails3/_rails3
  Commit: 30620d4638
2013-06-27 02:02:07 +02:00
Chris Krycho
f25e2d2856 Add more capable hg incoming and outgoing count handling
The original hgic and hgoc aliases worked well for the default path, but attempting to call them with a different path failed. I created functions to handle them instead.
2013-06-25 15:52:26 -03:00
Robby Russell
b9baf37739 Merge pull request #1859 from ayushs/plugin-git-clean
Added alias for git clean
2013-06-25 09:26:00 -07:00
Robby Russell
a8c0c4de06 Merge pull request #1864 from Stibbons/gsemet_push_git_plugin
Improvement in the git plugin
2013-06-25 09:25:38 -07:00
Robby Russell
3a3fd686ee Merge pull request #1865 from Stibbons/gsemet_push_repo_plugin
New plugin for git-repo (https://code.google.com/p/git-repo/)
2013-06-25 09:24:25 -07:00
Robby Russell
e727068cee Merge pull request #1867 from telser/master
Simple Cabal plugin
2013-06-25 09:23:36 -07:00
Robby Russell
6e3e07fd90 Merge pull request #1869 from lucasuyezu/env_logs
Adding testlog and prodlog in addition to devlog.
2013-06-25 09:23:08 -07:00
Robby Russell
e8c7b77db9 Merge pull request #1880 from posva/rand-quote
Random quotes from the internet
2013-06-25 09:22:10 -07:00
Robby Russell
5bccf4b123 Merge pull request #1876 from chriskrycho/patch-1
Add count for incoming and outgoing changesets.
2013-06-25 09:21:32 -07:00
Robby Russell
7655a655f6 Merge pull request #1881 from iammichiel/patch-1
Adding a rebase option to git alias.
2013-06-25 09:21:15 -07:00
Robby Russell
11b7155469 Merge pull request #1886 from tresni/patch-5
Correctly detect JIRA Rapid Board
2013-06-25 09:14:59 -07:00
Robby Russell
bf2a85c397 Merge pull request #1901 from geecu/autocomplete_required
autocomplete required packages as second argumet
2013-06-25 09:13:57 -07:00
Robby Russell
0868d71307 Merge pull request #1708 from tessi/extend_mercurial_plugin
extend mercurial plugin
2013-06-25 09:13:26 -07:00
Robby Russell
1e625b42ff Merge pull request #1903 from andschwa/tmux_iterm2
Tmux iTerm2 integration
2013-06-25 09:08:49 -07:00
Robby Russell
354211f5ac Merge pull request #1904 from oohlaf/gpg-agent-fix
Prevent starting multiple gpg-agents
2013-06-25 09:07:49 -07:00
Robby Russell
c88121149a Merge pull request #1910 from dongweiming/add-celery-completion
Add celery completion
2013-06-25 09:05:30 -07:00