Commit Graph

251 Commits

Author SHA1 Message Date
Simon Welsh
824c6067a2 Merge pull request #3107 from micmania1/patch-1
CustomMember extends wrong class.
2014-05-24 11:08:35 +10:00
Marijn Kampf
5daec94830 Update uploadfield.md
Fix 403 forbidden error: Action 'Form' isn't allowed on class GalleryPage_Controller.
2014-05-15 08:55:16 +01:00
Michael Strong
9e66db4fe1 CustomMember extends wrong class.
CustomMember was extending the wrong class to be able to reference $this->owner.

Also, changed CustomMember to MyMemberExtension to remain consistent with the initial example.
2014-05-06 09:37:30 +01:00
Hamish Friedlander
bbd7bba11f Merge pull request #3058 from tractorcow/pulls/injector-stack-tests
API Injector supports nesting
2014-05-06 11:35:32 +12:00
Michael Parkhill
bd5abb62ff FIX: parent::init is not called first
In the controller's init function, parent::init() should be called before any other method calls.
2014-05-01 15:35:45 +12:00
Damian Mooyman
a46f5f133a Merge pull request #3068 from kinglozzer/patch-1
DOCS: Minor fixes to RestfulService documentation
2014-04-29 09:04:29 +12:00
Damian Mooyman
d06d5c113b API Injector supports nesting
BUG Resolve issue with DirectorTest breaking RequestProcessor
Injector::nest and Injector::unnest are introduced to better support sandboxing of testings.
Injector and Config ::nest and ::unnest support chaining
Test cases for both Injector::nest and Config::nest
2014-04-29 08:59:33 +12:00
Ingo Schommer
280ab2dcd3 Merge pull request #3026 from tractorcow/pulls/3.1-gridfield-paging
API Make default gridfield paging configurable
2014-04-28 23:06:23 +12:00
Loz Calver
61f6f2e814 DOCS: Minor fixes to RestfulService documentation 2014-04-28 09:14:27 +01:00
Damian Mooyman
892b440115 API Make default gridfield paging configurable
Documentation improved
2014-04-28 15:13:01 +12:00
Martin D.
4535448bce Fixed small typo
ration changed to ratio
2014-04-16 13:26:47 -04:00
camfindlay
86aef8a42b Fixed reference to the templates documentation 2014-04-09 18:27:43 +12:00
Scott McMurray
36763abcec Update dataobject.md
This page is grid-field not gridfield.
2014-04-06 18:35:42 +01:00
Chris Turner
32760555f7 Update datefield.md
Removed ; at the end of ->setConfig('dmyfields', true) in the three chain example. Is confusing for new users/developers who are not aware of how to chain methods.

Closes #3006
2014-04-04 09:49:01 +13:00
Simon Welsh
f9c44e4ceb Merge branch '3.0' into 3.1
Conflicts:
	model/Versioned.php
	view/SSTemplateParser.php
	view/SSViewer.php
2014-03-30 18:15:12 +13:00
Martin D
3e05ccb9b7 Fix link to the HtmlEditorField API page
Closes #2990
2014-03-30 18:04:17 +13:00
Damian Mooyman
4415a75d93 BUG Fix issue with versioned dataobjects being cached between stages 2014-03-27 13:17:29 +13:00
Sean Harvey
7ecc563783 Merge pull request #2969 from mrsmuneton/3.1
Issue 1603, rewrote first sentence - uses the php curl lib
2014-03-20 16:13:22 +13:00
Ray
0b7d617875 Issue 1603, rewrote first sentence - uses the php curl lib
Issue 1603, rewrote first sentence - uses the php curl library, enabling connections to remote web services
2014-03-19 20:00:13 -07:00
Zauberfisch
62537c5886 more docs for GridField & ModelAdmin customization 2014-03-16 08:40:50 +00:00
Ray
7669c5b869 Noting two more arguments in the list RSSFeed 2014-03-15 21:25:28 +13:00
Howard Grigg
8ee6359e44 DOCS Added info about adjusting Image quality using new config 2014-03-12 10:44:47 +10:00
Simon Welsh
0e0597f8cd Merge branch '3.0' into 3.1
Conflicts:
	control/Director.php
	dev/Backtrace.php
	docs/en/installation/nginx.md
	model/HTMLValue.php
	tests/model/SQLQueryTest.php
