Ingo Schommer
4af9143d3b
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
docs/en/misc/contributing/code.md
2014-02-07 16:43:22 +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
Lukas
389b7f929b
use the yml config system instead of _config.php for extensions
2014-02-03 14:26:49 +01: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
Simon Welsh
39d42e4ea3
Merge branch '3.1'
2014-01-09 08:22:47 +13: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
Ingo Schommer
f29d51f433
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
docs/en/reference/dataobject.md
lang/es.yml
2013-12-19 20:23:09 +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
Ingo Schommer
d5179adb01
Improved index docs
2013-12-13 12:06:22 +01:00
Fred Condo
b88a0955a5
API: Support string descriptors for unique indexes in Versioned
...
- Document the format for descriptor arrays
- Implement the behaviour that developers have come to expect for
string descriptors of indexes
- Add test for handling of unique indexes (MySQL & sqlite3)
- Resolve #2403
Versioned needs to convert unique indexes to non-unique for its suffixed
tables, such as Foo_Live and Foo_versions. Because DataObject accepts
string descriptors such as array('UniqIDX' => 'unique (Uniq)') as well
as array-based descriptors, Versioned needs to recognize string
descriptors. This patch accomplishes that. Before, Versioned would fail
to convert string-described indexes to non-unique, resulting in run-time
errors when creating a new version of an object.
2013-12-06 10:02:44 -08:00
Ingo Schommer
b1fa2d282e
Merge remote-tracking branch 'origin/3.1'
2013-12-06 13:04:56 +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
6176d65bd2
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
forms/gridfield/GridFieldSortableHeader.php
model/DataList.php
model/fieldtypes/Enum.php
2013-12-02 20:49:34 +01: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
Andrew Short
bedf292612
Merge branch '3.1'
...
Conflicts:
docs/en/reference/execution-pipeline.md
lang/nl.yml
2013-11-11 18:18:25 +11:00
Ingo Schommer
61f99fa1ef
UploadField changeDetection optional ( fixes #2638 )
2013-11-06 23:34:29 +01:00
Damian Mooyman
b6b3cd9889
API GridState_Data values can have default values specified during retrieval.
...
Fixes issues with GridStata_Data being returned from various states when value types are necessary.
Pruning of dead code from GridFieldAddExistingAutocompleter
Documentation for GridState
2013-10-24 16:15:33 +13:00
Loz Calver
01746d175a
Update docs to consistently use http://localhost/ ( fixes #1919 )
2013-10-23 20:24:52 +01:00
Ingo Schommer
25b6175e67
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
.travis.yml
forms/FormField.php
2013-10-20 13:52:56 +02: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
Ingo Schommer
8727d1b1eb
Merge remote-tracking branch 'origin/3.1'
2013-10-10 12:11:50 +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
455e550d9a
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
docs/en/topics/testing/create-silverstripe-test.md
forms/Form.php
i18n/i18n.php
model/Image.php
2013-09-27 19:22:14 +02: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
Simon Welsh
c2105db6d0
Count, not Length
2013-09-11 12:05:43 +12:00
Ryan Wachtl
15a1d96e5b
Update requirements.md
...
Missing semicolon in example code.
2013-09-03 01:18:58 -05:00
Mateusz Uzdowski
137aa53156
Return jQuery deferred object from LeftAndMain's loadFragment.
2013-08-23 09:39:38 +12:00
Ingo Schommer
a4c6ae3e90
Merge remote-tracking branch 'origin/3.1'
2013-08-22 13:56:33 +02:00
Mateusz Uzdowski
1f8feb5efc
API Provide a thin alternative to loadPanel/submitForm.
...
This is needed in some situations when we only want to update a
small single component, sometimes even using a different controller to
the one implied in the URL.
An example here is reloading dynamically the subsite dropdown without
reloading the entire page, updating a filter sidebar or suchlike.
2013-08-22 15:16:13 +12:00
Ingo Schommer
7ae75c1a89
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
forms/HtmlEditorField.php
2013-08-16 13:37:44 +02:00
Kirk Mayo
6bb9386159
BUG: Updating old reference of sapphire to framework
2013-08-14 12:18:55 +12:00
Ingo Schommer
542728cd94
Merge remote-tracking branch 'origin/3.1'
2013-08-03 19:47:32 +02:00
Ingo Schommer
31e8ec3795
Docs: Consistent arg quoting in <% require %> ( #1614 )
2013-08-03 18:44:32 +02:00
Stephen Shkardoon
6e47a25098
Fix misleading documentation about Children.max
...
Currently, the documentation implies that doing a `Children.max(LastEdited)` will work, which isn't the case.
This change uses `AllChildren.max(LastEdited)` instead, which while slightly more inefficient, will actually work consistently.
2013-07-29 15:18:39 +12:00
Hamish Friedlander
0a79ac3592
Merge branch 'origin/3.1'
...
Conflicts:
templates/forms/CheckboxSetField.ss
templates/forms/FormField_holder.ss
templates/forms/OptionsetField.ss
2013-07-19 16:25:38 +12:00
Hamish Friedlander
d38bd7d5cb
Merge branch 'origin/3.0' into 3.1
2013-07-19 14:18:49 +12:00
Hamish Friedlander
1298d4a5bd
FIX Prevent DOS by checking for env and admin on ?flush=1 ( #1692 )
2013-07-19 12:24:32 +12:00
Jeremy Thomerson
71f8c1306f
DOCFIX: small typo causing linking error
2013-07-11 13:40:34 +00:00
Simon Welsh
fbce9fd7cd
Merge branch '3.1'
...
Conflicts:
.travis.yml
docs/en/misc/contributing/code.md
javascript/HtmlEditorField.js
2013-07-05 10:22:58 +12:00