Daniel Hensby
|
f4a6e9e517
|
Merge branch '3.1' into 3.2
|
2016-08-22 15:30:03 +01:00 |
|
Daniel Hensby
|
8e4e2b4fa8
|
Merge pull request #4173 from AntonyThorpe/patch-4
DOCS Update 06_Tabbed_Forms.md
|
2016-08-19 15:49:51 +01:00 |
|
Damian Mooyman
|
b8e7f9a934
|
Standardise spelling of "customise"
Fixes #3988
|
2016-03-30 13:17:28 +13:00 |
|
Damian Mooyman
|
2c1f837442
|
Merge branch '3.1' into 3.2
# Conflicts:
# docs/en/01_Tutorials/02_Extending_A_Basic_Site.md
# docs/en/01_Tutorials/03_Forms.md
# docs/en/02_Developer_Guides/00_Model/08_SQL_Query.md
# docs/en/02_Developer_Guides/00_Model/10_Versioning.md
# docs/en/02_Developer_Guides/03_Forms/Field_types/01_Common_Subclasses.md
# docs/en/02_Developer_Guides/03_Forms/Field_types/05_UploadField.md
# docs/en/02_Developer_Guides/09_Security/01_Access_Control.md
# docs/en/02_Developer_Guides/09_Security/04_Secure_Coding.md
# docs/en/02_Developer_Guides/14_Files/01_Image.md
# docs/en/02_Developer_Guides/14_Files/index.md
# lang/cs.yml
# lang/fi.yml
# lang/sk.yml
|
2016-02-29 16:59:20 +13:00 |
|
David Alexander
|
903379bde2
|
DOCS 3.2 : fixing api: links now that api: tag parser working
fixed a couple of external links
fixed a docs link
|
2016-02-17 18:02:38 -07:00 |
|
David Alexander
|
febbd35b51
|
DOCS 3.1 : fixing api: links
missed one
|
2016-02-17 03:00:22 -07:00 |
|
Damian Mooyman
|
46cbe809ac
|
Merge remote-tracking branch 'origin/3.1' into 3.2
# Conflicts:
# docs/en/02_Developer_Guides/09_Security/04_Secure_Coding.md
# docs/en/02_Developer_Guides/14_Files/01_Image.md
# docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Customise_CMS_Menu.md
# docs/en/03_Upgrading/index.md
# docs/en/05_Contributing/01_Code.md
# forms/TreeMultiselectField.php
# security/Permission.php
|
2016-01-19 14:00:19 +13:00 |
|
David Alexander
|
5c99e33eb2
|
DOCS 3.1 - fixes broken internal links
|
2016-01-14 23:59:53 +13:00 |
|
Peter Thaleikis
|
7db7140a70
|
fixing example
|
2015-12-04 11:14:02 +13:00 |
|
Daniel Hensby
|
572945a2fd
|
Merge pull request #4704 from spekulatius/patch-1
fixing syntax error
|
2015-11-23 14:18:50 +00:00 |
|
Hamish Friedlander
|
b61d6dcd57
|
[ss-2015-027]: FIX HtmlEditorField_Toolbar#viewfile not whitelisting URLs
|
2015-11-13 15:20:09 +13:00 |
|
Damian Mooyman
|
e07f80014c
|
Merge remote-tracking branch 'origin/3.1' into 3.2
Conflicts:
lang/cs.yml
lang/sk.yml
|
2015-11-03 11:10:46 +13:00 |
|
Peter Thaleikis
|
791c52c6bd
|
fixing syntax error
|
2015-10-25 22:41:13 +13:00 |
|
Liam Whittle
|
71a2ef1350
|
fixed minor GridField initialization syntax.
|
2015-09-29 18:51:08 -04:00 |
|
Damian Mooyman
|
a8ace75341
|
API Support for multiple HTMLEditorConfig per page
|
2015-06-09 12:17:55 +12: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 |
|
Loz Calver
|
8a74dc3e0f
|
Merge pull request #4237 from silverstripe/docs-fix-caption-field-name
updated field name for caption text field.
|
2015-05-28 14:28:36 +01:00 |
|
Myles Beardsmore
|
06730bc1b3
|
updated field name for caption text field.
|
2015-05-28 13:34:59 +01:00 |
|
Cam Findlay
|
058a08f84f
|
DOCS Fix link to common subclasses of form fields
|
2015-05-23 17:30:09 +12:00 |
|
Antony Thorpe
|
7c3ba9d4bf
|
Update 06_Tabbed_Forms.md
Typo. Adding a field to a tab, not from. Thanks.
|
2015-05-09 21:47:37 +12:00 |
|
Marijn Kampf
|
18fb548fd2
|
Fix link
|
2015-05-05 12:13:08 +01:00 |
|
Antony Thorpe
|
c010cb4cec
|
Update 04_GridField.md docs for typo
Variable name should be $grid, as defined when creating the GridField just above. Thanks.
|
2015-04-25 18:04:40 +12:00 |
|
spekulatius
|
9567d9c3f2
|
Update 01_Validation.md
missing semicolon
|
2015-04-19 20:21:49 +12:00 |
|
Turnerj
|
ae8dbe309b
|
FEATURE - Added maximum upload file size by type
This support is on both an instance level and a global default level.
|
2015-03-31 21:57:32 +10:30 |
|
Damian Mooyman
|
43f49e8434
|
Merge remote-tracking branch 'origin/3.1' into 3
Conflicts:
admin/code/ModelAdmin.php
control/Director.php
model/SQLQuery.php
security/Member.php
tests/control/HTTPTest.php
tests/model/SQLQueryTest.php
tests/security/SecurityTest.php
tests/view/SSViewerTest.php
|
2015-03-31 19:54:15 +13:00 |
|
Marijn Kampf
|
91bdb5b530
|
Missing ; in example
|
2015-03-23 09:31:51 +00: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 |
|
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 |
|
Michael Strong
|
4c5a07ecec
|
FIX Updated docs
The docs as they were would break websites and no warning was given regarding the security around doing this.
|
2015-02-27 17:00:46 +13:00 |
|
Cam Findlay
|
8146943a00
|
DOCS Reinstate a missing upload field doc and give a review.
|
2015-02-26 15:17:05 +13:00 |
|
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 |
|
Christopher Bischoff
|
6c24d7dcef
|
Fix syntax error in code example
|
2015-02-03 11:11:51 +01:00 |
|
Christopher Bischoff
|
6bb6c8cde5
|
DOCS Fix formatting
|
2015-02-03 10:55:59 +01: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
|
606d5667cf
|
DOCS Make links relative so they work nicely on github and docs site.
|
2014-12-18 12:11:57 +13:00 |
|
Cam Findlay
|
c358ac6496
|
FIX How to folder on forms
|
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
|
4d0448c254
|
Tutorials review and update image path
|
2014-12-17 15:50:05 +13:00 |
|
Will Rossiter
|
e65b3ad3fb
|
Review and clean up of extending section
|
2014-12-17 15:49:08 +13:00 |
|
Will Rossiter
|
48f53b98a1
|
Rewrite, tidy and format of Forms documentation
|
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
|
658216237e
|
FIX How to folder on forms
|
2014-12-15 14:49:46 +13:00 |
|
Cam Findlay
|
3ac705f4b3
|
FIX: Feedback to name the fields section to "field types" to make it clearer what the section is about.
|
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
|
918baf1ca3
|
Review and clean up of extending section
|
2014-12-15 09:12:47 +13:00 |
|
Will Rossiter
|
86812c0937
|
Rewrite, tidy and format of Forms documentation
|
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 |
|