1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2024-12-21 03:41:57 +00:00
Commit graph

2402 commits

Author SHA1 Message Date
atk91
d853ec4b62 Closes #4727 2015-12-25 11:33:29 +03:00
Marc Cornellà
30ddf25fd7 Merge pull request #4695 from mcornella/add-hub-completion
Add hub's completion file
2015-12-16 12:34:03 +01:00
Paul Calabro
247a582d09 Fixed a typo. 2015-12-15 22:52:13 -07:00
Pavan Rikhi
3ebbb40b31 colored-man-pages: Use Portable less Path 2015-12-15 15:13:19 -05:00
Marc Cornellà
6ad6d114dc Merge pull request #4700 from giordanovi/master
Update gulp.plugin.zsh
2015-12-15 12:17:46 +01:00
Giordano Vicari
015437cab8 Update gulp.plugin.zsh
Remove `local` stuff that cause an error in shell
2015-12-15 12:14:41 +01:00
Marc Cornellà
3162de563f Add hub's completion file
This uses the version at commit 35c76bf (2015-12-08)
35c76bf91d
2015-12-15 11:57:24 +01:00
Marc Cornellà
5e310c5308 Fix syntax error in colored-man-pages
Commit 09d2a597a5 introduced the bug, which is due to using
single brackets conditions at the same time as *.

This commit should fix it and use double brackets everywhere
else.

