Damian Mooyman
|
dff65867cc
|
Merge remote-tracking branch 'origin/3.1' into 3
Conflicts:
control/HTTP.php
control/HTTPResponse.php
docs/en/05_Contributing/01_Code.md
forms/CompositeField.php
forms/FormAction.php
forms/FormField.php
forms/InlineFormAction.php
forms/NumericField.php
forms/TreeDropdownField.php
forms/TreeMultiselectField.php
templates/forms/TreeDropdownField.ss
tests/core/CoreTest.php
tests/forms/NumericFieldTest.php
tests/model/DataDifferencerTest.php
|
2015-02-20 10:17:19 +13:00 |
|
Nick
|
9303912b7f
|
Update 04_Preview.md
Fix the yaml example
|
2015-02-04 22:15:49 +13:00 |
|
Anjana Wijesundara
|
376ce73390
|
mysite/code/Page.php to mysite/code/Product.php
"mysite/code/Page.php" line in Displaying Results Section should be "mysite/code/Product.php"
|
2015-01-22 22:28:13 +05:30 |
|
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 |
|
Zomxilla
|
8e9f1d48c6
|
Remove trailing "###"
Incorrect markdown
|
2014-12-22 13:00:51 +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
|
afc8db7e33
|
Rebased on 3.1 and added missing site reports doc
|
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 |
|
Will Rossiter
|
e729131a63
|
Move CMS Howtos
|
2014-12-17 15:50:05 +13:00 |
|
Cam Findlay
|
987fde2bed
|
Rebased on 3.1 and added missing site reports doc
|
2014-12-15 09:12:48 +13:00 |
|
Cam Findlay
|
cdae3fadea
|
Tutorials review and update image path
|
2014-12-15 09:12:48 +13:00 |
|
Will Rossiter
|
d01c8d7990
|
Move CMS Howtos
|
2014-12-15 09:12:47 +13:00 |
|