From 91632ea431b051cc4e1e81a51072a036cd98d644 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= Date: Sat, 28 Mar 2015 16:01:33 +0100 Subject: [PATCH 1/2] Added GitHub for issue tracking to contribution guidelines --- CONTRIBUTING.md | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a872a4593ba..40da55e3f55 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -3,13 +3,15 @@ How to contribute to Dolibarr Bug reports and feature requests -------------------------------- -Issues are tracked at [Doliforge](https://doliforge.org/projects/dolibarr) +** NEW ** -*You need to create an account before being able to use the "Bugs & Tasks" feature.* +Issues are now managed on [GitHub](https://github.com/Dolibarr/dolibarr/Issues). -1. Use the search engine to check if nobody's already reported your problem. -2. Choose the right section. (Bugs or Task and Feature Request). -3. Report with as much detail as possible (Use screenshots or even screencasts whenever possible). +1. Please [use the search engine](https://help.github.com/articles/searching-issues/) to check if nobody's already reported your problem. +2. [Create an issue](https://help.github.com/articles/creating-an-issue). Choose an appropriate title. Prepend appropriately with Bug or Feature Request. +3. Report with as much detail as possible ([Use screenshots or even screencasts whenever possible](https://help.github.com/articles/issue-attachments)). + +We're still figuring out how to migrate old issues to GitHub. In the meantime, they are still available at [Doliforge](https://doliforge.org/projects/dolibarr). Code ---- From ad8214884d2b395adec2e4d9171f2f665ff0985f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= Date: Sat, 28 Mar 2015 16:10:29 +0100 Subject: [PATCH 2/2] Added documentation to contribution guidelines --- CONTRIBUTING.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 40da55e3f55..e3a97fe358e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -7,26 +7,26 @@ Bug reports and feature requests Issues are now managed on [GitHub](https://github.com/Dolibarr/dolibarr/Issues). -1. Please [use the search engine](https://help.github.com/articles/searching-issues/) to check if nobody's already reported your problem. +1. Please [use the search engine](https://help.github.com/articles/searching-issues) to check if nobody's already reported your problem. 2. [Create an issue](https://help.github.com/articles/creating-an-issue). Choose an appropriate title. Prepend appropriately with Bug or Feature Request. 3. Report with as much detail as possible ([Use screenshots or even screencasts whenever possible](https://help.github.com/articles/issue-attachments)). We're still figuring out how to migrate old issues to GitHub. In the meantime, they are still available at [Doliforge](https://doliforge.org/projects/dolibarr). -Code ----- +Code +--------------------- ### Basic workflow -1. Fork the [GitHub repository](https://github.com/Dolibarr/dolibarr). +1. [Fork](https://help.github.com/articles/fork-a-repo) the [GitHub repository](https://github.com/Dolibarr/dolibarr). 2. Clone your fork. -3. Choose a branch(See the Branches section below). +3. Choose a branch(See the [Branches](#branches) section below). 4. Commit and push your changes. -5. Make a pull request. +5. [Make a pull request](https://help.github.com/articles/creating-a-pull-request). -### Branches +### Branches -Unless you're fixing a bug, all pull request should be made against the *develop* branch. +Unless you're fixing a bug, all pull requests should be made against the *develop* branch. If you're fixing a bug, it is preferred that you cook your fix and pull request it against the oldest version affected that's still supported. @@ -71,7 +71,7 @@ Where KEYWORD is one of: Translations ------------ -en_US and delta languages (i.e: fr_XX) are maintained in the repository. See Code section above. +The source language (en_US) is maintained in the repository. See the [Code](#code) section above. All other translations are managed online at [Transifex](https://www.transifex.com/projects/p/dolibarr).