Fixes #4699
2015-12-15 11:56:16 +01:00
Marc Cornellà
fe9ff63ced Merge pull request #4463 from giordanovi/master
Fetch Gulp tasks list in a better way
2015-12-15 11:44:59 +01:00
Giordano Vicari
4f314e2a32 Update gulp.plugin.zsh
Add local stuff
2015-12-15 11:41:36 +01:00
Giordano Vicari
8042394c78 Update gulp.plugin.zsh
Sort pipe dropped and fix 2>/dev/null
2015-12-15 11:14:25 +01:00
Marc Cornellà
cb11d139b4 Merge pull request #4697 from psprint/master
znt: more optimizing workarounds for 5.0.6 <= zsh < 5.2
2015-12-15 11:03:14 +01:00
Sebastian Gniazdowski
d30a501b1c znt: more optimizing workarounds for 5.0.6 <= zsh < 5.2 2015-12-15 11:02:10 +01:00
Marc Cornellà
09d2a597a5 Fix style of colored-man-pages plugin 2015-12-15 04:11:40 +01:00
cknoblauch
a8157293a7 colored-man plugin: Quoted PATH variable
Some environments (in my case, cygwin) have PATH variables with directories
with spaces in them, breaking colored-man.
Adding quotes around the PATH environment variable makes the plugin run OK.
2015-12-15 04:06:23 +01:00
Marc Cornellà
ef31d06426 Merge pull request #4139 from ultimatemonty/patch-1
Nicer formatting of ember aliases in README
2015-12-15 03:37:44 +01:00
Andrew Janke
9f552130bd Move current_branch() from git plugin to core lib/git.zsh
Fixes #4085: core -> plugin dependency issue.
Rename it to git_current_branch for clarity that it's git-specific.
Update all plugins that were calling it to use new name.
Fix variable leaks by making more variables in lib/git.zsh local.
Have lib/git.zsh use [[ ]] instead of [ ] everywhere.
2015-12-14 20:28:37 -05:00
Marc Cornellà
bfd2d8de24 Merge pull request #4498 from gfvcastro/alias-rake-stats
Add 'rake stats' alias.
2015-12-15 02:21:51 +01:00
Marc Cornellà
93c00cced5 Merge pull request #4451 from victor-torres/branch-plugin
Add branch plugin
2015-12-15 01:02:49 +01:00
Marc Cornellà
d988ee01c2 Merge pull request #4568 from blueyed/archlinux-improve-commands-lookup
archlinux: use $+commands instead of 'command -v' in a subshell
2015-12-15 01:01:47 +01:00
Victor Torres
fe63ed09b7 Updating speed test info and using zsh command line. 2015-12-14 20:58:29 -03:00
Victor Torres
cf5db83fac Implementing mcornella's suggestions in pull request 4451. 2015-12-14 17:39:26 -03:00
Marc Cornellà
6a8692da7c Merge pull request #4676 from bamarni/composer-stderr
[Composer] redirect stderr to /dev/null for completion commands
2015-12-14 11:25:43 +01:00
Marc Cornellà
4108c4895f Merge pull request #4690 from kaelig/patch-1
Update link to git completion
2015-12-14 02:21:32 +01:00
Kaelig
6190d3e8ba Point to the GitHub repository 2015-12-13 16:49:13 -08:00
Marc Cornellà
273063ad59 Merge pull request #4663 from psprint/master
znt: faster startup of tools using colorifying (e.g. n-history), optimized heap usage for older Zsh's
2015-12-14 00:41:40 +01:00
Andrew Janke
45822e85c5 history-substring-search: bind arrows in both emacs and viins modes
This avoids an ordering dependency between this and the vi-mode plugin.
2015-12-13 21:34:02 +01:00
Kaelig
b6997f6972 Update link to git completion 2015-12-11 15:36:55 -08:00
Marc Cornellà
5e950d4fa0 Merge pull request #4689 from apjanke/fix-non-numeric-versions
common-aliases: handle "dev" versions in version check
2015-12-11 22:02:50 +01:00
Marc Cornellà
45e42efa45 Merge pull request #4657 from hghwng/master
Recognize Firefox addon and Android packages.
2015-12-11 14:13:30 +01:00
Marc Cornellà
07fcbbe74c Merge pull request #4641 from WeeBull/patch-1
Use actual `commit --amend` command for Mercurial
2015-12-11 13:58:33 +01:00
Andrew Janke
c52f67746b common-aliases: handle "dev" versions in version check
Uses `is-at-least` instead of a numeric comparison hack, so versions with non-numeric bits like "4.5.0-dev5" don't throw errors.
2015-12-11 03:03:38 -05:00
Gregory McCue
fb5effd5d8 Add Ecosia to web-search plugin. 2015-12-10 22:58:53 +01:00
Sebastian Gniazdowski
357d57c541 znt: include some status information on top of the window 2015-12-07 14:15:09 +01:00
Bilal Amarni
0d45e771c8 [Composer] redirect stderr to /dev/null for completion commands 2015-12-06 13:56:10 +01:00
Sebastian Gniazdowski
c793baeadd znt: optimize heap usage for older Zsh's (e.g. 5.0.8) 2015-12-04 19:51:09 +01:00
Sebastian Gniazdowski
89205f90e5 znt: faster startup of tools using colorifying (e.g. n-history) 2015-12-03 11:07:35 +01:00
Hugh Wang
a42a3eead7 Recognize Firefox addon and Android packages. 2015-12-02 12:05:05 +08:00
Marc Cornellà
c82f49e734 Merge pull request #4652 from psprint/master
znt: updated README.md, twice as fast searching
2015-12-02 01:33:23 +01:00
Marc Cornellà
f7ed7244c2 Merge pull request #3321 from moul/pr-tmux-cssh
[tmux-cssh plugin] Initial version
2015-12-01 00:04:12 +01:00
Sebastian Gniazdowski
d427ac1ef9 znt: twice as fast searching 2015-11-30 19:22:34 +01:00
Sebastian Gniazdowski
ae84be7e31 znt: updated README.md 2015-11-30 18:30:05 +01:00
Sebastian Gniazdowski
39e4dfb6a6 Updated README.md 2015-11-30 18:05:55 +01:00
Sebastian Gniazdowski
c8852902a9 Renamed README.txt to README.md 2015-11-30 15:05:49 +01:00
Sebastian Gniazdowski
c2b4d9ff40 znt: n-history supports multi-line cmds and starts with current buffer 2015-11-30 10:48:30 +01:00
Marc Cornellà
afd28bf1fc Merge pull request #4368 from psprint/master
Update Zsh Navigation Tools plugin
2015-11-30 09:50:37 +01:00
Marc Cornellà
46824b39a3 Merge pull request #4191 from apjanke/vi-mode-fix-smkx
vi-mode: fix smkx/rmkx by removing broken line-init/finish widgets
2015-11-29 14:31:35 +01:00
Marc Cornellà
d3b9520501 Merge branch 'apjanke-z-allow-custom'
Closes #4578
2015-11-27 17:12:45 +01:00
Andrew Janke
2205aa42aa z plugin: fix loading from custom location
The old implementation would attempt to load both the default and custom
implementations, with the custom one coming first, so it would get clobbered
by the default version.
2015-11-27 17:12:09 +01:00
Marc Cornellà
85d949550b Merge pull request #4181 from posva/z
Update z version to 5dc2a86
2015-11-27 17:09:05 +01:00
Andrew Janke
7e398391db history-substring-search: update to upstream version 2015-09-28
Updates OMZ's copy to commit 2c295432175990c1bb4e90bc13f609daa67a25d6 from zsh-users/zsh-history-substring-search
2015-11-27 16:59:06 +01:00
Andrew Janke
d7e6ba0b66 history-substring-search: add a script to automatically update OMZ from the upstream repo 2015-11-27 16:59:06 +01:00
Marc Cornellà
befb5b66c5 Merge pull request #4634 from mfaerevaag/master
[wd] update minor version (v0.4.2)
2015-11-27 16:51:05 +01:00
Marc Cornellà
90e1630163 Merge pull request #4443 from apjanke/github-update
Update github plugin to work with current hub versions
2015-11-27 16:07:00 +01:00
WeeBull
b57ddd6a67 Use actual commit --amend command for Mercurial
Rather than trying to emulate `git commit --amend` using mercurial queues (which might have side effects if you're using MQ for other things) use the `commit --amend` command which was introduced in Mercurial 2.2 (2012-05-01).
2015-11-26 14:08:53 +00:00
Markus Faerevaag
7d9648e631 [wd] update minor version (v0.4.2) 2015-11-23 22:22:45 +01:00
Marc Cornellà
249d2229d4 Cleanup gradle plugin file
- Delete useless #!zsh
- Simplify gradle build file check
- Format comments and delete TODO stuff (already dealt with)
- Use `$()` syntax for cat commands
2015-11-21 03:16:34 +01:00
Gergely Nagy
950bbccd60 gradle plugin: also list tasks in subprojects 2015-11-21 03:16:34 +01:00
Marc Cornellà
64e1252bd5 Merge pull request #4623 from apjanke/dircycle-remove-redundant-bindings
dircycle: remove redundant key bindings
2015-11-20 18:08:11 +01:00
Marc Cornellà
5d8fd93cac Merge pull request #4617 from ahmadawais/patch-1
Removed Similar Aliases
2015-11-20 18:07:55 +01:00
Marc Cornellà
7627004a2f Merge pull request #4612 from stereodenis/patch-1
bundle outdated alias
2015-11-20 18:05:21 +01:00
Andrew Janke
c8e280f2ab dircycle: remove redundant key bindings
In bindkey strings, "^[" and "\e" mean the same thing. They're both notations for Escape.
2015-11-18 07:02:22 -05:00
Andrew Janke
8ea773582f vi-mode: remove line-init/finish widgets that broken terminfo keybindings
The zle-line-init and zle-line-finish definitions here were broken with
respect to smkx/rmkx because their "if" logic had fallthrough where it shouldn't,
so the mode was left in rmkx all the time. This just removes those widgets
entirely, because they're now defined (correctly) in lib/keybindings.zsh and
not needed in plugins.
2015-11-18 06:06:20 -05:00
Ahmad Awais
8f823c6371 Update README.md 2015-11-17 12:23:39 +05:00
Andrew Janke
cca422eacf Mercurial plugin: revise README
Closes #4616
Changes the `plugins=(... mercurial ...)` to be closer to correct zsh syntax, removing commas and extra spaces.
Revises discussion on configuring themes to avoid sounding like users should modify the theme definition file in the main OMZ folder. Prioritizes the suggestion of using a theme which already supports hg_prompt_info.
2015-11-16 16:57:42 -05:00
Ahmad Awais
602cc62a5d Removed Similar Aliases
Two similar aliases which were causing issues.
2015-11-16 23:37:02 +05:00
Denis
bee79f0871 bundle outdated alias 2015-11-16 01:33:20 +03:00
Andrew Janke
24492a2fdb Update github plugin to work with current hub versions
Removes old completion setup that breaks with current _git and _hub completions.
Ruby is no longer required by hub; removes that test.
Does not define new completions for hub; they are now defined by hub itself.
Change the functions to use hub to create the repos on GitHub.
Add error checking to the functions.
Removes apparently-unused _github completion definition.
2015-11-06 04:10:33 -05:00
Eduardo San Martin Morote
d3363964a2 Updated z version
Closes #3248
Closes #4570
2015-11-04 16:23:48 +01:00
Alberto Gireud
f6557932e9 Add OSX support for command-not-found 2015-11-02 01:32:15 -06:00
Sebastian Gniazdowski
4c292ea2b0 Initial commit of Zsh Navigation Tools 2015-11-01 16:10:55 +01:00
Daniel Hahler
9e4aba4c8c archlinux: use $+commands instead of 'command -v' in a subshell 2015-11-01 00:21:26 +01:00
Danny Hawkins
8d388e464c use capit instead of shipit as shipit conflicts with npm package shipit 2015-10-30 08:11:38 +00:00
Cooper Maruyama
9264d75d5d Fix typo.
* `cfp` alias was referencing an old version of the `cf` command which
no longer exists. This has been updated to reference a valid command.
2015-10-21 17:08:20 +02:00
Marc Cornellà
405ee83af4 Merge pull request #4500 from sachin21/modify_a_condition
[FIX ERROR] Refactor for function in plugins/rake-fast/rake-fast.plugin.zsh
2015-10-21 16:52:32 +02:00
Satoshi Ohmori
a1755e652c Refactor for method in plugins/rake-fast/rake-fast.plugin.zsh 2015-10-21 23:36:36 +09:00
evanandrewrose
fe02e027fe Fix "be" -> "b" typo in coffee plugin README.md. 2015-10-20 23:43:11 +02:00
Marc Cornellà
e0c9ada380 Merge pull request #4214 from queria/chuck-linefix
chucknorris: add missing line/quote delimiters
2015-10-20 23:05:12 +02:00
Marc Cornellà
a7b4c09373 Merge pull request #4526 from sachin21/fix_typo
[FIX #4525]: Fix typo
2015-10-20 12:54:10 +02:00
Satoshi Ohmori
2c8697b934 [FIX #4525]: Fix typo 2015-10-20 18:45:41 +09:00
Superbil
2c54428d6e
Fixd bug for pyenv plugin
Check pyenv-virtualenv can eval before use it.

Signed-off-by: Superbil <superbil@gmail.com>
2015-10-19 15:13:06 +08:00
Gustavo Villa
e5164d7b70 Add 'rake stats' alias. 2015-10-15 16:14:54 -03:00
Arvind Chembarpu
8a362b2b1f Enable pyenv rehash 2015-10-15 08:44:15 +05:30
Arvind Chembarpu
8a95cedc3b Init pyenv virtualenvs too 2015-10-15 08:43:40 +05:30
Robby Russell
306e3e7ea0 Merge pull request #4459 from Scuilion/update-gradle-commands
Gradle Plugin: Update Gradle Commands
2015-10-13 18:09:51 -07:00
Gustavo Villa
b18d386d7f Add option '--port' to 'rails server' alias. 2015-10-12 04:32:22 -03:00
Robby Russell
57c2ac1e60 Merge pull request #4482 from sachin21/add_an_alias_for_upstream
Add an alias for upstream
2015-10-10 07:12:21 -07:00
Robby Russell
ff1bd952a7 Merge pull request #4480 from volcov/master
add alias to sort by version
2015-10-10 07:11:39 -07:00
Satoshi Ohmori
7597bf805e Add an alias for upstream 2015-10-10 11:51:33 +09:00
Andrew Janke
2d0e7fbdad autoenv: actually source autoenv once located
Fixes bug introduced in #4440
2015-10-09 20:35:19 -04:00
Bruno Volcov
252078dd6c add alias to sort by version 2015-10-09 18:47:48 -03:00
Robby Russell
2522ab4504 Merge pull request #4204 from DoctorJellyface/patch-1
Added --now systemd aliases
2015-10-09 07:19:54 -07:00
Robby Russell
0be21f025e Merge pull request #4440 from apjanke/autoenv-homebrew
autoenv: support homebrew-installed autoenv
2015-10-09 07:18:02 -07:00
Robby Russell
dc06e96e9c Merge pull request #4254 from apjanke/copyfile-portability
Cross-platform clipboard clipcopy() and clippaste()
2015-10-09 07:15:53 -07:00
Robby Russell
b1173d4b30 Merge pull request #4418 from Gnouc/master
Encode64 Plugin - Fix wrong `echo` usage
2015-10-09 07:15:20 -07:00
Robby Russell
bb509dda23 Renaming colored-man to colored-man-pages because it needs to be. 2015-10-09 07:07:57 -07:00
Robby Russell
f3fa41834d Merge branch 'master' of github.com:robbyrussell/oh-my-zsh 2015-10-05 13:46:26 -07:00
Robby Russell
d26549b7ec Removing legacy rails-specific aliases from the Textmate plugin. This is probably best handled as a custom plugin. 2015-10-05 13:46:20 -07:00
Giordano Vicari
ee8f3771e9 Added support to subtask through gulp --tasks-simple command 2015-10-05 19:44:00 +02:00
Robby Russell
62c86f5c75 Merge pull request #4444 from apjanke/git-extras-compatibility
git-extras: fix for compatibility with zsh _git
2015-10-05 07:50:08 -07:00
Andrew Janke
b6d78df62c clip*: add xsel support 2015-10-05 05:13:11 -04:00
Kevin O'Neal
a95473919a Update Gradle Commands 2015-10-04 17:05:28 -05:00
Robby Russell
920ab071cb Merge pull request #4423 from gfvcastro/alias-rake-middleware
Add 'rake middleware' alias.
2015-10-03 14:37:29 -07:00
Robby Russell
bff88685b8 Merge pull request #4429 from RobLoach/removeatom
Remove Atom plugin
2015-10-03 14:36:14 -07:00
Robby Russell
867d586253 Merge pull request #4445 from wweaver/git-hf-aliases
Add Git Hubflow aliases
2015-10-03 14:34:20 -07:00
Robby Russell
80179c10be Merge pull request #4453 from uberspot/master
Add 3 more nmap aliases to nmap plugin
2015-10-03 14:33:35 -07:00
Robby Russell
30c7ef7d2b Merge pull request #4421 from jcpst/master
gulp plugin: missing opening double quote
2015-10-03 14:32:40 -07:00
Robby Russell
bd264980a5 Merge pull request #4424 from Gutem/patch-1
Update Simulator's Path to XCode 7.x
2015-10-03 14:32:12 -07:00
uberspot
df5e1f9c2c Add 3 more nmap aliases to nmap plugin 2015-10-03 19:37:12 +02:00
Victor Torres
d49cacfb7b Add branch plugin 2015-10-02 23:16:56 -03:00
Will Weaver
b35d78f2f8 Add Git Hubflow aliases 2015-10-02 08:14:06 -04:00
Andrew Janke
7f2656c126 git-extras: fix for compatibility with zsh _git
This changes all the __git_* functions it was defining to __gitex_* to avoid collisions with the internal functions used inside _git from zsh.
2015-10-02 03:18:28 -04:00
Andrew Janke
c146853a5e autoenv: also look in the Homebrew installation location for it 2015-10-01 19:29:59 -04:00
Andrew Janke
56b747aa89 Merge branch 'autoenv-check' of github.com:kudos/oh-my-zsh into autoenv-homebrew 2015-10-01 19:20:34 -04:00
Xavier Haniquaut
f9c16f940e Remove broken link and move npmg alias position 2015-09-30 16:42:46 +02:00
Rob Loach
0516a39dec Remove Atom plugin
The Atom plugin is obsolete.

See #3193
2015-09-29 12:16:18 -04:00
Xavier Haniquaut
df80081e9b Add alias for npm global install 2015-09-29 10:20:55 +02:00
Gutem
1e305e0186 Update Simulator's Path to XCode 7.x 2015-09-28 16:04:25 -03:00
Gustavo Villa
3e04cd62d3 Add 'rake middleware' alias. 2015-09-28 14:59:06 -03:00
Joseph Post
5af52fbc75 gulp plugin: missing opening double quote & had unneeded parens on function 2015-09-28 10:50:35 -05:00
Andrew Janke
e4fdb08365 Merge branch 'master' into copyfile-portability 2015-09-28 08:52:03 -04:00
LE Manh Cuong
758195cb79 Encode64 Plugin - Fix wrong echo usage
Currently, encode64 plugin using `echo -n` to print the content
of $1 variable. This approach will not work with arbitrary data,
which contains sequence of escaped characters, since when many
`echo` implementation will expand them.

This commit chage the usage to `printf`, which is builtin in all
POSIX shells and can print arbitrary data reliability.
2015-09-28 16:05:22 +07:00
Tyler Charlesworth
2266368b77 Update sublime.plugin.zsh 2015-09-27 16:51:38 -07:00
Robby Russell
b05ef1034f Merge pull request #4121 from apjanke/chucknorris-check-for-fortune
chucknorris: check for fortune/strfile dependency
2015-09-27 12:42:38 -07:00
Robby Russell
a51a9169a9 Merge pull request #4348 from andybateman/patch-1
Display song currently playing in iTunes
2015-09-27 12:40:31 -07:00
Robby Russell
9e291033d9 Merge pull request #4394 from PrestanceDesign/new-git-alias
Add alias for print latest tag name
2015-09-27 12:39:51 -07:00
Robby Russell
156fa5fa10 Merge pull request #4396 from TylerCharlesworth/patch-1
Adds Cygwin support to Sublime
2015-09-27 12:39:27 -07:00
Robby Russell
b75b0b8882 Merge pull request #4333 from mbologna/fedora_plugin
Added fedora plugin, based on dnf/yum plugin
2015-09-26 09:37:24 -07:00
Robby Russell
d47219fbce Merge pull request #4397 from vidakovic/master
Accept single and double quotes in Gulp plugin
2015-09-26 09:34:25 -07:00
Robby Russell
c932eb3f04 Merge pull request #4385 from Philosoft/patch-1
Update README.md for vi-mode
2015-09-26 09:33:33 -07:00
Robby Russell
4204cfd22f Merge pull request #4408 from DoomHammer/fix-chruby-test-expression
Fix invalid test expression.
2015-09-26 09:30:54 -07:00
Robby Russell
a97a308604 Merge pull request #4349 from FishingCactus/fix-atom_plugin_for_cygwin
Fixed atom plugin for cygwin users
2015-09-26 09:29:53 -07:00
Piotr Gaczkowski
17088c6431 Fix invalid test expression. 2015-09-25 22:53:40 +02:00
Aleksandar Vidakovic
0c0450b303 Accept single and double quotes in Gulp plugin 2015-09-24 11:51:15 +01:00
Tyler Charlesworth
07f08aa731 Adds Cygwin support 2015-09-24 01:25:22 -07:00
Michael SALIHI
8e74f7c1aa Add alias for print latest tag name 2015-09-24 02:22:50 +02:00
Alexander Frolov
e957ae4135 Update README.md 2015-09-23 09:54:22 +03:00
Chris McCuller
e6ccd37b05 Merge master (rebase being super annoying). Fix conflicts 2015-09-21 22:19:15 -04:00
Andy Bateman
326c2b0859 Replaced the use of 'print' with 'echo' in order to sanitise track and artist names
Fixed indentation

Fixed indentation
2015-09-22 08:15:31 +12:00
Andy Bateman
993e09cc6b Added function for 'itunes playing' to display state when not playing 2015-09-22 08:15:31 +12:00
Andy Bateman
9f2acdc445 You can now use 'itunes status' as well as 'itunes playing' to show current track 2015-09-22 08:15:31 +12:00
Andy Bateman
29db0e0119 Fixed colourisation of Now Playing function 2015-09-22 08:15:31 +12:00
Andy Bateman
a746e6010a Update osx.plugin.zsh
Added function to display the song you're currently listening to in iTunes

Fixed indent

Indentation on line 169 was squiffy

Fixed spelling

Removed unnecessary wording to make function more succinct.

Highlighting of Artist and Track

Changed the highlighting of the Track and Artist in yellow to make use of Prompt Expansion Colors
2015-09-22 08:15:22 +12:00
Michael SALIHI
1bb2715b22 Fix capistrano problem when generating autocompletion 2015-09-21 13:17:45 +02:00
Ramses Ladlani
f8502965e4 Added cygwin support to atom plugin 2015-09-21 09:18:43 +02:00
Robby Russell
cbc1a0806e Merge pull request #4342 from robobenklein/patch-1
Fix Atom Plugin for Linux Users
2015-09-19 09:39:13 -07:00
Robby Russell
25f2d59048 Merge pull request #4353 from dzotokan/feat/stackPlugin
Add Haskell Stack commands list
2015-09-19 09:38:48 -07:00
Robby Russell
4d65dd2404 Merge pull request #4310 from ablyler/add-codeclimate-plugin
Add codeclimate autocomplete plugin
2015-09-19 09:29:04 -07:00
Robby Russell
e268ef3a80 Merge pull request #4320 from ixti/fix/aws-plugin-rprompt-pollution
Fix aws plugin RPROMPT pollution
2015-09-19 09:23:18 -07:00
Robby Russell
b29095fe68 Merge pull request #4354 from henrikhodne/patch-1
chruby: donʼt try to execute .sh files before loading
2015-09-19 09:22:14 -07:00
Robby Russell
c4d84f1b77 Merge pull request #4343 from apjanke/jira-readme
jira: add README.md
2015-09-19 09:20:04 -07:00
Robby Russell
ce104579a8 Merge pull request #4370 from afh/pull/emotty_plugin
Add emotty plugin
2015-09-19 09:17:36 -07:00
Robby Russell
2dc980c8c0 Merge pull request #4331 from icholy/master
golang: improve go doc completion
2015-09-19 09:06:16 -07:00
Robby Russell
db14538853 Merge pull request #4315 from mbologna/fancy-ctrl-z
Added Fancy-ctrl-z plugin
2015-09-19 09:04:30 -07:00
Robby Russell
3b29132214 Merge pull request #4300 from igordejanovic/vim-escape-fname
[vim-interaction plugin] Escape special chars in filenames.
2015-09-19 09:04:17 -07:00
Robby Russell
cfba05cf9d Merge pull request #4282 from ferenczy/master
Added missing commands to Vagrant plugin
2015-09-19 09:03:40 -07:00
Robby Russell
ff3e0d530c Merge pull request #4266 from t413/master
Bring bgnotify plugin up to date with t413/zsh-background-notify
2015-09-19 09:03:29 -07:00
Robby Russell
4f1caf0955 Merge pull request #4237 from mcornella/fix-taskwarrior-plugin
Fix taskwarrior plugin
2015-09-19 09:01:28 -07:00
Robby Russell
6eb6017b3c Merge pull request #4235 from mcornella/fix-xcode-plugin
Fix xcode plugin
2015-09-19 09:01:16 -07:00
Robby Russell
1e49dfcd15 Merge pull request #4209 from ah450/npm-exec
Adds npmE alias
2015-09-19 09:00:54 -07:00
Robby Russell
075655563f Merge pull request #4201 from wkentaro/gnu-utils-findutils
gnu-utils: add findutils (find,xargs,locate)
2015-09-19 09:00:41 -07:00
Robby Russell
681c42ac46 Merge pull request #4154 from sfragis/toggle-sudo
Esc-esc toggles sudo
2015-09-19 08:59:29 -07:00
Robby Russell
f7c24e1808 Merge pull request #4137 from troter/coffee-first-argument-with-double-quote
coffee: protect args with double-quote
2015-09-19 08:59:13 -07:00
Robby Russell
544eccb5dd Fixing conflict in rails plugin merge with rake test shortcut 2015-09-19 08:58:24 -07:00
Robby Russell
04c8acf5de Merge branch 'rails-rake-test' of https://github.com/skv-headless/oh-my-zsh into skv-headless-rails-rake-test 2015-09-19 08:55:13 -07:00
Robby Russell
fb0776e1be Merge pull request #4134 from boddhisattva/rails-rake-routes-alias
Adds an alias to search for the rails routes that pattern match a string
2015-09-19 08:54:07 -07:00
Robby Russell
dde5540b1e Merge pull request #4093 from apjanke/osx-fix-tab-for-iterm
osx: fix tab() functions so the cd works in iTerm2, and status/output are better
2015-09-19 08:52:23 -07:00
Robby Russell
763bf6374c Merge pull request #3971 from moul/pr-scaleway
Support for 'scw' command (Scaleway CLI)
2015-09-19 08:51:21 -07:00
Robby Russell
baf1aa13cb Merge pull request #3661 from ericbottard/GradleWrapperFix
Fix invocation of gradlew
2015-09-19 08:48:41 -07:00
Robby Russell
3c782f78f1 Merge pull request #3582 from apjanke/fold-terminalapp-plugin-into-termsupport
Fold terminalapp plugin in to lib/termsupport
2015-09-19 08:48:03 -07:00
Robby Russell
4bd6c43cfb Merge pull request #3408 from spacewander/git-extras
update git-extras plugin
2015-09-19 08:47:13 -07:00
Robby Russell
93c6b5deb8 Merge pull request #3078 from akoenig/gulpjs
gulp.js plugin
2015-09-19 08:46:49 -07:00
Robby Russell
cc53e4cb99 Merge pull request #2471 from phstc/capistrano-multistage
Adds support to capistrano multistage completion
2015-09-19 08:45:43 -07:00
Alexis Hildebrandt
dce052dac0 Add emotty plugin
which displays an emoji for the current $TTY.
2015-09-18 14:24:46 +02:00
Henrik Hodne
8c5b948162 chruby: donʼt try to execute .sh files before loading 2015-09-16 15:28:08 +02:00
Daniel Stankevich
bb10ad0a13 Remove unnecessary sandbox fn 2015-09-16 17:25:39 +10:00
Daniel Stankevich
a8a8bc3967 Add simple Stack commands list 2015-09-16 17:18:27 +10:00
Tim O'Brien
e8639c700e Update to current robbyrussell/oh-my-zsh master 2015-09-14 15:39:18 -07:00
Tim O'Brien
797e1f9a64 [plugins/bgnotify] fix for iTerm2 notification clicks 2015-09-14 15:32:50 -07:00
Andrew Janke
c9af79fcad jira: add README, "emulate -L zsh", add "dumpconfig" action
(The "dumpconfig" action is for verifying the configuration behavior against what's documented in the README now.)
add "error" to some of the error messages
2015-09-11 18:37:39 -04:00
Andrew Janke
6642a99fac xcode: extend xcselv to list versions and do completion 2015-09-11 21:06:18 +02:00
Ilia Choly
22287d0153 handle multiple paths in GOPATH 2015-09-11 12:27:22 -04:00
Andrew Janke
36fea45bfc svn plugin: urldecode repo info
The repo location reported by `svn` is a URL. If you don't decode it before using it a prompt, the `%` sequences will be misinterpreted by prompt expansion and give screwy results.
Fixes #2233
2015-09-11 03:11:01 -04:00
Ben Klein
dca429557a Make Readme much clearer and explain edits.
Also added some examples, but those should be mostly self-explanatory.
2015-09-10 22:22:00 -04:00
Ben Klein
953e4d8926 Make Linux compatible
Just an if/else to determine if we're OSX or Linux and alias `at` appropriately.
2015-09-10 22:19:53 -04:00
Ilia Choly
9e9b790fe1 golang: improve go doc completion 2015-09-09 10:59:29 -04:00
Michele Bologna
6170fa41d9 Added fedora plugin, based on dnf/yum plugin 2015-09-09 11:42:56 +02:00
Marc Cornellà
82ae41ca4c Reorder xcode plugin file 2015-09-07 12:09:08 +02:00
Marc Cornellà
213f46a296 Add xcselv documentation in the README 2015-09-07 12:08:50 +02:00
Andrew Janke
5584aa05c7 xcode: add version-based xcselv() 2015-09-07 11:50:45 +02:00
Juraj Fiala
86d881c47d Added aliases for --now commands
Also removed the old sc-launch alias because this is just better.
2015-09-06 13:01:09 +02:00
Marc Cornellà
d95589d4e4 Add README for the xcode plugin 2015-09-05 23:17:38 +02:00
Marc Cornellà
ec3694c788 Make simulator dependant of currently active dev directory
This also gets rid of `xcode-select` command-not-found errors.
2015-09-05 22:47:52 +02:00
Marc Cornellà
24bdd8e29a Replace xcsel function with just an alias 2015-09-05 22:47:52 +02:00
Marc Cornellà
6a830f39b6 Return error if no xcode files where found 2015-09-05 22:47:52 +02:00
Marc Cornellà
cbdad588e6 Use zsh globbing instead of ls + grep in xc function
Uses zsh arrays and globbing to find .xcworkspace and .xcodeproj files.
2015-09-05 22:47:52 +02:00
Marc Cornellà
38d25a3359 Update taskwarrior completion to latest version (Jul 26 2015)
See relevant commit at:
https://git.tasktools.org/projects/TM/repos/task/commits/3158883dc4d251
2015-09-05 22:47:51 +02:00
Marc Cornellà
75844fe1a1 Put relevant documentation into README file 2015-09-05 22:47:51 +02:00
Alexey V Zapparov
7a63ccabf6 Fix aws plugin RPROMPT pollution 2015-09-04 21:18:32 +02:00
Andrew Janke
93b4a6c02e Merge branch 'master' into osx-fix-tab-for-iterm
Conflicts:
	plugins/osx/osx.plugin.zsh
2015-09-03 13:05:24 -04:00
Pablo Cantero
c7d782f1ab Add the update from @mtwentyman https://github.com/phstc/dotfiles/pull/1
to make it work for older versions of capistrano
2015-09-03 13:39:41 -03:00
Chris McCuller
30ef856648 Fix maintainer line 2015-09-03 09:47:02 -04:00
Michele Bologna
9a7b2d7ffb Moved comments and credits from source to README 2015-09-03 08:55:03 +02:00
Michele Bologna
6d7c39a2ae Added fancy-ctrl-z plugin
Use Ctrl-Z to switch back to Vim
I frequently need to execute random command in my shell. To achieve it I pause
Vim by pressing Ctrl-z, type command and press fg<Enter> to switch back to Vim.

The fg part really hurts me. I just wanted to hit Ctrl-z once again to get back
to Vim.
I could not find a solution, so I developed one on my own that works wonderfully
with ZSH.

Source: http://sheerun.net/2014/03/21/how-to-boost-your-vim-productivity/
2015-09-02 21:00:36 +02:00
Eric Bottard
ef4a315630 Fix invocation of gradlew 2015-09-02 20:17:03 +02:00
Andy Blyler
b08431ff74 Add codeclimate autocomplete plugin 2015-09-01 23:08:41 -04:00
Marc Cornellà
c481c62bc9 Refactor and clear up README file 2015-09-02 00:26:16 +02:00
Marc Cornellà
d982e1200f Reorder alias definitions 2015-09-02 00:26:15 +02:00
Marc Cornellà
663ac56d54 Prettify frontend help output and clean up logic 2015-09-02 00:26:14 +02:00
willmendesneto
ff706f3ef8 Add "help" method in "frontend-search" plugin 2015-09-02 00:26:13 +02:00
Marc Cornellà
f1472f1f64 Simplify frontend-search function with assoc array
Also adds the lodash URL (which was missing) and uses https on those websites
that support it.
2015-09-02 00:26:11 +02:00
Marc Cornellà
7f64092361 [vim-interaction plugin] Escaping special chars in file names and simplifying code. 2015-09-01 19:07:49 +02:00
Robby Russell
0532860c61 Merge pull request #4285 from nmaggioni/master
'ip' command compatibility and much quicker external IP detection
2015-08-31 22:21:25 -07:00
Robby Russell
7366b5677e Merge pull request #4268 from ZhengzhongZhang/patch-1
Plugin vundle: update link
2015-08-31 22:20:53 -07:00
kyleheyne
022a060ec7 thefuck-alias -> thefuck --alias
Per warning message.
2015-08-31 17:36:41 -04:00
Robby Russell
ba5fd57c1f Merge pull request #3989 from eubenesa/master
Updates to ember-cli plugin
2015-08-30 22:14:25 -07:00
Robby Russell
a77e23a0f9 Merge pull request #4109 from zhiyelee/patch-1
add git alias `gcam` -  git commit -am
2015-08-30 21:52:07 -07:00
Robby Russell
da6ece4ec9 Merge pull request #4117 from nextgenthemes/patch-1
Adds agar = apt-get autoremove
2015-08-30 21:51:50 -07:00
Robby Russell
eb12ec1dc8 Merge pull request #4146 from perobertson/heroku-help
[heroku] add '--help' as an option to commands
2015-08-30 21:50:22 -07:00
Robby Russell
ac85faa262 Merge pull request #4171 from linux-china/master
Spring Boot Plugin
2015-08-30 21:49:51 -07:00
Robby Russell
c1bff7798a Merge pull request #4195 from jerryling315/master
Add 'man' plugin.
2015-08-30 21:49:07 -07:00
Robby Russell
3f95377676 Merge pull request #4198 from matjack1/gclean-gpristine
git plugin: make gclean safer, introduce gpristine
2015-08-30 21:48:36 -07:00
Robby Russell
daabe2a008 Merge pull request #4205 from mcornella/fix-git-prompt-plugin
Fix git-prompt plugin
2015-08-30 21:48:14 -07:00
Robby Russell
c10d5c8b7c Merge pull request #4244 from Gnouc/master
Emoji plugin - Fix wrong string comparison
2015-08-30 21:47:42 -07:00
Robby Russell
69a17150ad Merge pull request #4239 from yous/fix-linux-gems
rvm plugin: Fix `gems` to work on Linux machine
2015-08-30 21:47:26 -07:00
Robby Russell
adff369c05 Merge pull request #4220 from andytank123/master
Add support for Docker images from custom registries
2015-08-30 21:47:09 -07:00
Robby Russell
2f6d85d64e Merge pull request #4248 from gabetax/rbenv_plugin_load_performance
reduce rbenv plugin load time by 150ms by removing additional brew call
2015-08-30 21:42:35 -07:00
Robby Russell
51c3ab7d76 Merge pull request #4283 from hanschen/master
Update autojump plugin for latest brew installation
2015-08-30 21:42:00 -07:00
Robby Russell
14e1f0c6d8 Merge pull request #4286 from RobinDaugherty/rand-quote-failure
Rand-quote plugin overflows stack when site is unreachable
2015-08-30 21:40:26 -07:00
Robby Russell
9c9699dcf5 Merge pull request #4250 from mcornella/fix-divide-by-zero-emoji
Fix divide by zero in emoji plugin
2015-08-30 21:38:09 -07:00
Robby Russell
6346cc9ba9 Merge pull request #4260 from fgibaux/patch-1
plugin symfony2 sf2.7 compatibility fix
2015-08-30 21:36:46 -07:00
Robby Russell
c084a13df2 Merge pull request #4259 from apjanke/jira-prefix-and-help-and-stuff
jira: prefix variable dashboard, default action, and completion
2015-08-30 21:36:06 -07:00
Robby Russell
e59f4cb14f Merge pull request #4271 from loctauxphilippe/patch-1
added apt-get autoremove in ubuntu plugin
2015-08-30 21:35:18 -07:00
Robby Russell
50d329450e Merge pull request #4289 from moonfruit/master
Remove redundant semicolon
2015-08-30 21:33:26 -07:00
Robby Russell
869b1046a4 Merge pull request #4292 from cxbig/master
improved alias conflict between git flow & git fetch
2015-08-30 21:32:45 -07:00
Robby Russell
a7aed69d02 Merge pull request #4170 from black-roland/master
The Fuck plugin (https://github.com/nvbn/thefuck)
2015-08-30 09:12:07 -07:00
Will Mendes
0a80889848 Frontend-search: add search in npm website 2015-08-29 11:48:28 -03:00
cxbig
acf6039ff3 improved alias conflict between git flow & git fetch 2015-08-29 01:35:41 +02:00
MoonFruit
0a2c31fb60 Remove redundant semicolon
Remove redundant semicolon to make tab() works better in ITerm 2.
2015-08-28 10:46:45 +08:00
Niccolò Maggioni
d923cebdb3
Updated with @mcornella suggestions 2015-08-27 11:34:53 +02:00
Robin Daugherty
96aefd2b98 Remove code, not comment it out
Gaaah.
2015-08-26 14:12:42 -04:00
Robin Daugherty
241be2d28b Fix rand-quote failure when site is unreachable
This plugin was designed so that if there is any failure, it will simply call itself recursively. Which means that if you were working offline, if `quote` was called in your `.zshrc`, you would be unable to open a new terminal session.

I fixed this by allowing the plugin to output nothing if a quote could not be fetched.
2015-08-26 13:24:59 -04:00
Niccolò Maggioni
058bbe4f02
General compatibility 2015-08-26 10:54:08 +02:00
Niccolò Maggioni
a127c4f88e
'ip' command compatibility and much quicker external IP detection 2015-08-26 10:48:01 +02:00
Hans Chen
1bf5c587a5 Update autojump plugin for latest brew installation 2015-08-25 17:05:28 -04:00
Dawid Ferenczy
76f4871d4e Added missing commands to Vagrant plugin, updated commands description 2015-08-25 18:07:47 +02:00
Philippe Loctaux
aaf5c8f43f added apt-get autoremove in ubuntu plugin
I use that command a lot of times, and there's no shortcut for that.
Now it does :)
2015-08-21 16:05:54 +02:00
章正中
1aeebf60a0 Update link 2015-08-21 14:28:03 +08:00
Tim O'Brien
7c31c7a963 Bring bgnotify plugin up to date with t413/zsh-background-notify
Changes include:
- time format now shows h/m/s (only when needed!)
- adds hooks only for interactive connections
- adds specific kde support (via kdialog)
- adds click-action for OS X terminals
2015-08-19 22:33:41 -07:00
fgibaux
a9daea17d8 plugin symfony2 sf2.7 compatibility fix
with symfony 2.7 command group titles are listed as commands. this commit prevents it.
2015-08-18 14:19:40 +02:00
Andrew Janke
dc42e8d488 jira: add completion 2015-08-18 05:05:54 -04:00
Andrew Janke
7cf892ecaa Add dashboard support and default-action configuration.
Some refactoring.
2015-08-18 04:49:10 -04:00
Andrew Janke
ee4a423da5 Merge branch 'pr-4158' into jira-prefix-and-help-and-stuff 2015-08-18 04:12:35 -04:00
Andrew Janke
caf667fb30 Merge branch PR 4132 into jira-prefix-and-help-and-stuff 2015-08-18 04:10:56 -04:00
Andrew Janke
5c8b0cc0c1 Add clipcopy() and clippaste() generic cross-platform CLI clipboard functions.
Change copydir, copyfile, and coffee plugins to use them, instead of the Mac-only `pbcopy` command.
2015-08-18 03:49:51 -04:00
Andrew Janke
00eb465830 Merge branch 'master' into fold-terminalapp-plugin-into-termsupport 2015-08-17 20:59:39 -04:00
Andrew Janke
96c34cebae Add a deprecation comment. 2015-08-17 20:51:41 -04:00
Kentaro Wada
c4ba3065a1 Show tag name when detached status if possible 2015-08-17 18:22:27 +09:00
Mohnish Jadwani
3f83331c71 removes a trailing white space 2015-08-17 06:23:58 +05:30
Marc Cornellà
be667a24b0 Remove obsolete comment 2015-08-17 01:05:37 +02:00
Marc Cornellà
3c698743fa Clean up gitstatus.py 2015-08-16 23:21:48 +02:00
Kentaro Wada
45473c3a81 Fix for initial or detached status branch info 2015-08-16 23:02:17 +02:00
Marc Cornellà
30bed07e9c Parse UTF-8 output from git status 2015-08-16 23:02:16 +02:00
Kentaro Wada
94007f7db2 git-prompt: collect all git status information by one cmd
This commit uses the `git status --porcelain -b` format to gather the
number of ahead and behind commits related to the remote branch.
2015-08-16 23:02:15 +02:00
Marc Cornellà
6ff53d173b Cleanup of git-prompt plugin file 2015-08-16 23:02:14 +02:00
Marc Cornellà
1d133ff11f Cleanup the rest of gitstatus.py 2015-08-16 23:02:13 +02:00
Marc Cornellà
5642014ff1 Pull in simplified version from @wkentaro
This version uses `git status --porcelain` instead of making
multiple calls to `git status`.
2015-08-16 23:02:12 +02:00
Marc Cornellà
6443626a6b Pull in latest version from olivierverdier/zsh-git-prompt 2015-08-16 23:02:11 +02:00
Marc Cornellà
c6a5f6efb4 Check that list_size value is not zero before division 2015-08-16 22:40:52 +02:00
Marc Cornellà
88243b846a Use right variable name to avoid zero-length array
This fixes the typographic error that always assigned an undefined
array to `$names`, which made `$list_size` = 0 and triggered a
divide by zero error on the next line.
2015-08-16 22:26:33 +02:00
Gabe Martin-Dempesy
daedfcab51 reduce rbenv plugin load time by 150ms by removing additional brew call 2015-08-15 12:54:46 -07:00
Chayoung You
d20c111d78 rvm plugin: Fix gems to work with GNU sed
Fix #1579.
2015-08-15 15:19:02 +09:00
LE Manh Cuong
0238301726 Emoji plugin - Fix wrong string comparison 2015-08-14 09:55:46 +07:00
Robby Russell
192de6bcff Merge pull request #4238 from wubaiqing/master
Add Baidu support to web-search plugin
2015-08-12 21:16:37 -07:00
Robby Russell
1605d8264c Merge pull request #4234 from mcornella/fix-fbterm-autostart
Fix fbterm autostart
2015-08-12 21:16:19 -07:00
Robby Russell
20f536c064 Merge pull request #4228 from mcornella/fix-virtualenvwrapper-quotes
[virtualenvwrapper] Add quotes to support folders with whitespace
2015-08-12 21:14:44 -07:00
Robby Russell
b8dbd9bfba Merge pull request #4217 from mcornella/standard-open-command
Implement and use a standard, cross-platform open command
2015-08-12 21:14:27 -07:00
Robby Russell
4c1eda114d Merge pull request #4216 from gkze/master
Add terraform completion
2015-08-12 21:13:39 -07:00
Robby Russell
e3a01e5af1 Merge pull request #4212 from NAR8789/master
Fix chpwd clobbering in dirhistory and last-working-dir
2015-08-12 21:12:58 -07:00
Robby Russell
45d640baee Merge pull request #4200 from lislon/systemd-patch
Add alias for "systemctl cat" and "systemctl edit"
2015-08-12 21:11:33 -07:00
Robby Russell
8c3d4a9826 Merge pull request #4095 from kd35a/master
Use 'quit all' instead of counting needed quits
2015-08-12 21:10:53 -07:00
Robby Russell
afc36e2710 Merge pull request #2446 from fallwith/emoji_plugin
Emoji plugin
2015-08-12 21:02:46 -07:00
Robby Russell
c45fff1f81 Merge pull request #2367 from andrew-dwyer/n98-magerun
New plugin for the n98-magerun Magento command line tool
2015-08-12 21:01:42 -07:00
Ahmed Hisham Ismail
dcd95dd223 Changes quotes so that path will be set appropriately on multiple runs 2015-08-11 02:56:49 +02:00
wubaiqing
9caa215a2f Add Baidu support to web-search plugin 2015-08-10 11:41:48 +08:00
Marc Cornellà
be10229659 Exit only if the fbterm session closed correctly
This prevents the previous behavior that exitted the zsh session
even if fbterm didn't start correctly.
2015-08-09 22:45:02 +02:00
Marc Cornellà
be5dcb8a59 Check if fbterm is installed and use $TTY variable 2015-08-09 21:55:52 +02:00
Marc Cornellà
ccb0ae5720 Add quotes to support folders with whitespace 2015-08-07 22:45:46 +02:00
Andrew Robertson
c3fbe4d121 Add support for Docker images from custom registries 2015-08-05 19:51:05 +01:00
Manfred Touron
720fb5b68e
Support for 'scw' command (Scaleway CLI) 2015-08-05 14:58:00 +02:00
Ahmed Hisham Ismail
269ae84c9b Removes unnecessary single quotes 2015-08-05 02:49:20 +02:00
Marc Cornellà
b760a10cb2 Use standard open command in fasd and lighthouse plugins 2015-08-05 01:18:42 +02:00
Marc Cornellà
d1d06b5675 Use standard open command in current plugins
Substitutes the current duplicate logic for the standard
and cross-platform function open_command in plugins:

  frontend-search, jira, node, web-search
2015-08-05 00:57:40 +02:00
xiao.fan
cddfc3b038 style fixes 2015-08-04 15:10:18 -07:00
Florin Patan
cf78586f15 Update to latest Terraform release 0.6.1 2015-08-04 21:54:01 +02:00
gkze
7f3e6143ec Add terraform completion 2015-08-04 11:42:28 -07:00
Pavel Sedlák
9c74128406 chucknorris: add missing line/quote delimiters
few quotes were missing the '%' line delimiters,
so some of the quotes were appearing at once merged together
2015-08-04 16:01:12 +02:00
xiao
aac5523629 Additional chpwd clobbering fix for dirpersist 2015-08-03 22:58:29 -07:00
xiao
084792b829 Don't clobber chpwd 2015-08-03 22:10:24 -07:00
Ahmed Hisham Ismail
e1353fce3c Adds npmE alias
Option to execute a command from node_modules folder
2015-08-03 22:06:33 +02:00