Commit Graph

284 Commits

Author SHA1 Message Date
Daniel Hensby
bef913aeb9 Updating RestfulService docs to explain how to set cURL options
see #3108
2014-05-07 10:12:08 +01:00
Damian Mooyman
e9c3ff933f Merge remote-tracking branch 'origin/3.1'
Conflicts:
	.travis.yml
	composer.json
2014-05-06 10:22:09 +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
2e73dcb891 API Remove swf,html,htm,xhtml,xml as default allowed upload able file types 2014-04-29 11:09:30 +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
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
Damian Mooyman
982ad569b9 Merge remote-tracking branch 'origin/3.1' 2014-04-22 12:09:51 +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
fe8dc50ffc Merge branch '3.1'
Conflicts:
	tests/view/SSViewerTest.php
2014-03-30 18:17:24 +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
Damian Mooyman
7c60c73dbb API Polymorphic has_one behaviour 2014-03-18 09:18:04 +13:00
Zauberfisch
62537c5886 more docs for GridField & ModelAdmin customization 2014-03-16 08:40:50 +00:00
Simon Welsh
8f31352039 Merge remote-tracking branch 'origin/3.1'
Conflicts:
	.travis.yml
2014-03-16 09:36:48 +13:00
Loz Calver
a73c3574e2 FieldList->insertBefore/After now accept arguments in either order (fixes #2737) 2014-03-15 11:32:51 +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
d431e98ecf Merge branch '3.1'
Conflicts:
	forms/Form.php
	forms/FormField.php
	security/Member.php
	security/MemberLoginForm.php
2014-03-10 22:58:49 +13: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
Will Morgan
6e0a65f293 Removing broken reference to "getNextID()"
It doesn't exist.
2014-02-21 15:24:01 +00:00
sanjay
fff9222dd3 update dataobject.md
fixex typo
2014-02-20 16:40:47 +05:30
Sean Harvey
03f14565b5 Merge pull request #2841 from chillu/pulls/dateformat-simplified
API Default to "yyyy-MM-dd" for date format
2014-02-17 14:05:39 +13:00
Ingo Schommer
6906c9bd1a API Removed auto-detection for i18n date/time formats
Default to "yyyy-MM-dd" for date format, and "H:mm" for time_format.
Switched to config API for setting/getting values.

Avoid using "MMM" in particular, since it causes
inconsistencies in month names between jQuery UI and Zend_Locale_Format.

Fixes https://github.com/silverstripe/silverstripe-cms/issues/544
2014-02-16 23:57:49 +13:00
Sam Minnee
346d3edb37 Merge branch '3.1' 2014-02-13 17:58:30 +13:00
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
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