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
33b18ce998
Fix merge error
2015-01-15 18:56:09 +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
Damian Mooyman
50d80e5854
Merge remote-tracking branch 'origin/3.1.9' into 3.1
2015-01-15 13:24:34 +13:00
Damian Mooyman
87d6250ea7
Reword upgrading notes
2015-01-15 11:56:46 +13:00
Damian Mooyman
7b20f775f2
Updated changelog
2015-01-15 11:45:41 +13:00
Loz Calver
c18bf6222b
Merge pull request #3788 from camfindlay/zippylinkfix
...
DOCS - fix reported broken links
2015-01-14 09:33:26 +00:00
scott1702
bca4024ee8
DOCS Minor spelling error
...
Fixed a minor spelling error in tutorial 2.
2015-01-14 16:57:54 +13:00
Cam Findlay
3239cfd495
DOCS - fix reported broken links by zippy in IRC
2015-01-14 08:59:55 +13:00
Damian Mooyman
db314b2a76
Added 3.1.9-rc1 changelog
2015-01-13 09:04:39 +13:00
Michael Strong
a02adf6854
FIX Uneccessary class replacement
...
Overly complex code example.
2015-01-08 20:53:45 +13:00
scott1702
971334b408
DOCS Fixed dead link to image in tutorial 1
...
Found a dead link to the Silverstripe Logo, have changed this to an updated working link of the same image.
2015-01-08 16:31:28 +13:00
Cam Findlay
e114301c7d
DOCS Updating links in getting started index
...
This index had some older links which have been updated.
2015-01-05 15:28:29 +13:00
Cam Findlay
bfd05d7343
DOCS Core committers should have 2 t's
2015-01-05 10:57:15 +13:00
OliBridgman
95be3593ea
Update 01_Data_Model_and_ORM.md
...
Couple of grammatical errors.
2015-01-04 23:32:19 +13:00
Zomxilla
8e9f1d48c6
Remove trailing "###"
...
Incorrect markdown
2014-12-22 13:00:51 +13:00
Damian Mooyman
5a48501def
Merge pull request #3740 from camfindlay/fiximagelinks
...
DOCS Make links relative so they work nicely on github and docs site.
2014-12-18 12:12:48 +13:00
Cam Findlay
606d5667cf
DOCS Make links relative so they work nicely on github and docs site.
2014-12-18 12:11:57 +13:00
Cam Findlay
66d0fcc11c
Migrate 3.2 docs into new docs structure
2014-12-17 15:50:06 +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
c358ac6496
FIX How to folder on forms
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
9f12a08f47
Rebased on 3.1 - moved new change logs into place.
2014-12-17 15:50:06 +13:00
Cam Findlay
bdb3b7f085
FIX: Feedback to name the fields section to "field types" to make it clearer what the section is about.
2014-12-17 15:50:06 +13:00
Cam Findlay
aba966729a
FIX: use GFMD code blocks to fix code formatting consistency.
2014-12-17 15:50:06 +13:00
Stevie Mayhew
6d0cd49d6d
MINOR: spelling mistake
2014-12-17 15:50:06 +13:00
Cam Findlay
afc8db7e33
Rebased on 3.1 and added missing site reports doc
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
Ingo Schommer
11c1563778
Docs for exec pipeline and manifests
...
- Added manifest logic docs
- More obvious pointers to flushing
- Removed Director page since it duplicated a lot of information already presenting in routing,
which in itself is already duplicated between routing.md and controllers.md.
- Merged Director execution rundown into main exec pipeline docs
- Moved YAML security note from main installation docs to "secure coding", making it less obvious
2014-12-17 15:50:05 +13:00
Will Rossiter
e743fedc65
Importing cookie content
2014-12-17 15:50:05 +13:00
Cam Findlay
4d0448c254
Tutorials review and update image path
2014-12-17 15:50:05 +13:00
Will Rossiter
e729131a63
Move CMS Howtos
2014-12-17 15:50:05 +13:00
Uncle Cheese
fe62a2fa79
developer guides, templates review
2014-12-17 15:50:05 +13:00
Will Rossiter
ff91f99522
Add brief highlevel docs on cookie / session
2014-12-17 15:50:05 +13:00
Will Rossiter
fe96fc581d
Clean up search documentation
2014-12-17 15:50:01 +13:00
Uncle Cheese
f83c8f0821
developer guides / models
2014-12-17 15:49:27 +13:00
Will Rossiter
e448fb9434
Model guide documentation
2014-12-17 15:49:24 +13:00
Will Rossiter
e65b3ad3fb
Review and clean up of extending section
2014-12-17 15:49:08 +13:00
Cam Findlay
1df3d7cee1
Rebased additional documentation since May 2014.
...
New pages filed and metadata added.
2014-12-17 15:48:58 +13:00
Will Rossiter
48f53b98a1
Rewrite, tidy and format of Forms documentation
2014-12-17 15:48:58 +13:00
Will Rossiter
b4d8dfc9ee
Controller documentation
2014-12-17 15:48:58 +13:00
Will Rossiter
bbfc03ad51
Review and tidy up of configuration guide
2014-12-17 15:48:58 +13:00
Will Rossiter
627cc520d9
Rewrite and tidy up of performance section
2014-12-17 15:48:58 +13:00
Will Rossiter
576f34a539
Review and rewrites for Testing Developer Guide
2014-12-17 15:48:58 +13:00
Will Rossiter
4fcbc9a402
Clean up debugging documentation
2014-12-17 15:48:57 +13:00
Will Rossiter
7fc6110a6f
Tidy up templates guide
2014-12-17 15:48:57 +13:00
Will Rossiter
c54dee5452
Review email documentation
2014-12-17 15:48:57 +13:00
Will Rossiter
3d8c9232e0
Review, cleanup and refresh of integration section
2014-12-17 15:48:57 +13:00
Will Rossiter
0c73768e8c
Review, clean up of CLI documentation
2014-12-17 15:48:57 +13:00
Will Rossiter
f633236e78
Review and tidy up contributing documentation.
2014-12-17 15:48:57 +13:00
