Commit Graph

160 Commits

Author SHA1 Message Date
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
Sam Minnée
532bf6ccb9 Merge pull request #3554 from tractorcow/pr/3179
FIX: FulltextFilter did not work and was not usable
2015-07-22 11:29:57 +12:00
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
Stuart
d6cb2419b8 Correct Memcached config in example
Unlike Libmemcached, the Memcached backend server config must be nested inside an array() with a single key 'servers' - otherwise the default host of 127.0.0.1 is used.

array(
	'servers' => array(
		'host' => 'localhost', 
		'port' => 11211, 
		'persistent' => true, 
		'weight' => 1, 
		'timeout' => 1,
		'retry_interval' => 15, 
		'status' => true, 
		'failure_callback' => ''
	)
)
2015-07-11 23:18:18 +12:00
Jackson
9cb64d48e3 Define function as static (line 59)
Not defining function on line 59 as static triggers php error: [Strict Notice] call_user_func() expects parameter 1 to be a valid callback, non-static method Page::ShortcodeColumns() should not be called statically

Note: PHP 5.5.12
2015-06-30 11:29:26 +12:00
Cam Findlay
bee638eb6a DOCS Missing closing perenthesis 2015-06-26 15:36:49 +12:00
Damian Mooyman
1d122803cc Merge remote-tracking branch 'origin/3.1' into 3.2
Conflicts:
	dev/SapphireTest.php
	docs/en/02_Developer_Guides/01_Templates/01_Syntax.md
	forms/DatetimeField.php
	forms/NullableField.php
	forms/NumericField.php
	forms/gridfield/GridField.php
	tests/control/DirectorTest.php
	tests/model/DataObjectSchemaGenerationTest.php
	tests/model/MySQLDatabaseTest.php
2015-06-19 10:48:07 +12:00
Damian Mooyman
83c4ffda52 Merge pull request #4276 from hailwood/patch-2
Add 0 Based Position tip.
2015-06-18 11:04:11 +12:00
Damian Mooyman
0653ba9630 Merge pull request #3979 from dhensby/pulls/test-nest
Nest and unnest Config and Controller for each test
2015-06-17 16:04:27 +12:00
Damian Mooyman
0abacaead6 Merge remote-tracking branch 'origin/3.1' into 3
Conflicts:
	admin/code/LeftAndMain.php
	forms/EmailField.php
	forms/Form.php
	forms/HeaderField.php
	forms/LiteralField.php
	forms/PasswordField.php
	forms/TextareaField.php
	forms/TreeDropdownField.php
	model/DataObject.php
	tests/forms/uploadfield/UploadFieldTest.php
	tests/model/DataObjectTest.php
