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
|
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 |
|
Damian Mooyman
|
db314b2a76
|
Added 3.1.9-rc1 changelog
|
2015-01-13 09:04:39 +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 |
|
Cam Findlay
|
9f12a08f47
|
Rebased on 3.1 - moved new change logs into place.
|
2014-12-17 15:50:06 +13:00 |
|
Cam Findlay
|
4d0448c254
|
Tutorials review and update image path
|
2014-12-17 15:50:05 +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
|
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 |
|
Cam Findlay
|
9e7fc7618c
|
Rebased on 3.1 - moved new change logs into place.
|
2014-12-15 09:12:49 +13:00 |
|
Cam Findlay
|
cdae3fadea
|
Tutorials review and update image path
|
2014-12-15 09:12:48 +13:00 |
|
Cam Findlay
|
b7272e09c6
|
Rebased additional documentation since May 2014.
New pages filed and metadata added.
|
2014-12-15 09:12:47 +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 |
|