Damian Mooyman
|
58cb0af753
|
Merge remote-tracking branch 'origin/3'
Conflicts:
composer.json
docs/en/00_Getting_Started/00_Server_Requirements.md
docs/en/00_Getting_Started/01_Installation/04_Other_installation_Options/Windows_IIS7.md
docs/en/00_Getting_Started/01_Installation/04_Other_installation_Options/Windows_Platform_Installer.md
docs/en/00_Getting_Started/04_Directory_Structure.md
docs/en/01_Tutorials/01_Building_A_Basic_Site.md
docs/en/01_Tutorials/02_Extending_A_Basic_Site.md
docs/en/01_Tutorials/03_Forms.md
docs/en/01_Tutorials/04_Site_Search.md
docs/en/01_Tutorials/05_Dataobject_Relationship_Management.md
docs/en/01_Tutorials/index.md
docs/en/02_Developer_Guides/00_Model/01_Data_Model_and_ORM.md
docs/en/02_Developer_Guides/00_Model/11_Scaffolding.md
docs/en/02_Developer_Guides/01_Templates/06_Themes.md
docs/en/02_Developer_Guides/03_Forms/How_Tos/Simple_Contact_Form.md
docs/en/02_Developer_Guides/05_Extending/05_Injector.md
docs/en/02_Developer_Guides/14_Files/index.md
docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/03_CMS_Layout.md
docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/06_Javascript_Development.md
docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Customise_CMS_Tree.md
docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Customise_Site_Reports.md
docs/en/02_Developer_Guides/18_Cookies_And_Sessions/01_Cookies.md
docs/en/04_Changelogs/3.1.9.md
docs/en/05_Contributing/00_Issues_and_Bugs.md
docs/en/05_Contributing/02_Release_Process.md
docs/en/05_Contributing/03_Documentation.md
|
2015-01-16 10:08:40 +13:00 |
|
Damian Mooyman
|
88fdc75456
|
Merge remote-tracking branch 'composer/3.1' into 3
Conflicts:
.editorconfig
docs/en/00_Getting_Started/00_Server_Requirements.md
docs/en/00_Getting_Started/01_Installation/04_Other_installation_Options/Windows_IIS7.md
docs/en/00_Getting_Started/01_Installation/04_Other_installation_Options/Windows_Platform_Installer.md
docs/en/00_Getting_Started/04_Directory_Structure.md
docs/en/00_Getting_Started/index.md
docs/en/01_Tutorials/01_Building_A_Basic_Site.md
docs/en/01_Tutorials/02_Extending_A_Basic_Site.md
docs/en/01_Tutorials/03_Forms.md
docs/en/01_Tutorials/04_Site_Search.md
docs/en/01_Tutorials/05_Dataobject_Relationship_Management.md
docs/en/01_Tutorials/index.md
docs/en/02_Developer_Guides/00_Model/01_Data_Model_and_ORM.md
docs/en/02_Developer_Guides/00_Model/11_Scaffolding.md
docs/en/02_Developer_Guides/01_Templates/06_Themes.md
docs/en/02_Developer_Guides/03_Forms/How_Tos/Simple_Contact_Form.md
docs/en/02_Developer_Guides/05_Extending/05_Injector.md
docs/en/02_Developer_Guides/09_Security/04_Secure_Coding.md
docs/en/02_Developer_Guides/10_Email/index.md
docs/en/02_Developer_Guides/11_Integration/01_RestfulService.md
docs/en/02_Developer_Guides/12_Search/01_Searchcontext.md
docs/en/02_Developer_Guides/14_Files/index.md
docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/03_CMS_Layout.md
docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/06_Javascript_Development.md
docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Customise_CMS_Tree.md
docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Customise_Site_Reports.md
docs/en/02_Developer_Guides/18_Cookies_And_Sessions/01_Cookies.md
docs/en/04_Changelogs/3.1.9.md
docs/en/05_Contributing/00_Issues_and_Bugs.md
docs/en/05_Contributing/02_Release_Process.md
docs/en/05_Contributing/03_Documentation.md
filesystem/File.php
filesystem/GD.php
model/DataDifferencer.php
model/Versioned.php
security/BasicAuth.php
security/Member.php
tests/filesystem/FileTest.php
tests/forms/uploadfield/UploadFieldTest.php
tests/model/VersionedTest.php
tests/security/BasicAuthTest.php
|
2015-01-15 18:52:46 +13:00 |
|
Cam Findlay
|
bfd05d7343
|
DOCS Core committers should have 2 t's
|
2015-01-05 10:57:15 +13:00 |
|
Ingo Schommer
|
e48e4cac06
|
Semver documented in release process
See https://groups.google.com/forum/#!topic/silverstripe-dev/J4U4Nl2qTSg.
|
2014-12-17 15:50:06 +13:00 |
|
Cam Findlay
|
10ce9b9db4
|
Typo fixes for committers
|
2014-12-17 15:50:06 +13:00 |
|
Cam Findlay
|
fc110e34fb
|
Added documentation writing style guide points
|
2014-12-17 15:50:05 +13:00 |
|
Will Rossiter
|
f633236e78
|
Review and tidy up contributing documentation.
|
2014-12-17 15:48:57 +13:00 |
|
Will Rossiter
|
084286af4c
|
Add introduction files to each of the sections
|
2014-12-17 15:48:54 +13:00 |
|
Will Rossiter
|
6c5ddaf054
|
Restructure of the docs markdown source files into more logical taxonomy
|
2014-12-17 15:48:35 +13:00 |
|
Ingo Schommer
|
7e44cc7c3a
|
Semver documented in release process
See https://groups.google.com/forum/#!topic/silverstripe-dev/J4U4Nl2qTSg.
|
2014-12-16 11:01:17 +13:00 |
|
Cam Findlay
|
ba27104903
|
Typo fixes for committers
|
2014-12-16 11:01:17 +13:00 |
|
Cam Findlay
|
ae8d857a2c
|
Added documentation writing style guide points
|
2014-12-16 11:01:16 +13:00 |
|
Will Rossiter
|
4a846c288c
|
Review and tidy up contributing documentation.
|
2014-12-16 11:01:13 +13:00 |
|
Will Rossiter
|
a506dfd42a
|
Add introduction files to each of the sections
|
2014-12-16 11:01:13 +13:00 |
|
Will Rossiter
|
8e8c5d716d
|
Restructure of the docs markdown source files into more logical taxonomy
|
2014-12-16 11:01:12 +13:00 |
|
Ingo Schommer
|
f2237aff8d
|
Semver documented in release process
See https://groups.google.com/forum/#!topic/silverstripe-dev/J4U4Nl2qTSg.
|
2014-12-15 17:56:32 +13:00 |
|
Cam Findlay
|
f387ffebe6
|
Typo fixes for committers
|
2014-12-15 09:12:49 +13:00 |
|
Cam Findlay
|
36f62b6d4f
|
Added documentation writing style guide points
|
2014-12-15 09:12:48 +13:00 |
|
Will Rossiter
|
80d4127f43
|
Review and tidy up contributing documentation.
|
2014-12-15 09:12:45 +13:00 |
|
Will Rossiter
|
d52b475cfb
|
Add introduction files to each of the sections
|
2014-12-15 09:12:45 +13:00 |
|
Will Rossiter
|
e9d88dd8ee
|
Restructure of the docs markdown source files into more logical taxonomy.
Rebased on 3.1
|
2014-12-15 09:12:44 +13:00 |
|