Damian Mooyman
0b1f297873
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
.travis.yml
README.md
admin/code/LeftAndMain.php
admin/css/screen.css
admin/scss/screen.scss
api/RestfulService.php
conf/ConfigureFromEnv.php
control/injector/ServiceConfigurationLocator.php
control/injector/SilverStripeServiceConfigurationLocator.php
core/ClassInfo.php
core/Object.php
css/AssetUploadField.css
css/ComplexTableField_popup.css
dev/CSSContentParser.php
dev/DevelopmentAdmin.php
docs/en/changelogs/index.md
docs/en/misc/contributing/code.md
docs/en/reference/execution-pipeline.md
filesystem/GD.php
filesystem/ImagickBackend.php
filesystem/Upload.php
forms/Form.php
forms/FormField.php
forms/HtmlEditorConfig.php
forms/gridfield/GridFieldDetailForm.php
forms/gridfield/GridFieldSortableHeader.php
lang/en.yml
model/Aggregate.php
model/DataList.php
model/DataObject.php
model/DataQuery.php
model/Image.php
model/MySQLDatabase.php
model/SQLQuery.php
model/fieldtypes/HTMLText.php
model/fieldtypes/Text.php
scss/AssetUploadField.scss
search/filters/SearchFilter.php
security/Authenticator.php
security/LoginForm.php
security/Member.php
security/MemberAuthenticator.php
security/MemberLoginForm.php
security/Security.php
tests/behat/features/bootstrap/SilverStripe/Framework/Test/Behaviour/CmsFormsContext.php
tests/control/HTTPTest.php
tests/control/RequestHandlingTest.php
tests/filesystem/UploadTest.php
tests/forms/FormTest.php
tests/forms/NumericFieldTest.php
tests/model/DataListTest.php
tests/model/DataObjectTest.php
tests/model/TextTest.php
tests/security/MemberAuthenticatorTest.php
tests/security/SecurityDefaultAdminTest.php
tests/view/SSViewerCacheBlockTest.php
tests/view/SSViewerTest.php
2014-11-18 12:45:54 +13:00
Michael Strong
a401db2d34
Duplicated content
...
For some reason the quick fire dos and donts were duplicated.
2014-10-15 12:47:55 +13:00
Ingo Schommer
5c9e88b9a0
Updated contrib docs, mention "DO NOT MERGE" pull requests
...
These should be avoided because they undermine the process of
peer review and merging in github, we should strive to have
zero open pull requests, as opposed to treating it as a stage
for work in progress. Intermediary code review can happen in github forks instead.
Also remove some checklist items which were based on the Trac bugtracker,
e.g. its not longer possible to assign yourself to issues because
of github's limited permission abilities.
2014-08-25 08:29:25 +12:00
Ingo Schommer
4af9143d3b
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
docs/en/misc/contributing/code.md
2014-02-07 16:43:22 +13:00
Kirk Mayo
632884252b
NEW: Updating out of date URLs in the framework source code and docs
2014-02-07 15:10:44 +13:00
Simon Welsh
39d42e4ea3
Merge branch '3.1'
2014-01-09 08:22:47 +13:00
Sriram Venkatesh
efa309c977
Corrects Broken Link
2014-01-09 08:20:34 +13:00
Ingo Schommer
fad8926785
Better definition of "pre-release" branch in docs
2013-10-22 16:20:00 +02:00
Ingo Schommer
927dd6c606
Removed duplicate "quickfire" section in docs
2013-10-22 16:20:00 +02:00
Simon Welsh
fbce9fd7cd
Merge branch '3.1'
...
Conflicts:
.travis.yml
docs/en/misc/contributing/code.md
javascript/HtmlEditorField.js
2013-07-05 10:22:58 +12:00
Ingo Schommer
2a4fd90316
Docs: Note about branch merging
2013-06-25 10:35:30 +02:00
Ingo Schommer
f8ee3e1b73
Merge pull request #1742 from svandragt/patch-1
...
Clarified the context of the step-by-step process
2013-04-14 13:27:16 -07:00
Ingo Schommer
f514067f2f
Updated commit message usage to reflect github best practices
2013-04-11 17:35:55 +03:00
Sander van Dragt
7b49425e16
Clarified the context of the step-by-step process
...
Also limited the dependency on branching of 'master' to make the example more versatile and consistent with the best practice in this document.
2013-04-09 16:51:20 +02:00
Matt Lewandowsky
d613ba0593
Provide guidance for cross-repo issue referencing
2013-04-05 04:57:09 -07:00
Ingo Schommer
f5754c11aa
Contribution guidelines, new bugtracker links
2013-04-02 01:51:40 +02:00
Ingo Schommer
72d5f3cf17
Composer contribution fork/upstream docs ( fixes #8332 )
2013-03-20 11:37:41 +01:00
Ingo Schommer
3fd1769142
Added docs about which branch to choose
2012-12-21 14:26:51 +01:00
Sam Minnee
9e7b8baecf
Point people at silverstripe-dev and not the forum for discussing patches.
2012-10-09 14:53:48 +13:00
Sam Minnee
c4d2f9e6b2
Corrected a number of inbound links pointing to the documentation.
2012-10-09 14:53:47 +13:00
Sam Minnee
c28dd4c24b
Make the copyright assignment clearer, and gave some explanation of why we do this.
2012-10-09 14:53:45 +13:00
Sam Minnee
65d20e4acc
Simplified some of the code contribution guidelines.
...
The current guides have a few areas where they recommend an approach that is more complex than what most people take.
- Rebase straight onto upsteam/msaster
- Force push a rebased branch
I also fixed the conflict resolution help to be relevant to rebase commands, and kept the push instruction out of the rebase instruction.
2012-10-09 14:53:45 +13:00
Sam Minnee
433d29ce7b
Removed 'release candidate branch' step of contributing.
...
I don't know what that release candidate branch stuff is, but:
* I've never seen any of the core team do it
* I think it's overkill for most patches
* I think it's being too prescriptive: if contributors want to do that, that's cool, but it doesn't affect the core team.
* It makes our contributing guidelines more complex than they need to be.
2012-10-09 14:53:44 +13:00
Sam Minnee
439339d4fc
Broke up contributing docs into 4 sections and unified code contribtion guide.
...
The guidelines for contributing code were scattered across a section of contributing.md and collaboration-on-git.md. I've updated this to have separate contributing/code.md page with all the content in a single cohesive page. We also have contributing/documentation.md, contributing/issues.md and contributing/translation.md.
2012-10-09 14:53:39 +13:00
