Daniel Hensby
|
ca8d0f2818
|
Merge branch '3.1' into 3.2
Conflicts:
dev/Debug.php
docs/en/05_Contributing/01_Code.md
forms/FormField.php
i18n/i18nTextCollector.php
model/DataQuery.php
|
2015-07-20 10:48:01 +01:00 |
|
Daniel Hensby
|
55a60e86f0
|
Merge pull request #4401 from marijnkampf/patch-3
DOCS
Fixed type in code example
|
2015-07-15 17:27:27 +01:00 |
|
Marijn Kampf
|
bc66bca187
|
Fixed type
|
2015-07-15 15:36:33 +01:00 |
|
Marijn Kampf
|
218d3f1486
|
Fixed type in code example
|
2015-07-15 15:36:19 +01:00 |
|
Damian Mooyman
|
8331171f2c
|
Merge remote-tracking branch 'origin/3.1' into 3
Conflicts:
.scrutinizer.yml
admin/javascript/LeftAndMain.Panel.js
core/startup/ParameterConfirmationToken.php
dev/Debug.php
dev/FixtureBlueprint.php
docs/en/00_Getting_Started/05_Coding_Conventions.md
docs/en/00_Getting_Started/index.md
docs/en/02_Developer_Guides/01_Templates/01_Syntax.md
filesystem/File.php
filesystem/Folder.php
forms/FieldList.php
forms/LabelField.php
forms/MoneyField.php
forms/TextField.php
forms/TreeDropdownField.php
forms/Validator.php
forms/gridfield/GridField.php
forms/gridfield/GridFieldExportButton.php
lang/de.yml
lang/fi.yml
model/DataObject.php
model/SQLQuery.php
parsers/ShortcodeParser.php
security/ChangePasswordForm.php
security/Security.php
tests/control/DirectorTest.php
tests/core/startup/ParameterConfirmationTokenTest.php
tests/dev/FixtureBlueprintTest.php
tests/forms/FieldListTest.php
tests/forms/MoneyFieldTest.php
tests/model/SQLQueryTest.php
tests/security/SecurityTest.php
|
2015-06-02 19:13:38 +12:00 |
|
David Craig
|
3122226273
|
Add toggleable description to CMS fields
|
2015-04-24 11:40:29 +12:00 |
|
Phill Price
|
996ddea4a9
|
DOCS: formatting fix
the end # removed from titles as they were showing on the page.
|
2015-04-23 17:12:49 +01:00 |
|
Damian Mooyman
|
319b96b48b
|
Merge remote-tracking branch 'origin/3.1' into 3
Conflicts:
docs/en/02_Developer_Guides/09_Security/04_Secure_Coding.md
docs/en/05_Contributing/01_Code.md
forms/TreeDropdownField.php
model/DataObject.php
security/Member.php
tests/model/DataObjectTest.php
|
2015-03-11 11:40:06 +13:00 |
|
Daniel Hensby
|
d2a3da2203
|
Making docs gender agnostic
|
2015-03-07 12:32:04 +00:00 |
|
Fred Condo
|
82ed86f6cd
|
DOCS: correct broken links
- Correct internal links between documentation pages
- Delete defunct links to documentation removed during documentation reorganization
- Restore testing glossary
- Verify by crawling site locally
|
2015-02-27 16:09:15 -08: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 |
|
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 |
|