diff --git a/README.md b/README.md index 752e410b9..e90bbe99b 100644 --- a/README.md +++ b/README.md @@ -23,8 +23,9 @@ If you would like to make changes to the SilverStripe core codebase, we have an * [Server Requirements](http://doc.silverstripe.org/framework/en/installation/server-requirements) * [Changelogs](http://doc.silverstripe.org/framework/en/changelogs/) - * [Framework Bugtracker](https://github.com/silverstripe/sapphire/issues) - * [CMS Bugtracker](https://github.com/silverstripe/silverstripe-cms/issues) + * [Bugtracker: Framework](https://github.com/silverstripe/sapphire/issues) + * [Bugtracker: CMS](https://github.com/silverstripe/silverstripe-cms/issues) + * [Bugtracker: Installer](https://github.com/silverstripe/silverstripe-installer/issues) * [Forums](http://silverstripe.org/forums) * [Developer Mailinglist](https://groups.google.com/forum/#!forum/silverstripe-dev) diff --git a/docs/en/howto/index.md b/docs/en/howto/index.md index 570e8a077..a7cad13df 100644 --- a/docs/en/howto/index.md +++ b/docs/en/howto/index.md @@ -16,8 +16,4 @@ the language and functions which are used in the guides. * [Howto customize the CMS menu](customize-cms-menu). * [How to create a navigation menu](navigation-menu). Create primary navigation for your website. * [Paginating A List](pagination). Add pagination for an SS_List object. -* [How to make a simple contact form](simple-contact-form). - -## Feedback - -If you have a topic you would like covered in these how to's please ask for it on our [Bug Tracker](http://open.silverstripe.org) \ No newline at end of file +* [How to make a simple contact form](simple-contact-form). \ No newline at end of file diff --git a/docs/en/misc/contributing/code.md b/docs/en/misc/contributing/code.md index 0a57d17b7..6576a17e2 100644 --- a/docs/en/misc/contributing/code.md +++ b/docs/en/misc/contributing/code.md @@ -71,7 +71,7 @@ If you aren't familiar with git and GitHub, try reading the ["GitHub bootcamp do We also found the [free online git book](http://progit.org/book/) and the [git crash course](http://gitref.org/) useful. If you're familiar with it, here's the short version of what you need to know. Once you fork and download the code: - * **Don't develop on the master branch.** Always create a development branch specific to "the issue" you're working on (mostly on [open.silverstripe.org](http://open.silverstripe.org)). Name it by issue number and description. For example, if you're working on Issue #100, a `DataObject::get_one()` bugfix, your development branch should be called 100-dataobject-get-one. If you decide to work on another issue mid-stream, create a new branch for that issue--don't work on both in one branch. + * **Don't develop on the master branch.** Always create a development branch specific to "the issue" you're working on (mostly on our [bugtracker](/misc/contributing/issues)). Name it by issue number and description. For example, if you're working on Issue #100, a `DataObject::get_one()` bugfix, your development branch should be called 100-dataobject-get-one. If you decide to work on another issue mid-stream, create a new branch for that issue--don't work on both in one branch. * **Do not merge the upstream master** with your development branch; *rebase* your branch on top of the upstream master. diff --git a/docs/en/misc/contributing/issues.md b/docs/en/misc/contributing/issues.md index a143cc763..6a13acf05 100644 --- a/docs/en/misc/contributing/issues.md +++ b/docs/en/misc/contributing/issues.md @@ -6,12 +6,16 @@ If you have discovered a bug in SilverStripe, we'd be glad to hear about it - well written bug reports can be half of the solution already! -Our bugtracker is located on [open.silverstripe.org](http://open.silverstripe.org/). + + * [Framework Bugtracker](https://github.com/silverstripe/sapphire/issues) + * [CMS Bugtracker](https://github.com/silverstripe/silverstripe-cms/issues) + * [Documentation Bugtracker](https://github.com/silverstripe/sapphire/issues) + * Search on [http://silverstripe.org/modules](http://silverstripe.org/modules) for module-specific bugtrackers Before submitting a bug: * Ask for assistance on the [forums](http://silverstripe.org/forums), [core mailinglist](http://groups.google.com/group/silverstripe-dev) or on [IRC](http://silverstripe.org/irc) if you're unsure if its really a bug. - * [Search for existing tickets](http://open.silverstripe.org/query?keywords=~&description=~&summary=~&col=id&col=summary&col=owner&col=type&col=status&col=priority&col=milestone&col=changetime&desc=1&order=changetime) before reporting a new one + * Search for similar, existing tickets * Is this a security issue? Please follow our separate reporting guidelines below. * Is this a issue with the core framework or cms? Modules have their own issue trackers (see [silverstripe.org/modules](http://www.silverstripe.org/modules)) * Try to reproduce your issue on a [clean installation](http://doc.silverstripe.org/framework/en/installation/composer#using-development-versions), maybe the bug has already been fixed on an unreleased branch? @@ -21,12 +25,28 @@ Before submitting a bug: If the issue does look like a new bug: - * [Create a new ticket](http://open.silverstripe.org/newticket) - * Describe the steps required to reproduce your issue, and the expected outcome. Unit tests and screencasts can help here. + * [Create a new ticket](https://github.com/silverstripe/sapphire/issues/new) + * Describe the steps required to reproduce your issue, and the expected outcome. Unit tests, screenshots and screencasts can help here. * Describe your environment as detailed as possible: SilverStripe version, Browser, PHP version, Operating System, any installed SilverStripe modules. - * Add keywords to help us organize issues, and please be realistic about the issue priority. Don't set milestones. * *(optional)* [Submit a pull request](/misc/contributing/code) which fixes the issue. +Lastly, don't get your hopes up too high. Unless your issue is a blocker affecting a large +number of users, don't expect SilverStripe developers to jump onto it right way. +Your issue is a starting point where others with the same problem can collaborate +with you to develop a fix. + +## Feature Requests + +