Commit Graph

663 Commits

Author SHA1 Message Date
Sam Minnee
d97ca43cd0 Merge branch '3.1'
Conflicts:
	README.md
	dev/install/install.php5
	forms/ConfirmedPasswordField.php
	tests/forms/FormTest.php
2013-05-23 19:01:58 +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
4c7c40e8b9 Merge remote-tracking branch 'origin/3.0' into 3.1
Conflicts:
	parsers/ShortcodeParser.php
2013-05-17 13:51:54 +02:00
Ingo Schommer
146b5a81cb Improved shortcode docs 2013-05-17 13:49:46 +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
Sam Minnée
9672a22166 Merge pull request #1851 from chillu/pulls/form-strict-method-check
Form strict method check
2013-05-08 22:31:40 -07:00
Fred Condo
677dc9822e Edit forms documentation
Correct spelling and word choices.
2013-05-08 17:00:43 -07:00
Will Morgan
a5b04ba334 Updating docs for Security template changes
See https://github.com/silverstripe/sapphire/pull/1807
2013-05-08 11:52:36 +01:00
Ingo Schommer
14c59be85e API Form::setStrictFormMethodCheck() and strict argument to setFormMethod()
Thanks to @sminnee for getting this started
2013-05-08 10:25:13 +02:00
Ingo Schommer
72f81447f0 Merge pull request #1791 from tdf/pullrequests-for-3.1
fix nginx documentation to one that actually works :-)
2013-05-08 00:51:38 -07: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
Sam Minnee
b5a83878dd Added docs for i81n.moduole_priority. 2013-05-06 12:51:46 +12:00
Simon Welsh
a5d69f2bf5 Update page-type-templates.md 2013-05-03 15:04:30 +12:00
Will Rossiter
a5dd2434c0 Merge pull request #1776 from chillu/pulls/composer-require-docs
Added --no-update hint to composer docs
2013-04-30 22:09:44 -07:00
Ingo Schommer
6c2e791a48 Merge remote-tracking branch 'origin/3.1' 2013-04-29 08:59:06 +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
Christian Lohmaier
26ed69508a fix nginx documentation to one that actually works :-)
example configuration wuldn't allow to install silverstripe, as
install.php does exist as a regular file (and that was ignored in the
old version of the documentation)
Similarily, the last rule in the htaccess snippet that should allow the
access to the tinymce php files were never applied, as a previously
listed regex did match and denied access. Even if it would have taken
effect: as those files do exist on disk, they would have been handed out
as-is and not been interpreted by php.
Also the statement regarding accidental/exploitable execution of
arbitrary php was misleading (and to some degree even wrong) in the old
context.

squashed commit as per pr#1791
2013-04-23 12:37:25 +02: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
Ingo Schommer
faa3e58468 Allow SS_DATABASE_NAME in _ss_environment.php configuration
Makes setups which are completely driven by that file a bit easier
to automate, particularly if the same codebase is deployed
multiple times (e.g. to a staging and live instance)
2013-04-22 14:11:37 +02:00
Sean Harvey
8278181b92 Merge branch '3.0' into 3.1 2013-04-22 17:14:45 +12:00
Sam Minnee
eb583c5f14 NEW: Added DataObject::getQueriedDatabaseFields() as faster alternative to toMap()
API: CompositeDBField::setValue() may be passed an object as its second argument, in addition to array.

These changes provide a 15% - 20% performance improvement, and as such justify an small API change in the 3.0 branch. It will likely affect anyone who has created their own composite fields, which is fortunately not all that common.
2013-04-21 13:39:11 +12:00
Ingo Schommer
6e3a150424 3.1.0-beta3 changelog 2013-04-18 19:28:13 +02:00
Ingo Schommer
d877c1063d Updated changelog, moved "statics in Page.php" to top
Its going to be a fatal error on every upgrade unless tended to,
so we need to ensure people don't overlook it in the guide.
2013-04-18 18:28:09 +02:00
Ingo Schommer
f86ca423ca Added --no-update hint to composer docs 2013-04-18 16:08:08 +02:00
SticksTucker
8033955d35 Include AllPages() form method to $allowed_actions 2013-04-18 13:22:42 +10:00
Ingo Schommer
67ce9e08cc Extended docs for shortcode handling and doctypes (fixes #1700) 2013-04-16 14:01:04 +02:00
Ingo Schommer
f8ee3e1b73 Merge pull request #1742 from svandragt/patch-1
Clarified the context of the step-by-step process
2013-04-14 13:27:16 -07:00
Ingo Schommer
9eab893e7c Merge remote-tracking branch 'origin/3.1'
Conflicts:
	model/Image.php
2013-04-12 01:14:55 +02: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
f514067f2f Updated commit message usage to reflect github best practices 2013-04-11 17:35:55 +03:00
Ingo Schommer
0343a77d30 Merge remote-tracking branch 'origin/3.1' 2013-04-11 11:42:04 +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
Ryan Wachtl
46831f56fb Update configuration.md
Link to ssbits.com config cheatsheet no longer relevant.
2013-04-09 10:09:25 -05:00
Sander van Dragt
7b49425e16 Clarified the context of the step-by-step process
Also limited the dependency on branching of 'master' to make the example more versatile and consistent with the best practice in this document.
2013-04-09 16:51:20 +02:00
Ingo Schommer
14b997eea3 API Deprecated Object::add_extension() usage (as of 3.2) 2013-04-09 15:00:34 +02:00
Ingo Schommer
9856fcef21 Merge remote-tracking branch 'origin/3.0' into 3.1
Conflicts:
	javascript/DateField.js
	model/DataQuery.php
	model/Versioned.php
	tests/forms/RequirementsTest.php
	tests/model/DataObjectLazyLoadingTest.php
	view/Requirements.php
2013-04-09 14:45:35 +02:00
Ingo Schommer
baca12bf37 3.1 changelog summaries 2013-04-09 13:36:39 +02:00