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
Nicolaas
ea62bf9eed
Adding link to UserVoice
2014-09-26 11:07:38 +12:00
Mateusz Uzdowski
8bf3853887
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
docs/en/misc/contributing/issues.md
docs/en/reference/uploadfield.md
forms/HtmlEditorField.php
i18n/i18n.php
javascript/HtmlEditorField.js
model/DB.php
model/Image.php
model/SQLQuery.php
2014-08-14 09:08:26 +12:00
Ingo Schommer
48dd233050
Removed link to outdated docs mailinglist
2014-07-28 08:56:21 +12:00
camfindlay
39ed36dad6
Typo, duplicate silverstripe-documentation
2014-01-09 19:53:42 +13:00
Sam Minnee
d97ca43cd0
Merge branch '3.1'
...
Conflicts:
README.md
dev/install/install.php5
forms/ConfirmedPasswordField.php
tests/forms/FormTest.php
2013-05-23 19:01:58 +12:00
Ingo Schommer
a87bbb2903
Updated github path
2013-05-17 00:45:52 +02:00
Ingo Schommer
ef3d974821
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
docs/en/misc/contributing/issues.md
2013-04-02 02:05:58 +02:00
Ingo Schommer
f5754c11aa
Contribution guidelines, new bugtracker links
2013-04-02 01:51:40 +02:00
Ingo Schommer
786d0516da
More docs on CMS issue reporting
2013-01-22 15:10:50 +01:00
Ingo Schommer
f833226da0
Updated issue reporting guidelines
2013-01-22 12:05:07 +01: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
