Commit Graph

557 Commits

Author SHA1 Message Date
Damian Mooyman
8e1ae55ff6 API Enable single javascript files to declare that they include other files 2016-01-15 09:49:28 +13:00
David Alexander
5c99e33eb2 DOCS 3.1 - fixes broken internal links 2016-01-14 23:59:53 +13:00
Damian Mooyman
738e1db756 Update Nginx rules
Prevent disclosure of secure assets
2016-01-13 18:18:22 +13:00
Damian Mooyman
037467beae API Asset Access Control implementation 2016-01-13 18:18:22 +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
Damian Mooyman
c13b5d989f API Enable advanced configuration options for requirements combined files
API Enable relative root paths for the default Flysystem AssetAdapter
2015-12-01 11:07:13 +13: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
Daniel Hensby
ef35c2bb6b Merge pull request #4457 from tractorcow/pulls/4.0/no-query
API Remove SQLQuery
2015-11-03 16:41:07 +00:00
Damian Mooyman
1e1a7a345c Merge remote-tracking branch 'origin/3'
Conflicts:
	control/Director.php
	filesystem/File.php
	filesystem/GD.php
	filesystem/ImagickBackend.php
	forms/HtmlEditorField.php
	javascript/UploadField_uploadtemplate.js
	model/Image.php
	model/Image_Backend.php
	model/fieldtypes/Enum.php
	templates/AssetUploadField.ss
	tests/model/ImageTest.php
	tests/search/FulltextFilterTest.php
2015-11-03 14:23:16 +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
Damian Mooyman
d1ea74e40d API Implement AssetField to edit DBFile fields 2015-10-23 16:57:44 +13:00
Damian Mooyman
3e7eecf978 API Remove SQLQuery 2015-10-23 16:26:04 +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
Damian Mooyman
be239896d3 API Refactor of File / Folder to use DBFile
API Remove filesystem sync
API to handle file manipulations
2015-10-13 11:57:39 +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
Damian Mooyman
ac27836d2b API Implementation of RFC-1 Asset Abstraction 2015-09-24 12:57:28 +12: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
b552a7370f Merge remote-tracking branch 'origin/3'
Conflicts:
	tests/model/ImageTest.php
2015-09-09 15:44:47 +12: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
Sam Minnee
1b8d295767 API CHANGE: Shift to Monolog for error reporting and logging
API CHANGE: Debug::showError(), Debug::showLines(), Debug::log(), and Debug::header() removed
NEW: Logging provided

ZendLog has been removed and monolog introduced instead as a dependency.
The “ErrorLogger” injection point is now the used as the logger that
errors are fed into, and implements PSR-3’s Psr\Log\LoggerInterface.

The SS_ERROR_LOG setting expect a Monolog Logger to be provided as the
ErrorLogger.
2015-08-28 16:06:41 +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
958f98b1cf Merge remote-tracking branch 'origin/3' 2015-08-24 13:08:54 +12:00
Damian Mooyman
1686c83826 Revert #3425 #3396 to restore deprecated functionality
Fixes #4514
2015-08-24 11:26:25 +12:00
Daniel Hensby
0b36082564 Merge branch '3'
Conflicts:
	.travis.yml
	composer.json
	docs/en/changelogs/4.0.0.md
	forms/gridfield/GridFieldExportButton.php
2015-08-17 13:12:41 +01: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
09210efbc0 Merge remote-tracking branch 'origin/3'
Conflicts:
	composer.json
	control/Session.php
	docs/en/05_Contributing/01_Code.md
	docs/en/05_Contributing/02_Release_Process.md
	forms/FormField.php
	model/DataQuery.php
	model/Image.php
	model/queries/SQLConditionalExpression.php
	view/SSViewer.php
	view/ViewableData.php
2015-07-31 15:49:35 +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 Minnee
a1f7dcafa2 NEW: Add ‘calls’ section to Injector configs.
As well as properties, you can now configure a series of method calls in
your service definitions.
2015-07-30 19:34:46 +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
0103b076c3 Merge remote-tracking branch 'origin/3'
Conflicts:
	forms/Form.php
	model/ManyManyList.php
2015-06-17 15:41:13 +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
786b1dd5d4 Merge remote-tracking branch 'origin/3'
Conflicts:
	control/HTTPRequest.php
	filesystem/Upload.php
	model/ManyManyList.php
