Damian Mooyman
|
e6b877df27
|
Merge remote-tracking branch 'origin/3'
# Conflicts:
# control/Director.php
# control/HTTP.php
# core/startup/ParameterConfirmationToken.php
# docs/en/00_Getting_Started/01_Installation/05_Common_Problems.md
# docs/en/00_Getting_Started/04_Directory_Structure.md
# docs/en/00_Getting_Started/05_Coding_Conventions.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/02_Developer_Guides/12_Search/01_Searchcontext.md
# docs/en/02_Developer_Guides/13_i18n/index.md
# docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/06_Javascript_Development.md
# docs/en/03_Upgrading/index.md
# docs/en/changelogs/index.md
# docs/en/howto/customize-cms-menu.md
# docs/en/howto/navigation-menu.md
# docs/en/index.md
# docs/en/installation/index.md
# docs/en/installation/windows-manual-iis-6.md
# docs/en/misc/contributing/code.md
# docs/en/misc/contributing/issues.md
# docs/en/misc/module-release-process.md
# docs/en/reference/dataobject.md
# docs/en/reference/execution-pipeline.md
# docs/en/reference/grid-field.md
# docs/en/reference/modeladmin.md
# docs/en/reference/rssfeed.md
# docs/en/reference/templates.md
# docs/en/topics/commandline.md
# docs/en/topics/debugging.md
# docs/en/topics/email.md
# docs/en/topics/forms.md
# docs/en/topics/index.md
# docs/en/topics/module-development.md
# docs/en/topics/modules.md
# docs/en/topics/page-type-templates.md
# docs/en/topics/page-types.md
# docs/en/topics/search.md
# docs/en/topics/testing/index.md
# docs/en/topics/testing/testing-guide-troubleshooting.md
# docs/en/topics/theme-development.md
# docs/en/tutorials/1-building-a-basic-site.md
# docs/en/tutorials/2-extending-a-basic-site.md
# docs/en/tutorials/3-forms.md
# docs/en/tutorials/4-site-search.md
# docs/en/tutorials/5-dataobject-relationship-management.md
# docs/en/tutorials/building-a-basic-site.md
# docs/en/tutorials/dataobject-relationship-management.md
# docs/en/tutorials/extending-a-basic-site.md
# docs/en/tutorials/forms.md
# docs/en/tutorials/index.md
# docs/en/tutorials/site-search.md
# main.php
# model/SQLQuery.php
# security/ChangePasswordForm.php
# security/MemberLoginForm.php
# tests/control/ControllerTest.php
# tests/core/startup/ParameterConfirmationTokenTest.php
# tests/model/SQLQueryTest.php
# tests/security/SecurityTest.php
# tests/view/SSViewerTest.php
# view/SSTemplateParser.php
# view/SSTemplateParser.php.inc
# view/SSViewer.php
|
2016-01-20 13:16:27 +13: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 |
|
Damian Mooyman
|
3e7eecf978
|
API Remove SQLQuery
|
2015-10-23 16:26:04 +13:00 |
|
Damian Mooyman
|
7ee444e08a
|
Merge remote-tracking branch 'origin/3.1' into 3.2
Conflicts:
admin/code/LeftAndMain.php
control/injector/SilverStripeServiceConfigurationLocator.php
core/ClassInfo.php
filesystem/File.php
model/DataObject.php
model/DataQuery.php
search/filters/FulltextFilter.php
search/filters/SearchFilter.php
tests/core/ClassInfoTest.php
tests/filesystem/FileTest.php
tests/model/DataListTest.php
|
2015-07-31 11:38:18 +12:00 |
|
Damian Mooyman
|
782c4cbf6f
|
API Enable single-column fulltext filter search as fallback
|
2015-06-12 15:36:03 +12:00 |
|
Stevie Mayhew
|
0d94cf15a5
|
UPDATE: change all instances of $this->request to use appropriate getter/setter
|
2015-04-30 11:04:08 +12: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 |
|
Will Rossiter
|
fe96fc581d
|
Clean up search documentation
|
2014-12-17 15:50:01 +13:00 |
|
Will Rossiter
|
3d8c9232e0
|
Review, cleanup and refresh of integration section
|
2014-12-17 15:48:57 +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 |
|
Will Rossiter
|
a7971d0540
|
Clean up search documentation
|
2014-12-15 09:12:47 +13:00 |
|
Will Rossiter
|
7458b10b6d
|
Review, cleanup and refresh of integration section
|
2014-12-15 09:12:45 +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 |
|