2014-03-10 22:56:27 +13:00
torleif
c3994f4ce7 Update preview.md
The JavaScript entwine example contains an extra jQuery wrapper
2014-03-04 11:32:45 +13:00
torleif
56e0c72cb0 Update shortcodes.md
Trying to link to [embed] causes the parser to break. (see: http://doc.silverstripe.org/framework/en/reference/shortcodes)
2014-02-26 13:39:14 +13:00
sanjay
fff9222dd3 update dataobject.md
fixex typo
2014-02-20 16:40:47 +05:30
Ingo Schommer
5e29249593 Merge remote-tracking branch 'origin/3.0' into 3.1
Conflicts:
	search/filters/PartialMatchFilter.php
2014-02-12 15:18:27 +13:00
Kirk Mayo
632884252b NEW: Updating out of date URLs in the framework source code and docs 2014-02-07 15:10:44 +13:00
Ingo Schommer
457ec9446b Merge pull request #2700 from ajshort/injector-factory
Injector Factory
2014-02-03 16:50:15 -08:00
Andrew Short
2f817ba177 NEW: Allow specifying a factory to use for creating services.
A service factory can be used for creating instances where a non-trivial
construction process is required. This is done by adding a `factory`
key to the service definition.
2014-02-03 11:30:22 +11:00
James Goodman
9c9e5c0656 Fix error in code block for ModelAdmin example 2013-12-24 07:59:05 +13:00
Will Rossiter
3e2cf27b38 Add ability for a panel link to link externally. 2013-12-21 16:59:09 +13:00
Simon Erkelens
b64a89d103 Minor language and readability fixes. 2013-12-20 12:24:03 +01:00
Simon Erkelens
5c595146a0 MINOR Documentation slightly improved for js inclusion
Although I'm not the best documentor.
2013-12-19 20:37:52 +01:00
Will Rossiter
763aa2fbf6 Clarify usage of extend within DataExtensions 2013-12-18 19:59:58 +13:00
Ingo Schommer
34c5cb8d1b Added index docs to DataObject
Thanks to @oddnoc for getting this started, see
https://github.com/silverstripe/silverstripe-framework/pull/2686
2013-12-13 12:09:48 +01:00
Diogo Freire
8f8a200496 Updating SearchContext documentation
PaginatedList::setPageSize and PaginatedList::setTotalSize don't exist.
2013-12-06 15:45:38 +13:00
Ingo Schommer
46d662fe31 Docs for Requirements::block()
https://github.com/silverstripe/silverstripe-framework/pull/2685/files
Thanks to @Firesphere for staring this!
2013-11-29 18:27:43 +01:00
madmatt
f0ae1160ed Update partial-caching.md 2013-11-12 17:22:59 +13:00
madmatt
eed29a1557 Update partial-caching doc to include note on using .Max and .Count together. 2013-11-12 16:05:16 +13:00
Tim
e2238245b9 Fixed RSS example 2013-11-12 10:50:27 +13:00
Ingo Schommer
61f99fa1ef UploadField changeDetection optional (fixes #2638) 2013-11-06 23:34:29 +01:00
Loz Calver
01746d175a Update docs to consistently use http://localhost/ (fixes #1919) 2013-10-23 20:24:52 +01:00
cieszak
092cda89af Update rssfeed.md
add $allowed_actions
2013-10-15 23:01:23 +02:00
Ingo Schommer
18826d5bd3 GridField fragment docs 2013-10-10 13:14:17 +02:00
Andrew Short
a339687493 API: Pass extra context information to shortcode handlers.
This allows shortcodes to perform more complex actions on the element
which contains them. For example, the element reference can be used
to add extra classes or attributes to links which provide additional
metadata.
2013-10-09 15:05:17 +11:00
Ingo Schommer
12a4a8c9dc Merge pull request #2430 from wilr/gridfieldactions
Add how to for custom GridField row actions.
2013-09-25 12:47:27 -07:00
Dan Brooks
3e5f788ddc Squashing previous corrections into one commit along with a couple more
corrections to the docs, including changing the example seen in
fixtures.md
2013-09-24 19:21:04 +01:00
Will Rossiter
7a9ef16a0c Add how to for custom GridField row actions. 2013-09-19 23:38:35 +12:00
Ingo Schommer
03d1d58148 Merge remote-tracking branch 'origin/3.0' into 3.1
Conflicts:
	admin/code/SecurityAdmin.php
	css/AssetUploadField.css
	docs/en/topics/configuration.md
	security/PermissionRole.php
2013-09-12 17:33:36 +02:00