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 |
|