2015-06-17 11:24:25 +12:00
Damian Mooyman
4d37e21bc6 Cleanup 3.2 changelog for release 2015-06-15 16:19:08 +12:00
Jonathon Menz
838926085c API New and renamed image functions
Renamed image functions with more expressive names. Added CropWidth & CropHeight functions. Added no-upsampling capabilities. Cleaned up Image docs. Closes #4211
2015-06-12 17:02:55 -07:00
David Alexander
52a248534a Update index.md
Minor typo.
2015-06-13 11:08:25 +12:00
Damian Mooyman
782c4cbf6f API Enable single-column fulltext filter search as fallback 2015-06-12 15:36:03 +12:00
Matthew Hailwood
1b93db019c Add 0 Based Position tip. 2015-06-12 13:38:09 +12:00
Daniel Hensby
f21427d7fa DOCS Explaining test suite nesting 2015-06-11 16:56:57 +01:00
Myles Beardsmore
67e1cee64a Completed missing comment ending
Completed missing comment ending
2015-06-10 16:56:31 +12:00
Damian Mooyman
a8ace75341 API Support for multiple HTMLEditorConfig per page 2015-06-09 12:17:55 +12:00
Damian Mooyman
f21e59585e Merge remote-tracking branch 'origin/3.1' into 3 2015-06-09 11:02:50 +12:00
Daniel Hensby
d3b7abb0b5 Merge pull request #4242 from jonom/docs-database-defaults
DOCS: Added default value examples
2015-06-02 18:01:06 +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
Damian Mooyman
0319f7855b FIX Incorrect env setting in 3.1.13 2015-06-02 12:27:08 +12:00
Ingo Schommer
f3c722d508 Merge pull request #4195 from oddnoc/phpunit-version
DOC: Correct composer invocation to install phpunit
2015-06-01 15:00:55 +12:00
Jonathon Menz
12e26407ef DOCS: Added default value examples 2015-05-29 14:27:22 -07: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
Will Morgan
9324cc916c Merge pull request #4224 from camfindlay/patch-25
DOCS Fix link to common subclasses of form fields
2015-05-28 13:41:02 +01:00
Will Morgan
e930bcf7b9 Merge pull request #4225 from camfindlay/patch-26
DOCS Fix issue with bullets and backticks thinking they are code blocks
2015-05-28 13:39:36 +01:00
Myles Beardsmore
06730bc1b3 updated field name for caption text field. 2015-05-28 13:34:59 +01:00
Damian Mooyman
50e33b8e5e Merge remote-tracking branch 'origin/3.1.13' into 3.1 2015-05-28 19:08:12 +12:00
Marcus Nyeholt
9c8fa51321 FIX Allow users to specify allowed hosts
Allow users to explicitly state which Hosts are allowed to be requested via
this application instance to avoid Host: header forgery attacks.
2015-05-28 15:58:39 +10:00
Michal Kleiner
4843913f31 Update 03_Requirements.md
Fixed code example for setting write_js_to_body value to false
2015-05-28 14:28:05 +12:00
Damian Mooyman
75137dbab2 Ensure only trusted proxy servers have control over certain HTTP headers 2015-05-28 10:12:46 +12:00
Cam Findlay
15ea4aa54c DOCS Fix issue with bullets and backticks thinking they are code blocks
Thanks to @stojg for reporting.
2015-05-23 17:58:51 +12:00
Cam Findlay
058a08f84f DOCS Fix link to common subclasses of form fields 2015-05-23 17:30:09 +12:00
Steve Dixon
63eb6c2a24 Template Syntax doco grammar cleanup
Some simple edits to improve some grammatical mistakes and consistency.
2015-05-21 12:56:26 +10:00
Fred Condo
84b78a86bf Remove references to installing PHPUnit
It is now provided automatically via composer. Also, replace the section
about installing PHPUnit with a slightly expanded section on
conveniently invoking phpunit.
2015-05-19 09:24:09 -07:00
Marijn Kampf
18fb548fd2 Fix link 2015-05-05 12:13:08 +01:00
Florian Thoma
045b2c569a fix typo
customise instead of customize
2015-05-03 13:35:05 +10:00
Stevie Mayhew
0d94cf15a5 UPDATE: change all instances of $this->request to use appropriate getter/setter 2015-04-30 11:04:08 +12:00
Antony Thorpe
b90432cb26 Update 03_Authentication.md
Create a list to improve presentation on the silverstripe.org website.  Hopefully this works.  The API descriptions/links are currently missing.
2015-04-26 18:16:13 +12:00
Will Morgan
959b326147 Merge pull request #4098 from phillprice/patch-10
DOCS: formatting fix
2015-04-25 11:46:47 +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
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
Antony Thorpe
27d3a27a97 Update 03_Testing_Email.md
Fix typo and link.  It is assertEmailSent not assertEmailSend and a method of SapphireTest.  Thanks.
2015-04-21 18:17:56 +12:00
spekulatius
9567d9c3f2 Update 01_Validation.md
missing semicolon
2015-04-19 20:21:49 +12:00
Will Rossiter
da6dbeca5f Merge pull request #4014 from jedateach/patch-5
DOC broken link in docs to how_tos/extend_cms_interface
2015-04-15 12:27:56 +12:00