tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity
15,866 Commits 31 Branches 527 Tags 162 MiB
23f764f8b0
Commit Graph

256 Commits

Author SHA1 Message Date
Damian Mooyman
5d240feaec Merge remote-tracking branch 'origin/3.2' into 3.3 2016-01-19 15:08:24 +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
3c55608075 Merge pull request #4892 from camfindlay/patch-37 
DOCS FIX typo for i18n
 2016-01-06 15:18:51 +13:00
Peter Thaleikis
4366000a9f fixing examples 
PSR-2 style for examples
 2016-01-06 12:28:26 +13:00
Cam Findlay
7b77380df5 DOCS FIX typo for i18n 
Was causing a number of 404 crawl errors.
 2016-01-06 09:11:23 +13:00
Gordon Anderson
f61cedc03c Update to 00_Unit_Testing 
Additional section with instructions on running tests using in memory SQLite,
 2015-12-30 13:29:32 +07:00
Damian Mooyman
d63441623a Merge pull request #4612 from johndalangin/patch-4 
Added cookie_secure configuration directive
 2015-12-22 16:36:05 +13:00
Damian Mooyman
48a30909f3 Merge remote-tracking branch 'origin/3.2' into 3 
# Conflicts:
#	admin/javascript/LeftAndMain.BatchActions.js
#	css/UploadField.css
#	forms/HtmlEditorField.php
 2015-12-22 14:07:52 +13:00
Hamish Friedlander
1eda9151a4 Merge pull request #4831 from open-sausages/pulls/3/fix-versioned-canview 
API Create default security permission model for versioned data objects
 2015-12-09 14:17:27 +13:00
Damian Mooyman
6089a7c5bd API Create default security permission model for versioned data objects 2015-12-09 11:33:53 +13:00
Peter Thaleikis
7db7140a70 fixing example 2015-12-04 11:14:02 +13:00
Marcus Nyeholt
f7c270a3ba NEW Use Config for determining Vary header 
Existing implementation hardcodes the Vary header; swap to using Config layer
instead

Added test for changing the variable from config
 2015-12-02 10:28:24 +11:00
muskie9
fc3b06dbf9 DOCS update LinkingModes description 2015-11-23 14:10:47 -06: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
Daniel Hensby
583cbdd77f Merge pull request #4756 from camfindlay/patch-34 
DOCS Suggest a tool to help people generate their change logs for mod…
 2015-11-10 07:50:11 +00:00
Cam Findlay
218049f5c0 DOCS Suggesting a convention for CMS user documentation so CMS users don't get lost in dev docs. 2015-11-10 11:59:38 +13:00
Cam Findlay
c7b2f88d4e DOCS Suggest a tool to help people generate their change logs for modules. 2015-11-10 11:50:53 +13:00
Damian Mooyman
c4dc10b255 Merge remote-tracking branch 'origin/3.2' into 3 
Conflicts:
	forms/DropdownField.php
	tests/model/ImageTest.php
 2015-11-03 13:06:39 +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
Ed Linklater
cacbbd75bc DOCS: jQuery delegation in Admin interface 2015-11-01 05:46:13 +13:00
Michael Parkhill
e44f22c6b2 Fix broken link to DataObject api 2015-10-28 11:52:35 +13:00
Christopher Darling
a1e343629b DOCS: correct config setting for custom editor.css 
see a964e7636e/admin/code/LeftAndMain.php (L287-L308)
 2015-10-26 11:02:47 +00:00
Peter Thaleikis
791c52c6bd fixing syntax error 2015-10-25 22:41:13 +13:00
David Alexander
e88032a7aa DOCS : spelling 2015-10-23 13:49:03 +13:00
Cam Findlay
a555817d6f DOCS Module standard 1.0 
Adding the module standard to 3.2+ docs.
 2015-10-19 11:44:31 +13:00
Daniel Hensby
fa878b1e1f Merge pull request #4642 from hailwood/patch-1 
DOCS Remove extra set of li's
 2015-10-03 10:28:50 +01:00
Matthew Hailwood
5e68512e1c Remove extra set of li's 2015-09-30 14:19:20 +13:00
Liam Whittle
71a2ef1350 fixed minor GridField initialization syntax. 2015-09-29 18:51:08 -04:00
Peter Thaleikis
7ca97cd86d Update 01_Extensions.md 
adding missing space
 2015-09-20 15:15:54 +12:00
johndalangin
23d0f51592 Added cookie_secure configuration directive 
Seeing that cookie_secure is not yet added to the documentation, I took the liberty to add it myself.

Thanks and hope this helps!
 2015-09-17 15:53:58 +08:00
Damian Mooyman
f10785350e Merge remote-tracking branch 'origin/3.2' into 3 
Conflicts:
	docs/en/02_Developer_Guides/02_Controllers/01_Introduction.md
 2015-09-09 14:50:47 +12:00
Damian Mooyman
309ac0d196 Merge remote-tracking branch 'origin/3.1' into 3.2 
Conflicts:
	.travis.yml
	admin/code/CMSProfileController.php
	admin/tests/LeftAndMainTest.php
	control/HTTP.php
	security/Permission.php
	tests/forms/FormTest.php
	tests/model/ArrayListTest.php
	tests/security/PermissionTest.php
 2015-09-09 14:35:29 +12:00
johndalangin
1b661c9f17 Typo Correction 2015-09-07 17:08:49 +08:00
Matthias Schelling
f43c528a0d fixed typo in shortcode docs 2015-09-03 14:46:42 +02:00
Sam Minnée
f4b7cd3f68 Merge pull request #4500 from stevie-mayhew/pulls/get-response 
FEATURE: implement getter and setter usage for response
 2015-08-29 15:35:55 +12:00
Stevie Mayhew
1b57e0ca5b FEATURE: implement getter and setter usage for response 2015-08-29 10:24:06 +12:00
Sean Harvey
03d2fc73c5 Add warning on flush not being run automatically by unit test commands. 2015-08-28 13:00:22 +12:00
Daniel Hensby
209bb94319 DOCS Adding docs for special Permission cases 2015-08-26 23:32:07 +01:00
Damian Mooyman
1686c83826 Revert #3425 #3396 to restore deprecated functionality 
Fixes #4514
 2015-08-24 11:26:25 +12:00
Daniel Hensby
a8ab5a468d Merge branch '3.1' into 3.2 
Conflicts:
	admin/code/LeftAndMain.php
	composer.json
 2015-08-17 11:43:28 +01:00
David Alexander
44680d175c Spelling 2015-08-05 21:34:35 +12:00
Cam Findlay
ea16aca74b DOCS create() makes objects not classes. 
Thanks to Matthew at Cabbage Tree Creative for reporting.
 2015-08-03 12:50:24 +12: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
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
Simon Winter
9bb41358fa Update 05_Typography.md 
The documentation isn't clear as to where the editor config call should be made. If developers wish to set this up globally, there is a slightly different syntax required.
 2015-07-14 15:20:15 +12: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
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
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
Damian Mooyman
e91606e494 API Introduce $FromEnd variable for iterators 2015-04-09 17:02:30 +12:00
Elliot Sawyer
83a3c4b166 Update 01_Extensions.md 
Fix a typo
 2015-04-02 15:51:51 +13: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