2015-06-09 11:10:14 +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
Thierry François
533d5dbd4b NEW Admin url can now be customized
The default 'admin/' base URL can now be changed with Director rules
2015-05-31 16:54:00 +03: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
Damian Mooyman
922d02f535 API Enable filters to perform 'IS NULL' or 'IS NOT NULL' checks 2015-05-26 12:09:17 +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
Damian Mooyman
cd1eb1b484 Merge remote-tracking branch 'origin/3'
Conflicts:
	admin/tests/CMSFormTest.php
2015-05-19 09:19:47 +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
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
Ingo Schommer
72a284c9b8 Merge remote-tracking branch 'origin/3'
Conflicts:
	core/Constants.php
	docs/en/05_Contributing/01_Code.md
	tests/model/SQLQueryTest.php
2015-04-09 16:26:16 +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
ehyland
77a51c79ab Updated example code
Made class extend FunctionalTest.
2015-03-30 16:59:31 +11:00
jeffreyguo
92a73b83cf DOCS Update 12_Indexes.md
Fixing grammar mistakes
2015-03-23 10:15:33 +00:00
Marijn Kampf
91bdb5b530 Missing ; in example 2015-03-23 09:31:51 +00:00
jeffreyguo
e0627c7148 Update 01_Data_Model_and_ORM.md 2015-03-19 21:19:11 +00:00
jeffreyguo
bdba2c2e41 Update 01_SiteConfig.md
MINOR: wording errors
2015-03-18 11:25:26 +13:00
Jeremy Shipman
f2b1fa9aed FIX: broken link in docs to how_tos/extend_cms_interface
I'm not certain this fixes the issue, as I haven't tested it. It at least points it out.
2015-03-16 09:55:33 +13:00
Loz Calver
203f77116b Fixes, tests and documentation for multiple many_manys between the same class 2015-03-13 09:27:23 +00:00
jeffreyguo
8a82f05014 Update 01_Introduction.md
MINOR: wording and format correction
2015-03-12 14:40:18 +13:00
jeffreyguo
09026d92bc Update Dynamic_Default_Fields.md
MINOR: fixing grammar mistakes.
2015-03-11 16:27:56 +13:00
jeffreyguo
c6a499a1c1 Update 01_Data_Model_and_ORM.md
Line#15: removed "is" in "Database Columns are is defined"
Line#404: changed "17 or 74" to "17 or 43" according to line #409
2015-03-11 14:48:21 +13: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
wernerkrauss
fbe0592ef9 Update 00_Partial_Caching.md
Adding $ for variable names and quoted parameters as discussed with @kinglozzer on IRC
2015-03-09 12:50:05 +01:00
Daniel Hensby
ef818b3b7b Merge pull request #3970 from tractorcow/pulls/3.2/api-zero-pagination
API enable PaginatedList to be disabled by setting page length to 0
2015-03-09 11:28:36 +00:00
Ingo Schommer
45fcdc672a Merge pull request #3983 from dhensby/pulls/gender-neutral-docs
Making docs gender agnostic
2015-03-08 22:57:40 +13:00
Fred Condo
bd5f5232fa DOCS: Correct & expand routing docs
- Correct syntax error in TeamController sample code
- Explain mandatory use case of $url_handlers
- Provide sample code for mandatory use case of $url_handlers
2015-03-07 13:25:44 -08:00
Daniel Hensby
d2a3da2203 Making docs gender agnostic 2015-03-07 12:32:04 +00:00
Damian Mooyman
9367fd2456 API enable PaginatedList to be disabled by setting page length to 0 2015-03-05 12:07:14 +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
Damian Mooyman
773624a40b Merge pull request #3947 from camfindlay/docs/uploadfield
DOCS Reinstate a missing upload field doc and give a review.
2015-02-26 17:51:01 +13:00
Cam Findlay
8146943a00 DOCS Reinstate a missing upload field doc and give a review. 2015-02-26 15:17:05 +13:00
Jeremy Shipman
39fac21fb9 Explain the module specific themes separation capability of Silverstripe
Relates to #3944
2015-02-26 12:56:33 +13:00
johndalangin
5eb5cc7cca YML Config Not Compatible with Requirements Class
After hours of trying to debug why `write_js_to_bottom` wasn't working, I realized that the Requirements class variables were set to `protected` and not `private static` which I believe is necessary for the Config YML variables to be passed correctly to the class.

The documentation was edited to reflect the working, albeit traditional non-YML method of setting class variables.

Best regards,

