From 1628adebf395ab67c8009703cd2f8721fc650285 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Cornell=C3=A0?= Date: Thu, 17 Jul 2014 13:46:06 +0200 Subject: [PATCH 01/18] Add CONTRIBUTING.md file general structure --- CONTRIBUTING.md | 60 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 CONTRIBUTING.md diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 000000000..5d257e25d --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,60 @@ +# CONTRIBUTING GUIDELINES + +1. [Use the search Luke](#use-the-search-luke) +2. [You have a problem](#you-have-a-problem) +3. [You have a solution](#you-have-a-solution) + +**BONUS:** [You have spare time to volunteer](#you-have-spare-time-to-volunteer) + + +## USE THE SEARCH LUKE + +> May the Force (of past experiences) be with you. + +Trust me, that works 90% of the time. + +You can also take a look at the [FAQ](https://github.com/robbyrussell/oh-my-zsh/wiki/FAQ) +to be sure it hasn't already come up. + +If all fails, your thing hasn't probably been reported yet, so you can go ahead +and read on to the next section. + + +## YOU HAVE A PROBLEM + +See [point 1](#use-the-search-luke). + +If the problem is already reported, comment on the issue so we can know there's +more people with the problem. + +If not, look at the [Troubleshooting](https://github.com/robbyrussell/oh-my-zsh/wiki/Troubleshooting) +page for instructions on how to gather data to better debug your problem. + +Then, you can go ahead and submit an issue with as much detail as you can provide. +We'll do our very best to help you. + +*TODO: fill later* + + +## YOU HAVE A SOLUTION + +See [point 1](#use-the-search-luke). + +If the solution is already reported, try it out and +1 the pull request if the +solution works ok. On the other hand, if you think your solution is better, post +it so we can have both solutions to compare. + +If not, then go ahead and submit a PR. +**Unless your solution is yet another [theme](https://github.com/robbyrussell/oh-my-zsh/wiki/Themes#dont-send-us-your-theme-for-now).** + +*TODO: fill later* + + +---- + +### YOU HAVE SPARE TIME TO VOLUNTEER + +Very nice!! :) + +Please have a look at the [Volunteer](https://github.com/robbyrussell/oh-my-zsh/wiki/Volunteers) +page for instructions on where to start and more. From 001610904fbf0e3c96195187dc34c209e94a83f2 Mon Sep 17 00:00:00 2001 From: ncanceill Date: Tue, 5 May 2015 15:39:02 +0200 Subject: [PATCH 02/18] rewrite of contribution guidelines --- CONTRIBUTING.md | 115 ++++++++++++++++++++++++++++++++++++------------ 1 file changed, 88 insertions(+), 27 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 5d257e25d..d7318709a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,58 +1,119 @@ # CONTRIBUTING GUIDELINES -1. [Use the search Luke](#use-the-search-luke) -2. [You have a problem](#you-have-a-problem) -3. [You have a solution](#you-have-a-solution) +Oh-My-Zsh is a community-driven project. Contribution is welcome, encouraged and appreciated. +It is also essential for the development of the project. -**BONUS:** [You have spare time to volunteer](#you-have-spare-time-to-volunteer) +These guidelines are an attempt at better addressing the brobdingnagian amount of pending +issues and pull requests. Please read them closely. +Foremost, be so kind as to [search](#use-the-search-luke), thus ensuring any contribution +you would make is not already covered. -## USE THE SEARCH LUKE +* [Issues](#reporting-issues) + * [You have a problem](#you-have-a-problem) + * [You have a suggestion](#you-have-a-suggestion) +* [Pull Requests](#submitting-pull-requests) + * [Getting started](#getting-started) + * [You have a solution](#you-have-a-solution) + * [You have an addition](#you-have-an-addition) +* [Information sources (_aka_ search)](#use-the-search-luke) -> May the Force (of past experiences) be with you. +**BONUS:** [Volunteering](#you-have-spare-time-to-volunteer) -Trust me, that works 90% of the time. +## Reporting Issues -You can also take a look at the [FAQ](https://github.com/robbyrussell/oh-my-zsh/wiki/FAQ) -to be sure it hasn't already come up. +### You have a problem -If all fails, your thing hasn't probably been reported yet, so you can go ahead -and read on to the next section. +Please be so kind as to [search](#use-the-search-luke) for any open issue already covering +your problem. - -## YOU HAVE A PROBLEM - -See [point 1](#use-the-search-luke). - -If the problem is already reported, comment on the issue so we can know there's -more people with the problem. +If you find one, comment on it so we can know there are more people experiencing it. If not, look at the [Troubleshooting](https://github.com/robbyrussell/oh-my-zsh/wiki/Troubleshooting) page for instructions on how to gather data to better debug your problem. -Then, you can go ahead and submit an issue with as much detail as you can provide. -We'll do our very best to help you. +Then, you can go ahead and create an issue with as much detail as you can provide. +It should include the data gathered as indicated above, along with: -*TODO: fill later* +1. How to reproduce the problem +2. What the correct behavior should be +3. What the actual behavior is +Please copy to anyone relevant (_eg_ plugin maintainers) by mentioning their GitHub handle +(starting with `@`) in your message. -## YOU HAVE A SOLUTION +We will do our very best to help you. -See [point 1](#use-the-search-luke). +### You have a suggestion + +Please be so kind as to [search](#use-the-search-luke) for any open issue already covering +your suggestion. + +If you find one, comment on it so we can know there are more people supporting it. + +If not, you can go ahead and create an issue. Please copy to anyone relevant (_eg_ plugin +maintainers) by mentioning their GitHub handle (starting with `@`) in your message. + +## Submitting Pull Requests + +### Getting started + +You should be familiar with the basics of +[contributing on GitHub](https://help.github.com/articles/using-pull-requests) and have a fork +[properly set up](https://github.com/robbyrussell/oh-my-zsh/wiki/Contribution-Technical-Practices). + +You MUST always create PRs with _a dedicated branch_ based on the latest upstream tree. + +If you create your own PR, please make sure you do it right. Also be so kind as to reference +any issue that would be solved in the PR description body, +[for instance](https://help.github.com/articles/closing-issues-via-commit-messages/) +_"Fixes #XXXX"_ for issue number XXXX. + +### You have a solution + +Please be so kind as to [search](#use-the-search-luke) for any open issue already covering +your [problem](#you-have-a-problem), and any pending PR covering your solution. If the solution is already reported, try it out and +1 the pull request if the solution works ok. On the other hand, if you think your solution is better, post it so we can have both solutions to compare. -If not, then go ahead and submit a PR. -**Unless your solution is yet another [theme](https://github.com/robbyrussell/oh-my-zsh/wiki/Themes#dont-send-us-your-theme-for-now).** +If not, then go ahead and submit a PR. Please copy to anyone relevant (_eg_ plugin +maintainers) by mentioning their GitHub handle (starting with `@`) in your message. -*TODO: fill later* +### You have an addition +Please [do not](https://github.com/robbyrussell/oh-my-zsh/wiki/Themes#dont-send-us-your-theme-for-now) +send themes for now. + +Please be so kind as to [search](#use-the-search-luke) for any pending PR covering or +related to what you want to add. + +If you find one, try it out and work with the author on a common solution. + +If not, then go ahead and submit a PR. Please copy to anyone relevant (_eg_ plugin +maintainers) by mentioning their GitHub handle (starting with `@`) in your message. ---- -### YOU HAVE SPARE TIME TO VOLUNTEER +## Use the Search, Luke + +> May the Force (of past experiences) be with you + +GitHub offers [many search features](https://help.github.com/articles/searching-github/) +to help you check whether a similar contribution to yours already exists. Please search +before making any contribution, it avoids duplicates and eases maintenance. Trust me, +that works 90% of the time. + +You can also take a look at the [FAQ](https://github.com/robbyrussell/oh-my-zsh/wiki/FAQ) +to be sure your contribution has not already come up. + +If all fails, your thing has probably not been reported yet, so you can go ahead +and [create an issue](#reporting-issues) or [submit a PR](#submitting-pull-requests). + +---- + +### You have spare time to volunteer Very nice!! :) From c7ee8086370bcd6ed6863c090c98011ed4380d85 Mon Sep 17 00:00:00 2001 From: Nicolas Canceill Date: Fri, 8 May 2015 11:17:24 +0200 Subject: [PATCH 03/18] Contributing: simple english, formatting --- CONTRIBUTING.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index d7318709a..827037f4f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -3,10 +3,10 @@ Oh-My-Zsh is a community-driven project. Contribution is welcome, encouraged and appreciated. It is also essential for the development of the project. -These guidelines are an attempt at better addressing the brobdingnagian amount of pending +These guidelines are an attempt at better addressing the huge amount of pending issues and pull requests. Please read them closely. -Foremost, be so kind as to [search](#use-the-search-luke), thus ensuring any contribution +Foremost, be so kind as to [search](#use-the-search-luke). This ensures any contribution you would make is not already covered. * [Issues](#reporting-issues) @@ -98,7 +98,7 @@ maintainers) by mentioning their GitHub handle (starting with `@`) in your messa ## Use the Search, Luke -> May the Force (of past experiences) be with you +_May the Force (of past experiences) be with you_ GitHub offers [many search features](https://help.github.com/articles/searching-github/) to help you check whether a similar contribution to yours already exists. Please search From c51b132a7b5334737177a19dd1fe59c7ff7a7767 Mon Sep 17 00:00:00 2001 From: ncanceill Date: Fri, 8 May 2015 11:33:02 +0200 Subject: [PATCH 04/18] contributing: mention testing --- CONTRIBUTING.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 827037f4f..cbcd75907 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -94,6 +94,8 @@ If you find one, try it out and work with the author on a common solution. If not, then go ahead and submit a PR. Please copy to anyone relevant (_eg_ plugin maintainers) by mentioning their GitHub handle (starting with `@`) in your message. +For any extensive change, _eg_ a new plugin, you will have to find testers to +1 your PR. + ---- ## Use the Search, Luke From 8653f5da6df69a8af59cdbff00765af4129d83e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Cornell=C3=A0?= Date: Wed, 23 Nov 2016 21:21:49 +0100 Subject: [PATCH 05/18] Rename pure theme to 'refined' --- themes/{pure.zsh-theme => refined.zsh-theme} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename themes/{pure.zsh-theme => refined.zsh-theme} (100%) diff --git a/themes/pure.zsh-theme b/themes/refined.zsh-theme similarity index 100% rename from themes/pure.zsh-theme rename to themes/refined.zsh-theme From 72469f06e8cbb81599c0bb7f2c1dc89dc6346197 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Cornell=C3=A0?= Date: Thu, 17 Jul 2014 13:46:06 +0200 Subject: [PATCH 06/18] Add CONTRIBUTING.md file general structure --- CONTRIBUTING.md | 60 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 CONTRIBUTING.md diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 000000000..5d257e25d --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,60 @@ +# CONTRIBUTING GUIDELINES + +1. [Use the search Luke](#use-the-search-luke) +2. [You have a problem](#you-have-a-problem) +3. [You have a solution](#you-have-a-solution) + +**BONUS:** [You have spare time to volunteer](#you-have-spare-time-to-volunteer) + + +## USE THE SEARCH LUKE + +> May the Force (of past experiences) be with you. + +Trust me, that works 90% of the time. + +You can also take a look at the [FAQ](https://github.com/robbyrussell/oh-my-zsh/wiki/FAQ) +to be sure it hasn't already come up. + +If all fails, your thing hasn't probably been reported yet, so you can go ahead +and read on to the next section. + + +## YOU HAVE A PROBLEM + +See [point 1](#use-the-search-luke). + +If the problem is already reported, comment on the issue so we can know there's +more people with the problem. + +If not, look at the [Troubleshooting](https://github.com/robbyrussell/oh-my-zsh/wiki/Troubleshooting) +page for instructions on how to gather data to better debug your problem. + +Then, you can go ahead and submit an issue with as much detail as you can provide. +We'll do our very best to help you. + +*TODO: fill later* + + +## YOU HAVE A SOLUTION + +See [point 1](#use-the-search-luke). + +If the solution is already reported, try it out and +1 the pull request if the +solution works ok. On the other hand, if you think your solution is better, post +it so we can have both solutions to compare. + +If not, then go ahead and submit a PR. +**Unless your solution is yet another [theme](https://github.com/robbyrussell/oh-my-zsh/wiki/Themes#dont-send-us-your-theme-for-now).** + +*TODO: fill later* + + +---- + +### YOU HAVE SPARE TIME TO VOLUNTEER + +Very nice!! :) + +Please have a look at the [Volunteer](https://github.com/robbyrussell/oh-my-zsh/wiki/Volunteers) +page for instructions on where to start and more. From 9e839ab9c018394f686c62f778bf2a19d3c31b92 Mon Sep 17 00:00:00 2001 From: ncanceill Date: Tue, 5 May 2015 15:39:02 +0200 Subject: [PATCH 07/18] rewrite of contribution guidelines --- CONTRIBUTING.md | 115 ++++++++++++++++++++++++++++++++++++------------ 1 file changed, 88 insertions(+), 27 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 5d257e25d..d7318709a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,58 +1,119 @@ # CONTRIBUTING GUIDELINES -1. [Use the search Luke](#use-the-search-luke) -2. [You have a problem](#you-have-a-problem) -3. [You have a solution](#you-have-a-solution) +Oh-My-Zsh is a community-driven project. Contribution is welcome, encouraged and appreciated. +It is also essential for the development of the project. -**BONUS:** [You have spare time to volunteer](#you-have-spare-time-to-volunteer) +These guidelines are an attempt at better addressing the brobdingnagian amount of pending +issues and pull requests. Please read them closely. +Foremost, be so kind as to [search](#use-the-search-luke), thus ensuring any contribution +you would make is not already covered. -## USE THE SEARCH LUKE +* [Issues](#reporting-issues) + * [You have a problem](#you-have-a-problem) + * [You have a suggestion](#you-have-a-suggestion) +* [Pull Requests](#submitting-pull-requests) + * [Getting started](#getting-started) + * [You have a solution](#you-have-a-solution) + * [You have an addition](#you-have-an-addition) +* [Information sources (_aka_ search)](#use-the-search-luke) -> May the Force (of past experiences) be with you. +**BONUS:** [Volunteering](#you-have-spare-time-to-volunteer) -Trust me, that works 90% of the time. +## Reporting Issues -You can also take a look at the [FAQ](https://github.com/robbyrussell/oh-my-zsh/wiki/FAQ) -to be sure it hasn't already come up. +### You have a problem -If all fails, your thing hasn't probably been reported yet, so you can go ahead -and read on to the next section. +Please be so kind as to [search](#use-the-search-luke) for any open issue already covering +your problem. - -## YOU HAVE A PROBLEM - -See [point 1](#use-the-search-luke). - -If the problem is already reported, comment on the issue so we can know there's -more people with the problem. +If you find one, comment on it so we can know there are more people experiencing it. If not, look at the [Troubleshooting](https://github.com/robbyrussell/oh-my-zsh/wiki/Troubleshooting) page for instructions on how to gather data to better debug your problem. -Then, you can go ahead and submit an issue with as much detail as you can provide. -We'll do our very best to help you. +Then, you can go ahead and create an issue with as much detail as you can provide. +It should include the data gathered as indicated above, along with: -*TODO: fill later* +1. How to reproduce the problem +2. What the correct behavior should be +3. What the actual behavior is +Please copy to anyone relevant (_eg_ plugin maintainers) by mentioning their GitHub handle +(starting with `@`) in your message. -## YOU HAVE A SOLUTION +We will do our very best to help you. -See [point 1](#use-the-search-luke). +### You have a suggestion + +Please be so kind as to [search](#use-the-search-luke) for any open issue already covering +your suggestion. + +If you find one, comment on it so we can know there are more people supporting it. + +If not, you can go ahead and create an issue. Please copy to anyone relevant (_eg_ plugin +maintainers) by mentioning their GitHub handle (starting with `@`) in your message. + +## Submitting Pull Requests + +### Getting started + +You should be familiar with the basics of +[contributing on GitHub](https://help.github.com/articles/using-pull-requests) and have a fork +[properly set up](https://github.com/robbyrussell/oh-my-zsh/wiki/Contribution-Technical-Practices). + +You MUST always create PRs with _a dedicated branch_ based on the latest upstream tree. + +If you create your own PR, please make sure you do it right. Also be so kind as to reference +any issue that would be solved in the PR description body, +[for instance](https://help.github.com/articles/closing-issues-via-commit-messages/) +_"Fixes #XXXX"_ for issue number XXXX. + +### You have a solution + +Please be so kind as to [search](#use-the-search-luke) for any open issue already covering +your [problem](#you-have-a-problem), and any pending PR covering your solution. If the solution is already reported, try it out and +1 the pull request if the solution works ok. On the other hand, if you think your solution is better, post it so we can have both solutions to compare. -If not, then go ahead and submit a PR. -**Unless your solution is yet another [theme](https://github.com/robbyrussell/oh-my-zsh/wiki/Themes#dont-send-us-your-theme-for-now).** +If not, then go ahead and submit a PR. Please copy to anyone relevant (_eg_ plugin +maintainers) by mentioning their GitHub handle (starting with `@`) in your message. -*TODO: fill later* +### You have an addition +Please [do not](https://github.com/robbyrussell/oh-my-zsh/wiki/Themes#dont-send-us-your-theme-for-now) +send themes for now. + +Please be so kind as to [search](#use-the-search-luke) for any pending PR covering or +related to what you want to add. + +If you find one, try it out and work with the author on a common solution. + +If not, then go ahead and submit a PR. Please copy to anyone relevant (_eg_ plugin +maintainers) by mentioning their GitHub handle (starting with `@`) in your message. ---- -### YOU HAVE SPARE TIME TO VOLUNTEER +## Use the Search, Luke + +> May the Force (of past experiences) be with you + +GitHub offers [many search features](https://help.github.com/articles/searching-github/) +to help you check whether a similar contribution to yours already exists. Please search +before making any contribution, it avoids duplicates and eases maintenance. Trust me, +that works 90% of the time. + +You can also take a look at the [FAQ](https://github.com/robbyrussell/oh-my-zsh/wiki/FAQ) +to be sure your contribution has not already come up. + +If all fails, your thing has probably not been reported yet, so you can go ahead +and [create an issue](#reporting-issues) or [submit a PR](#submitting-pull-requests). + +---- + +### You have spare time to volunteer Very nice!! :) From eb5229d962509cc23296bed08b52a46159da29fd Mon Sep 17 00:00:00 2001 From: Nicolas Canceill Date: Fri, 8 May 2015 11:17:24 +0200 Subject: [PATCH 08/18] Contributing: simple english, formatting --- CONTRIBUTING.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index d7318709a..827037f4f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -3,10 +3,10 @@ Oh-My-Zsh is a community-driven project. Contribution is welcome, encouraged and appreciated. It is also essential for the development of the project. -These guidelines are an attempt at better addressing the brobdingnagian amount of pending +These guidelines are an attempt at better addressing the huge amount of pending issues and pull requests. Please read them closely. -Foremost, be so kind as to [search](#use-the-search-luke), thus ensuring any contribution +Foremost, be so kind as to [search](#use-the-search-luke). This ensures any contribution you would make is not already covered. * [Issues](#reporting-issues) @@ -98,7 +98,7 @@ maintainers) by mentioning their GitHub handle (starting with `@`) in your messa ## Use the Search, Luke -> May the Force (of past experiences) be with you +_May the Force (of past experiences) be with you_ GitHub offers [many search features](https://help.github.com/articles/searching-github/) to help you check whether a similar contribution to yours already exists. Please search From ae31e8e1f84d4358439db1720c4a0d98484282b4 Mon Sep 17 00:00:00 2001 From: ncanceill Date: Fri, 8 May 2015 11:33:02 +0200 Subject: [PATCH 09/18] contributing: mention testing --- CONTRIBUTING.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 827037f4f..cbcd75907 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -94,6 +94,8 @@ If you find one, try it out and work with the author on a common solution. If not, then go ahead and submit a PR. Please copy to anyone relevant (_eg_ plugin maintainers) by mentioning their GitHub handle (starting with `@`) in your message. +For any extensive change, _eg_ a new plugin, you will have to find testers to +1 your PR. + ---- ## Use the Search, Luke From 5a031ce3e67a0e99b6d043aab6034b0532cec26a Mon Sep 17 00:00:00 2001 From: ncanceill Date: Fri, 16 Oct 2015 23:18:34 +0200 Subject: [PATCH 10/18] contributing: "correct" -> "expected" behavior see https://github.com/robbyrussell/oh-my-zsh/pull/3770#issuecomment-120546525 --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index cbcd75907..cd0d625fa 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -36,7 +36,7 @@ Then, you can go ahead and create an issue with as much detail as you can provid It should include the data gathered as indicated above, along with: 1. How to reproduce the problem -2. What the correct behavior should be +2. What the expected behavior should be 3. What the actual behavior is Please copy to anyone relevant (_eg_ plugin maintainers) by mentioning their GitHub handle From bc2ccdd812cb90d889f14731896c06c3715876a9 Mon Sep 17 00:00:00 2001 From: ncanceill Date: Fri, 16 Oct 2015 23:23:38 +0200 Subject: [PATCH 11/18] contributing: improve PR section --- CONTRIBUTING.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index cd0d625fa..f86acd66e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -72,11 +72,11 @@ _"Fixes #XXXX"_ for issue number XXXX. ### You have a solution Please be so kind as to [search](#use-the-search-luke) for any open issue already covering -your [problem](#you-have-a-problem), and any pending PR covering your solution. +your [problem](#you-have-a-problem), and any pending/merged/rejected PR covering your solution. If the solution is already reported, try it out and +1 the pull request if the solution works ok. On the other hand, if you think your solution is better, post -it so we can have both solutions to compare. +it with a reference to the other one so we can have both solutions to compare. If not, then go ahead and submit a PR. Please copy to anyone relevant (_eg_ plugin maintainers) by mentioning their GitHub handle (starting with `@`) in your message. @@ -86,7 +86,7 @@ maintainers) by mentioning their GitHub handle (starting with `@`) in your messa Please [do not](https://github.com/robbyrussell/oh-my-zsh/wiki/Themes#dont-send-us-your-theme-for-now) send themes for now. -Please be so kind as to [search](#use-the-search-luke) for any pending PR covering or +Please be so kind as to [search](#use-the-search-luke) for any pending/merged/rejected PR covering or related to what you want to add. If you find one, try it out and work with the author on a common solution. From 573df1a8ffa8167e29a8e403a0a0caedac84c972 Mon Sep 17 00:00:00 2001 From: ncanceill Date: Fri, 16 Oct 2015 23:34:34 +0200 Subject: [PATCH 12/18] contributing: "eg" -> "e.g." because oxford see http://www.oxforddictionaries.com/definition/english/e.g. --- CONTRIBUTING.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f86acd66e..c17787041 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -39,7 +39,7 @@ It should include the data gathered as indicated above, along with: 2. What the expected behavior should be 3. What the actual behavior is -Please copy to anyone relevant (_eg_ plugin maintainers) by mentioning their GitHub handle +Please copy to anyone relevant (e.g. plugin maintainers) by mentioning their GitHub handle (starting with `@`) in your message. We will do our very best to help you. @@ -51,7 +51,7 @@ your suggestion. If you find one, comment on it so we can know there are more people supporting it. -If not, you can go ahead and create an issue. Please copy to anyone relevant (_eg_ plugin +If not, you can go ahead and create an issue. Please copy to anyone relevant (e.g. plugin maintainers) by mentioning their GitHub handle (starting with `@`) in your message. ## Submitting Pull Requests @@ -78,7 +78,7 @@ If the solution is already reported, try it out and +1 the pull request if the solution works ok. On the other hand, if you think your solution is better, post it with a reference to the other one so we can have both solutions to compare. -If not, then go ahead and submit a PR. Please copy to anyone relevant (_eg_ plugin +If not, then go ahead and submit a PR. Please copy to anyone relevant (e.g. plugin maintainers) by mentioning their GitHub handle (starting with `@`) in your message. ### You have an addition @@ -91,10 +91,10 @@ related to what you want to add. If you find one, try it out and work with the author on a common solution. -If not, then go ahead and submit a PR. Please copy to anyone relevant (_eg_ plugin +If not, then go ahead and submit a PR. Please copy to anyone relevant (e.g. plugin maintainers) by mentioning their GitHub handle (starting with `@`) in your message. -For any extensive change, _eg_ a new plugin, you will have to find testers to +1 your PR. +For any extensive change, e.g. a new plugin, you will have to find testers to +1 your PR. ---- From b4b55fa502af7b545d04045474d1550d57274c42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elias=20Fr=C3=B6hner?= Date: Thu, 30 Mar 2017 20:46:25 +0200 Subject: [PATCH 13/18] Remove wrong whitespace in bira theme (#5985) The whitespace in line 13 creates a double whitespace when combined with line 24. Therefore 2 whitespaces appear between ${user_host} and ${current_dir}. --- themes/bira.zsh-theme | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/bira.zsh-theme b/themes/bira.zsh-theme index 4b2853c32..29bda0be8 100644 --- a/themes/bira.zsh-theme +++ b/themes/bira.zsh-theme @@ -10,7 +10,7 @@ else local user_symbol='$' fi -local current_dir='%{$terminfo[bold]$fg[blue]%} %~%{$reset_color%}' +local current_dir='%{$terminfo[bold]$fg[blue]%}%~%{$reset_color%}' local rvm_ruby='' if which rvm-prompt &> /dev/null; then rvm_ruby='%{$fg[red]%}‹$(rvm-prompt i v g)›%{$reset_color%}' From aaf7fa007fa05c3c2b0b5fdc983494b7442a6196 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Cornell=C3=A0?= Date: Wed, 23 Nov 2016 22:06:30 +0100 Subject: [PATCH 14/18] Add deprecation notice to pure theme --- themes/pure.zsh-theme | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 themes/pure.zsh-theme diff --git a/themes/pure.zsh-theme b/themes/pure.zsh-theme new file mode 100644 index 000000000..98c1312af --- /dev/null +++ b/themes/pure.zsh-theme @@ -0,0 +1,10 @@ +print -P '%F{yellow}'Oh My Zsh pure theme: +cat <<-EOF + + The pure theme has been renamed as 'refined' as per the original author's + request. Change your ZSH_THEME to 'refined' to avoid seeing this warning. + +EOF +print -P '%f' + +source ${0:h:A}/refined.zsh-theme From 5667161d49b9ddc4ea8de7a379d50fc2cb7ffb50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Cornell=C3=A0?= Date: Fri, 21 Apr 2017 20:18:16 +0200 Subject: [PATCH 15/18] Fix host display in nebirhos theme Fixes #6028 --- themes/nebirhos.zsh-theme | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/nebirhos.zsh-theme b/themes/nebirhos.zsh-theme index a5a226b69..e2424465a 100644 --- a/themes/nebirhos.zsh-theme +++ b/themes/nebirhos.zsh-theme @@ -11,7 +11,7 @@ else fi # Get the host name (first 4 chars) -HOST_PROMPT_="%{$fg_bold[red]%}@$HOST[0,4] ➜ %{$fg_bold[cyan]%}%c " +HOST_PROMPT_="%{$fg_bold[red]%}@$HOST ➜ %{$fg_bold[cyan]%}%c " GIT_PROMPT="%{$fg_bold[blue]%}\$(git_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}" PROMPT="$HOST_PROMPT_$RUBY_PROMPT_$GIT_PROMPT" From 291e96dcd034750fbe7473482508c08833b168e3 Mon Sep 17 00:00:00 2001 From: Vihang Mehta Date: Wed, 3 May 2017 03:06:07 -0700 Subject: [PATCH 16/18] Fix RKJ theme coloring and make it slightly more readable (#5582) --- themes/rkj-repos.zsh-theme | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/themes/rkj-repos.zsh-theme b/themes/rkj-repos.zsh-theme index a3f1f3dfa..ba2a0dba6 100644 --- a/themes/rkj-repos.zsh-theme +++ b/themes/rkj-repos.zsh-theme @@ -23,14 +23,14 @@ function mygit() { if [[ "$(git config --get oh-my-zsh.hide-status)" != "1" ]]; then ref=$(command git symbolic-ref HEAD 2> /dev/null) || \ ref=$(command git rev-parse --short HEAD 2> /dev/null) || return - echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$(git_prompt_short_sha)$( git_prompt_status )%{$reset_color%}$ZSH_THEME_GIT_PROMPT_SUFFIX " + echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$(git_prompt_short_sha)$(git_prompt_status)%{$fg_bold[blue]%}$ZSH_THEME_GIT_PROMPT_SUFFIX " fi } function retcode() {} # alternate prompt with git & hg -PROMPT=$'%{\e[0;34m%}%B┌─[%b%{\e[0m%}%{\e[1;32m%}%n%{\e[1;30m%}@%{\e[0m%}%{\e[0;36m%}%m%{\e[0;34m%}%B]%b%{\e[0m%} - %b%{\e[0;34m%}%B[%b%{\e[1;37m%}%~%{\e[0;34m%}%B]%b%{\e[0m%} - %{\e[0;34m%}%B[%b%{\e[0;33m%}'%D{"%Y-%m-%d %I:%M:%S"}%b$'%{\e[0;34m%}%B]%b%{\e[0m%} -%{\e[0;34m%}%B└─%B[%{\e[1;35m%}%?$(retcode)%{\e[0;34m%}%B] <$(mygit)$(hg_prompt_info)>%{\e[0m%}%b ' +PROMPT=$'%{$fg_bold[blue]%}┌─[%{$fg_bold[green]%}%n%b%{$fg[black]%}@%{$fg[cyan]%}%m%{$fg_bold[blue]%}]%{$reset_color%} - %{$fg_bold[blue]%}[%{$fg_bold[white]%}%~%{$fg_bold[blue]%}]%{$reset_color%} - %{$fg_bold[blue]%}[%b%{$fg[yellow]%}'%D{"%Y-%m-%d %I:%M:%S"}%b$'%{$fg_bold[blue]%}] +%{$fg_bold[blue]%}└─[%{$fg_bold[magenta]%}%?$(retcode)%{$fg_bold[blue]%}] <$(mygit)$(hg_prompt_info)>%{$reset_color%} ' PS2=$' \e[0;34m%}%B>%{\e[0m%}%b ' From 1c958e02a5613a4312534b1afe9f9f8c4a0793c2 Mon Sep 17 00:00:00 2001 From: Tobias Preuss Date: Wed, 7 Jun 2017 23:47:47 +0200 Subject: [PATCH 17/18] Extend list of adb commands. (#5584) --- plugins/adb/_adb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/plugins/adb/_adb b/plugins/adb/_adb index f30f3247f..5f37bedac 100644 --- a/plugins/adb/_adb +++ b/plugins/adb/_adb @@ -13,9 +13,13 @@ _1st_arguments=( 'disconnect:disconnect from a TCP/IP device. Port 5555 is default.' 'emu:run emulator console command' 'forward:forward socket connections' +'get-devpath:print the device path' +'get-serialno:print the serial number of the device' +'get-state:print the current state of the device: offline | bootloader | device' 'help:show the help message' 'install:push this package file to the device and install it' 'jdwp:list PIDs of processes hosting a JDWP transport' +'keygen:generate adb public/private key' 'kill-server:kill the server if it is running' 'logcat:view device log' 'pull:copy file/dir from device' @@ -30,6 +34,7 @@ _1st_arguments=( 'start-server:ensure that there is a server running' 'tcpip:restart host adb in tcpip mode' 'uninstall:remove this app package from the device' +'usb:restart the adbd daemon listing on USB' 'version:show version num' 'wait-for-device:block until device is online' ) From d848c94804918138375041a9f800f401bec12068 Mon Sep 17 00:00:00 2001 From: Mauro Porras P Date: Thu, 22 Jun 2017 13:38:34 -0500 Subject: [PATCH 18/18] Add React Native aliases for logs (#5756) --- plugins/react-native/README.md | 3 +++ plugins/react-native/react-native.plugin.zsh | 3 +++ 2 files changed, 6 insertions(+) diff --git a/plugins/react-native/README.md b/plugins/react-native/README.md index c6fe396b8..980246cf1 100644 --- a/plugins/react-native/README.md +++ b/plugins/react-native/README.md @@ -24,3 +24,6 @@ plugins=(... react-native) | **rnios5s** | `react-native run-ios --simulator "iPhone 5s"` | | **rnios6** | `react-native run-ios --simulator "iPhone 6"` | | **rnios6s** | `react-native run-ios --simulator "iPhone 6s"` | +| _Logging_ | +| **rnland** | `react-native log-android` | +| **rnlios** | `react-native log-ios` | diff --git a/plugins/react-native/react-native.plugin.zsh b/plugins/react-native/react-native.plugin.zsh index 892a31fbe..0566941a1 100644 --- a/plugins/react-native/react-native.plugin.zsh +++ b/plugins/react-native/react-native.plugin.zsh @@ -9,3 +9,6 @@ alias rnios5='react-native run-ios --simulator "iPhone 5"' alias rnios5s='react-native run-ios --simulator "iPhone 5s"' alias rnios6='react-native run-ios --simulator "iPhone 6"' alias rnios6s='react-native run-ios --simulator "iPhone 6s"' + +alias rnland='react-native log-android' +alias rnlios='react-native log-ios'