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
Ingo Schommer
474dde8012
Merge remote-tracking branch 'origin/3.0' into 3.1
...
Conflicts:
docs/en/reference/grid-field.md
2013-06-24 14:39:09 +02:00
CheeseSucker
2ac3444675
MINOR: Fixed typo
2013-06-19 16:48:49 +02:00
Ingo Schommer
2160fb8000
Merge remote-tracking branch 'origin/3.0' into 3.1
...
Conflicts:
admin/javascript/LeftAndMain.js
tests/behat/features/bootstrap/SilverStripe/Framework/Test/Behaviour/CmsUiContext.php
tests/control/ControllerTest.php
2013-06-19 14:03:43 +02:00
Ingo Schommer
94b4237372
Merge remote-tracking branch 'origin/3.1'
2013-06-19 11:17:33 +02:00
CheeseSucker
9b881e5f92
[MINOR] build -> built
2013-06-15 02:19:29 +03:00
CheeseSucker
23cd824426
Rewrote a nonsensical paragraph about rewriting.
2013-06-15 02:18:01 +03:00
CheeseSucker
40ef812861
[MINOR] Fixed a markup error.
2013-06-15 00:58:45 +02:00
CheeseSucker
c4408163ee
Should fix an issue where the .htaccess file was split into several <pre> tags.
...
This error is not reproducible by the github preview tab, so I am not 100% sure it is fixed. Added whitespace on the empty lines.
2013-06-15 00:57:29 +02:00
Ingo Schommer
bfff11eb9c
API New CMSForm class to allow validation responses in CMS ( fixes #1777 )
...
Thanks to @willmorgan for getting this discussion started
(see https://github.com/silverstripe/sapphire/pull/1814 ).
2013-06-13 07:51:05 +02:00
Damian Mooyman
be986c6524
API Allow $summary_fields to support methods on DBFields
2013-06-13 09:41:24 +12:00
Will Rossiter
6d792adab2
Update documentation static declarations to private
...
Also spelling, grammar and line length clean up.
2013-06-08 15:16:59 +12:00
Stevie Mayhew
76f6e0f71e
MINOR: equality check consistency
...
Updated all equality checks to use double equals (==) for consistency.
2013-06-07 12:37:52 +12:00
Stevie Mayhew
6aae3d7d05
MINOR: equality check consistency
...
Updated all equality logic checks to use double == for consistency across the page.
2013-06-07 12:33:57 +12:00
Will Rossiter
e1b1fce31f
Doc cleanup (spelling, line length, grammar)
2013-06-02 13:38:10 +12:00
Will Rossiter
db85f3ca16
FIX extra_requirements to accept non associative arrays.
...
Added unit tests for extra_requirements_js and extra_requirements_css.
Fixed YAML documentation to indicate list syntax.
2013-06-02 13:37:34 +12:00
Ingo Schommer
5a1d476e8d
Merge branch 'idvalidattr' of git://github.com/wilr/sapphire into wilr-idvalidattr
2013-05-31 19:27:19 +02:00
Damian Mooyman
7f057ce343
API UploadField functions on new records
...
Fixed regression from 1e5d40474d
(UploadField::canPreviewFolder).
Merged in pull request #2009 - (6018bdd631
).
Merged pull request #1259 (34bfc862ee
).
2013-05-27 15:22:59 +12:00
Will Rossiter
9c1638a353
Remove references to ComplexTableField
2013-05-26 11:11:53 +12:00
Julian Seidenberg
22c7bbfcd4
NEW UploadField displays a warning before overwriting files (only relevant if config.yml: Upload:replaceFile = true).
2013-05-25 19:07:06 +12:00
Sam Minnee
738581f0f5
Merge remote-tracking branch 'origin/3.0' into 3.1
...
Conflicts:
.travis.yml
2013-05-23 18:59:34 +12:00
Will Rossiter
17ac2e36fc
Merge pull request #1864 from tomzen/patch-1
...
Have 'Configuration Reference' link point to uploadfield page
2013-05-21 03:38:20 -07:00
Ingo Schommer
e0f4bd6113
Fixed conventions in shortcode docs
2013-05-17 14:02:33 +02:00
Ingo Schommer
306d3b0c7e
Merged existing shortcode docs with new topics docs from 3.0
2013-05-17 14:01:42 +02:00
Ingo Schommer
9b0102b488
Merge pull request #1860 from tractorcow/3.1-beforeextend
...
NEW Added beforeExtending, afterExtending, and beforeUpdateCMSFields
2013-05-17 01:01:11 -07:00
Ingo Schommer
a87bbb2903
Updated github path
2013-05-17 00:45:52 +02:00
Ingo Schommer
faf6f12478
Merge remote-tracking branch 'origin/3.0' into 3.1
2013-05-17 00:43:01 +02:00
Ingo Schommer
a35de54882
Updated github path
2013-05-17 00:41:16 +02:00
Damian Mooyman
6e0e3564e1
NEW Added beforeExtending, afterExtending, and beforeUpdateCMSFields to allow user code better control over interaction with extending methods
2013-05-16 10:34:45 +12:00
Sean Harvey
a4f0983220
Updating docs to use SiteTree for aggregates with LastEdited example
...
Using SiteTree is faster, because it doesn't do any joining of Page
to get the aggregate, even though the LastEdited field is only on
SiteTree in the case of Page.
2013-05-14 17:12:02 +12:00
Will Rossiter
f45621b07e
Fix typo in templates documentation
2013-05-10 21:32:39 +12:00
tomzen
e64420433a
Have 'Configuration Reference' link point to uploadfield page
...
Oops.
2013-05-09 11:30:20 +02:00
Ingo Schommer
3b02d22989
Merge remote-tracking branch 'origin/3.0' into 3.1
...
Conflicts:
dev/CsvBulkLoader.php
2013-05-09 10:34:20 +02:00
tomzen
19071761b7
Add link to Config. Reference from the Config. Overview section to aid navigation a little
2013-05-07 11:13:27 +02:00
Ingo Schommer
5f91c3724d
Consistently used dollar notation in template docs (see #1794 )
2013-04-26 11:48:59 +02:00
Will Rossiter
c8d98861c0
Update template documentation to include DataList methods
...
https://github.com/silverstripe/sapphire/pull/1799 .
2013-04-25 11:54:10 +12:00
Trevor
50d2c26230
Issue #1775 Add reference to $Me in loop and update occurence of Children with $ prefix.
2013-04-23 10:01:00 +02:00
Sean Harvey
8278181b92
Merge branch '3.0' into 3.1
2013-04-22 17:14:45 +12:00
SticksTucker
8033955d35
Include AllPages() form method to $allowed_actions
2013-04-18 13:22:42 +10:00
Ingo Schommer
59dc0085d8
Merge remote-tracking branch 'origin/3.0' into 3.1
...
Conflicts:
docs/en/reference/urlvariabletools.md
tests/forms/CheckboxFieldTest.php
2013-04-12 01:13:32 +02:00
Ingo Schommer
ae09301c8c
Revert deprecation of Object::add_extension() usage
...
This reverts commit 14b997eea3
.
Its just not practical to use the Config API as it stands,
the add_extension() wrapper does more than just a Config->update().
Most use cases can be covered via YML, but any conditional
additions (e.g. in unit tests) can still benefit from the
add_extensions() shorthand.
2013-04-11 11:40:53 +02:00
Ingo Schommer
a68fb1f096
Fixed /admin/pages/publishall link in docs
2013-04-09 23:00:27 +02:00
Ingo Schommer
01f46d039f
NEW Enforce max node counts to avoid excessive resource usage
...
Rendering potentially 1000s of nodes can exceed the CPU and memory constraints
of a normal PHP process, as well as the rendering capabilities of browsers.
Set a hard maximum for the renderable nodes, deferring to a "show as list" action
in the main CMS tree. For TreeDropdownField, we don't have the list fallback option,
so ask the user to search for the node title instead.
Also makes both the "node_threshold_total" and "node_threshold_leaf" values configurable
2013-04-09 10:24:18 +12:00
s-m
6a95db0eff
API: Support inequalities in templates
...
This adds support for <, <=, >, >= in templates
2013-04-08 17:07:39 +02:00
Ingo Schommer
f296439a24
NEW Hints for scaffolded date/time fields
2013-04-08 19:38:50 +12:00
Will Rossiter
b25eda83c4
Remove reference to /images/flush.
...
Now a BuildTask. See /dev/tasks
2013-04-06 18:13:18 +13:00
Ingo Schommer
1dda9ae45f
Fixed extra_requirements docs
2013-04-05 15:35:30 +02:00
Ingo Schommer
c08ab18c03
Merge remote-tracking branch 'origin/3.0' into 3.1
...
Conflicts:
.travis.yml
admin/javascript/LeftAndMain.AddForm.js
docs/en/reference/requirements.md
2013-04-02 02:00:50 +02:00
Ingo Schommer
315c03872a
Fixed _config.php references and usage in docs
2013-03-27 12:06:57 +01:00
Ingo Schommer
3334eafcb1
API Marked statics private, use Config API instead ( #8317 )
...
See "Static configuration properties are now immutable, you must use Config API." in the 3.1 change log for details.
2013-03-24 17:20:53 +01:00
Ingo Schommer
ea0cedb3da
Removed internal/outdated/speculative docs from requirements.md
2013-03-21 12:44:34 +01:00
Andrew Short
b8a51c3792
Merge branch '3.0' into 3.1
2013-03-19 22:27:09 +11:00
Stephen Shkardoon
5f08ea3e6a
Fix minor formatting issues
...
Extra spaces in front of Action.
Removed the out of place text on GridField (is that meant to be a link or what?)
Missing a period on the end of some entries.
2013-03-18 14:37:26 +13:00
Stephen Shkardoon
ad5a090847
Typo "nee" -> "need"
...
Looks like Silverstripe needs the d.
2013-03-16 17:15:50 +13:00
Andrew Short
6ae931df24
Merge branch '3.0' into 3.1
2013-03-15 21:47:23 +11:00
Ryan Wachtl
957f4e75e8
Update execution-pipeline.md
...
Corrected naming of SS_HTTPResponse variable. Improved readability of PHP code samples.
2013-03-05 22:06:52 -06:00
Ingo Schommer
af52de97e9
Merge pull request #1161 from chillu/pulls/uploadfield-replacefile
...
NEW Upload->replaceFile setting
2013-02-27 01:24:27 -08:00
Sam Minnee
57952977c7
Merge branch 'refindex' of git://github.com/silverstripe-rebelalliance/sapphire into silverstripe-rebelalliance-refindex
...
Conflicts:
docs/en/reference/index.md
2013-02-25 15:05:15 +13:00
Sam Minnee
5734c2b3de
Merge branch 'refindex' of git://github.com/silverstripe-rebelalliance/sapphire into silverstripe-rebelalliance-refindex
...
Conflicts:
docs/en/reference/index.md
2013-02-25 15:03:46 +13:00
Jeremy Bridson
de641dd544
ENHANCEMENT: updated the reference index on doc.silverstripe.com 3.0 - There were lots of broken and missing links
2013-02-22 12:58:29 +13:00
Sean Harvey
db56d17056
Merge pull request #1190 from silverstripe-rebelalliance/feature/shortcodes
...
NEW Make shortcode parser more clever about placement
2013-02-17 19:00:14 -08:00
Hamish Friedlander
7efae6b95f
Merge remote-tracking branch 'origin/3.0' into 3.1
2013-02-18 14:31:57 +13:00
Ingo Schommer
d51e0bc2ec
Improved docs on $allowed_actions
...
Added section to "Controllers" and "Form" topics,
added $allowed_actions definitions to all controller examples
2013-02-17 23:30:40 +01:00
Hamish Friedlander
2335c074b3
NEW Make shortcode parser more clever about placement
...
Shortcodes have traditionally had a problem that they are inside <p> tags,
but generate block level elements. This breaks HTML compliance.
This makes the shortcode parser now mutate the DOM based on the "class" attribute on
the shortcode to insert the generated block level element at the right place in the DOM
- for "left" and "right" elements it puts them just before the block level
element they are inside
- for "leftAlone" and "center" elements it splits the DOM around the shortcode.
The trade off is that shortcodes are no longer "text level" features. They need
knowledge of the HTML they are in to perform this transformation, so they can
only be used in (valid) HTML
2013-02-18 10:49:52 +13:00
Mateusz Uzdowski
53feb3a5ae
API Add possibility to combine media-targeting stylesheets.
2013-02-13 11:04:05 +13:00
Ingo Schommer
083b6b2164
NEW Upload->replaceFile setting
2013-02-05 19:28:24 +01:00
Sean Harvey
632e0e898d
Simplify sentence on shortcodes
2013-02-05 10:43:01 +13:00
Mateusz Uzdowski
d741aa9b95
Move the shortcode docs to documentation, add examples.
2013-02-05 09:27:22 +13:00
Ingo Schommer
634c91c6ff
Merge remote-tracking branch 'origin/3.0' into 3.1
...
Conflicts:
email/Mailer.php
2013-01-30 12:46:24 +01:00
Ingo Schommer
56336c3758
Merge pull request #1101 from chillu/pulls/preview-configuration
...
NEW Preview size and default mode configurability
2013-01-29 08:16:33 -08:00
drzax
048ba5b306
MINOR Formatting fix
2013-01-29 14:35:51 +10:00
Ingo Schommer
4892c11aaa
Clarified docs on isDev usage in dev/build
2013-01-22 14:29:58 +01:00