John
2015-02-24 00:58:31 +08:00
Damian Mooyman
a86ed93759 Merge remote-tracking branch 'origin/3'
Conflicts:
	docs/en/05_Contributing/01_Code.md
2015-02-20 14:09:38 +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
Nic
5cda017424 Update index.md to link to how-to's for 3 tutorials/recipies 2015-02-18 20:47:57 -06:00
Daniel Hensby
8a405b50b0 Merge branch 'patch-3' of https://github.com/AntonyThorpe/silverstripe-framework into AntonyThorpe-patch-3
DOCS Error handling examples of different files closes #3701

Conflicts:
	docs/en/topics/error-handling.md
2015-02-18 00:10:49 +00:00
LiamW
36dbd4f8a1 Update 11_Scaffolding.md
Noticed the call to the tab is wrong.
2015-02-12 14:16:05 -05:00
gavin bruce
e96d40d391 Update 00_Partial_Caching.md
Spelling mistake fix.
2015-02-10 14:30:29 +10:00
Nick
a7be8003e0 Fix some broken links for flushable and errors in the caching code examples 2015-02-09 22:55:59 +13:00
Nick
9303912b7f Update 04_Preview.md
Fix the yaml example
2015-02-04 22:15:49 +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
Will Rossiter
5219cb0f6b Merge pull request #3844 from marsvogel/patch-2
DOCS Fix formatting in Link-Section
2015-02-03 09:17:02 +13:00
Christopher Bischoff
104f6693d7 DOCS Fix formatting in Link-Section 2015-02-02 17:31:15 +01:00
Christopher Bischoff
56620ba0e3 DOCS Fix formatting 2015-02-02 17:20:05 +01:00
Marijn Kampf
eeef72e653 Fixed example to work when copied and pasted.
Original example gives: Fatal error: Using $this when not in object context in E:\localhost\abscreensavers.com\mysite\code\Page.php on line 19
2015-01-30 10:07:27 +00:00
BeQ
92c6aa93fd Update 10_Versioning.md 2015-01-24 18:24:02 -05:00
Nic
43d0ae6263 Update 11_Scaffolding.md to use dataFieldByName 2015-01-23 10:04:19 -06:00
Cam Findlay
0f617e1f5f DOCS bulleted API calls show up as a broken code block
This simplifies the formatting to ensure it's actually readable on docs.
2015-01-23 19:58:54 +13:00
Anjana Wijesundara
376ce73390 mysite/code/Page.php to mysite/code/Product.php
"mysite/code/Page.php" line in Displaying Results Section should be "mysite/code/Product.php"
2015-01-22 22:28:13 +05:30
Will Rossiter
315d6b6e2c Merge pull request #3806 from MichaelCSLWeb/patch-3
Update 01_Image.md
2015-01-21 16:52:22 +13:00
Cam Findlay
3de82ce8dc DOCS Fixed link to yaml config docs. 2015-01-21 15:27:22 +13:00
Michael
e571b52a27 Update 01_Image.md
Ive added this to show you can change the color of the padding area
2015-01-20 14:23:53 +00:00
Damian Mooyman
58cb0af753 Merge remote-tracking branch 'origin/3'
Conflicts:
	composer.json
	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/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/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
2015-01-16 10:08:40 +13: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
3239cfd495 DOCS - fix reported broken links by zippy in IRC 2015-01-14 08:59:55 +13:00
Michael Strong
a02adf6854 FIX Uneccessary class replacement
Overly complex code example.
2015-01-08 20:53:45 +13:00
OliBridgman
95be3593ea Update 01_Data_Model_and_ORM.md
Couple of grammatical errors.
2015-01-04 23:32:19 +13:00
Zomxilla
8e9f1d48c6 Remove trailing "###"
Incorrect markdown
2014-12-22 13:00:51 +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
66d0fcc11c Migrate 3.2 docs into new docs structure 2014-12-17 15:50:06 +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
Stevie Mayhew
6d0cd49d6d MINOR: spelling mistake 2014-12-17 15:50:06 +13:00
Cam Findlay
afc8db7e33 Rebased on 3.1 and added missing site reports doc 2014-12-17 15:50:06 +13:00
Ingo Schommer
11c1563778 Docs for exec pipeline and manifests
- Added manifest logic docs
- More obvious pointers to flushing
- Removed Director page since it duplicated a lot of information already presenting in routing,
which in itself is already duplicated between routing.md and controllers.md.
- Merged Director execution rundown into main exec pipeline docs
- Moved YAML security note from main installation docs to "secure coding", making it less obvious
2014-12-17 15:50:05 +13:00
Will Rossiter
e743fedc65 Importing cookie content 2014-12-17 15:50:05 +13:00
Cam Findlay
4d0448c254 Tutorials review and update image path 2014-12-17 15:50:05 +13:00
Will Rossiter
e729131a63 Move CMS Howtos 2014-12-17 15:50:05 +13:00
Uncle Cheese
fe62a2fa79 developer guides, templates review 2014-12-17 15:50:05 +13:00
Will Rossiter
ff91f99522 Add brief highlevel docs on cookie / session 2014-12-17 15:50:05 +13:00
Will Rossiter
fe96fc581d Clean up search documentation 2014-12-17 15:50:01 +13:00
Uncle Cheese
f83c8f0821 developer guides / models 2014-12-17 15:49:27 +13:00
Will Rossiter
e448fb9434 Model guide documentation 2014-12-17 15:49:24 +13:00
Will Rossiter
e65b3ad3fb Review and clean up of extending section 2014-12-17 15:49:08 +13:00
Cam Findlay
1df3d7cee1 Rebased additional documentation since May 2014.
New pages filed and metadata added.
2014-12-17 15:48:58 +13:00
Will Rossiter
48f53b98a1 Rewrite, tidy and format of Forms documentation 2014-12-17 15:48:58 +13:00
Will Rossiter
b4d8dfc9ee Controller documentation 2014-12-17 15:48:58 +13:00
Will Rossiter
bbfc03ad51 Review and tidy up of configuration guide 2014-12-17 15:48:58 +13:00
Will Rossiter
627cc520d9 Rewrite and tidy up of performance section 2014-12-17 15:48:58 +13:00
Will Rossiter
576f34a539 Review and rewrites for Testing Developer Guide 2014-12-17 15:48:58 +13:00
Will Rossiter
4fcbc9a402 Clean up debugging documentation 2014-12-17 15:48:57 +13:00
Will Rossiter
7fc6110a6f Tidy up templates guide 2014-12-17 15:48:57 +13:00
Will Rossiter
c54dee5452 Review email documentation 2014-12-17 15:48:57 +13:00
Will Rossiter
3d8c9232e0 Review, cleanup and refresh of integration section 2014-12-17 15:48:57 +13:00
Will Rossiter
0c73768e8c Review, clean up of CLI documentation 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
1ceb10be4a Update documentation introduction 2014-12-17 15:48:41 +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
e11876c183 Migrate 3.2 docs into new docs structure 2014-12-16 11:01:17 +13:00
Cam Findlay
1f7e627a50 FIX How to folder on forms 2014-12-16 11:01:17 +13:00
Cam Findlay
ddd83304ce FIX: Feedback to name the fields section to "field types" to make it clearer what the section is about. 2014-12-16 11:01:16 +13:00
Stevie Mayhew
df68e5e287 MINOR: spelling mistake 2014-12-16 11:01:16 +13:00
Cam Findlay
fa9728a0c3 Rebased on 3.1 and added missing site reports doc 2014-12-16 11:01:16 +13:00
Ingo Schommer
f499bf7bf4 Docs for exec pipeline and manifests
- Added manifest logic docs
- More obvious pointers to flushing
- Removed Director page since it duplicated a lot of information already presenting in routing,
which in itself is already duplicated between routing.md and controllers.md.
- Merged Director execution rundown into main exec pipeline docs
- Moved YAML security note from main installation docs to "secure coding", making it less obvious
2014-12-16 11:01:16 +13:00
Will Rossiter
7dbb2ecaea Importing cookie content 2014-12-16 11:01:16 +13:00
Cam Findlay
7261687c4c Tutorials review and update image path 2014-12-16 11:01:16 +13:00
Will Rossiter
c0b09a5c36 Move CMS Howtos 2014-12-16 11:01:15 +13:00
Uncle Cheese
59dcd4d181 developer guides, templates review 2014-12-16 11:01:15 +13:00
Will Rossiter
71cbcd4920 Add brief highlevel docs on cookie / session 2014-12-16 11:01:15 +13:00
Will Rossiter
548cbfad8b Clean up search documentation 2014-12-16 11:01:15 +13:00
Uncle Cheese
09be3352a0 developer guides / models 2014-12-16 11:01:15 +13:00
Will Rossiter
30a85be38e Model guide documentation 2014-12-16 11:01:15 +13:00
Will Rossiter
19259e0497 Review and clean up of extending section 2014-12-16 11:01:15 +13:00
Cam Findlay
ce02d01274 Rebased additional documentation since May 2014.
New pages filed and metadata added.
2014-12-16 11:01:15 +13:00
Will Rossiter
9fbbf6d88a Rewrite, tidy and format of Forms documentation 2014-12-16 11:01:14 +13:00
Will Rossiter
82b1b3d566 Controller documentation 2014-12-16 11:01:14 +13:00
Will Rossiter
5eca844c8d Review and tidy up of configuration guide 2014-12-16 11:01:14 +13:00
Will Rossiter
cd1769c393 Rewrite and tidy up of performance section 2014-12-16 11:01:14 +13:00
Will Rossiter
e1ba55ac05 Review and rewrites for Testing Developer Guide 2014-12-16 11:01:14 +13:00
Will Rossiter
b57b3ff454 Clean up debugging documentation 2014-12-16 11:01:14 +13:00
Will Rossiter
2f25f33249 Tidy up templates guide 2014-12-16 11:01:14 +13:00
Will Rossiter
31a1e2f639 Review email documentation 2014-12-16 11:01:14 +13:00
Will Rossiter
a08bd9c12f Review, cleanup and refresh of integration section 2014-12-16 11:01:14 +13:00
Will Rossiter
397843a49f Review, clean up of CLI documentation 2014-12-16 11:01:13 +13:00
Will Rossiter
a506dfd42a Add introduction files to each of the sections 2014-12-16 11:01:13 +13:00
Will Rossiter
45a0ab3cd0 Update documentation introduction 2014-12-16 11:01:13 +13:00
Will Rossiter
8e8c5d716d Restructure of the docs markdown source files into more logical taxonomy 2014-12-16 11:01:12 +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
Stevie Mayhew
34c812131d MINOR: spelling mistake 2014-12-15 09:12:48 +13:00
Cam Findlay
987fde2bed Rebased on 3.1 and added missing site reports doc 2014-12-15 09:12:48 +13:00
Ingo Schommer
7e0276b8ad Docs for exec pipeline and manifests
- Added manifest logic docs
- More obvious pointers to flushing
- Removed Director page since it duplicated a lot of information already presenting in routing,
which in itself is already duplicated between routing.md and controllers.md.
- Merged Director execution rundown into main exec pipeline docs
- Moved YAML security note from main installation docs to "secure coding", making it sless obvious
2014-12-15 09:12:48 +13:00
Will Rossiter
304f89bd12 Importing cookie content 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
d01c8d7990 Move CMS Howtos 2014-12-15 09:12:47 +13:00
Uncle Cheese
b7daa8d1ee developer guides, templates review 2014-12-15 09:12:47 +13:00
Will Rossiter
ae4d61eefb Add brief highlevel docs on cookie / session 2014-12-15 09:12:47 +13:00
Will Rossiter
a7971d0540 Clean up search documentation 2014-12-15 09:12:47 +13:00
Uncle Cheese
c1c0ad3dac developer guides / models 2014-12-15 09:12:47 +13:00
Will Rossiter
699b999f1e Model guide documentation 2014-12-15 09:12:47 +13:00
Will Rossiter
918baf1ca3 Review and clean up of extending section 2014-12-15 09:12:47 +13:00
Cam Findlay
b7272e09c6 Rebased additional documentation since May 2014.
New pages filed and metadata added.
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
30cf733948 Controller documentation 2014-12-15 09:12:46 +13:00
Will Rossiter
1d31611e7e Review and tidy up of configuration guide 2014-12-15 09:12:46 +13:00
Will Rossiter
f4dad25af0 Rewrite and tidy up of performance section 2014-12-15 09:12:46 +13:00
Will Rossiter
549531798f Review and rewrites for Testing Developer Guide 2014-12-15 09:12:46 +13:00
Will Rossiter
ebf28bc66b Clean up debugging documentation 2014-12-15 09:12:46 +13:00
Will Rossiter
fc952ef1e8 Tidy up templates guide 2014-12-15 09:12:46 +13:00
Will Rossiter
720ff48d28 Review email documentation 2014-12-15 09:12:45 +13:00
Will Rossiter
7458b10b6d Review, cleanup and refresh of integration section 2014-12-15 09:12:45 +13:00
Will Rossiter
65309fa5d4 Review, clean up of CLI documentation 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
85f3beee2c Update documentation introduction 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