tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity
13,248 Commits 31 Branches 527 Tags 162 MiB
5f7ebd3c23
Commit Graph

1033 Commits

Author SHA1 Message Date
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
26f805fbb3 Merge remote-tracking branch 'origin/3.1' 2014-03-16 13:51:34 +13:00
Ingo Schommer
78f74737b6 Improved SS_Cache docs, moved to /docs 
We keep having trouble with extended PHPDoc formatting,
and have similar topics covered in Markdown already.
Moved docs, added some details about timeouts and
the theory of caching backends.
 2014-03-16 11:55:55 +13:00
Ingo Schommer
6b53368814 QA pointers in docs 2014-03-16 11:41:21 +13: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
Simon Welsh
10e184fd31 Merge pull request #2954 from jordanmkoncz/patch-2 
Minor fix for note about lack of news-file icon
 2014-03-15 21:57:18 +13:00
Ray
7669c5b869 Noting two more arguments in the list RSSFeed 2014-03-15 21:25:28 +13:00
Jordan Koncz
34b2145fcd Minor fix for note about lack of news-file icon 
Minor fix for note about the lack of a news-file icon to improve clarity.
 2014-03-15 07:48:52 +11:00
Jordan Koncz
faf36ba713 Fixed inconsistencies and out of date information 2014-03-14 20:49:26 +11: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
Simon Welsh
21f462a77b Update nginx.md 
Provides a nginx.conf that follows nginx good practices and duplicates the functionality of
the .htaccess files in framework, cms and installer.
 2014-03-10 22:48:22 +13:00
Tim Snadden
07ca70fce4 Update composer.md 2014-03-10 11:13:19 +13:00
Damian Mooyman
0cbad41d3b Rewrote usages of error suppression operator 2014-03-05 15:48:55 +13:00
Damian Mooyman
6d5d3d8cb7 Rewrote usages of error suppression operator 2014-03-05 14:22:19 +13:00
Simon Welsh
ccb791995e Merge pull request #2894 from wilr/3.1-manymanyyaml 
Add support for many_many_extraField in YAML
 2014-03-04 11:35:58 +13:00
torleif
c3994f4ce7 Update preview.md 
The JavaScript entwine example contains an extra jQuery wrapper
 2014-03-04 11:32:45 +13:00
sanjay
fb0fe3e689 Update 1-building-site 
Possessive pronoun "your" was misspelled as "you"...so the required change performed.
 2014-03-03 15:24:10 +05:30
mullerivan
a7d1991f70 Update css.md 2014-03-03 02:40:33 -02:00
Ingo Schommer
ae31362e21 Merge pull request #2867 from oddnoc/form-docs-consolidation 
Combine form validation topic with forms topic
 2014-03-03 10:32:04 +13:00
Ingo Schommer
c4ca3b1da4 Merge pull request #2870 from svandragt/patch-1 
Better visibility of key phrasing
 2014-03-03 10:30:55 +13:00
Ingo Schommer
3023639354 Merge pull request #2886 from KarlKl/patch-1 
Silverstripe.com is not this version
 2014-03-03 10:30:35 +13:00
Ingo Schommer
f00672bb83 Merge pull request #2889 from howardgrigg/patch-1 
MINOR Corrected links for 'Topics' documentation index
 2014-03-03 10:30:07 +13:00
Ingo Schommer
edd9738957 Merge pull request #2898 from torleif/patch-1 
Update shortcodes.md
 2014-03-03 10:29:56 +13:00
Ingo Schommer
b489f40866 Added 3.0.9 changelog 2014-03-03 10:19:08 +13:00
Ingo Schommer
ead3e26378 Added 3.1.3 changelog 2014-03-03 08:54:18 +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 Rossiter
8b92300622 Add support for many_many_extraField in YAML 
Format is

RelationName:
  - =>Obj.name:
    ExtraFieldName: "Foo"
 2014-02-24 22:03:53 +13:00
Ingo Schommer
d6b75acbc4 Added 3.1.3-rc2 changelog 2014-02-24 10:08:09 +13:00
Howard Grigg
733bc42dd7 MINOR Corrected links for 'Topics' documentation index 2014-02-22 17:16:07 +10:00
Will Morgan
6e0a65f293 Removing broken reference to "getNextID()" 
It doesn't exist.
 2014-02-21 15:24:01 +00:00
KarlKl
2ae65a6f3d Silverstripe.com is not this version 
On Silverstripe.com(http://doc.silverstripe.com/framework/en/3.0/topics/shortcodes) is an older version of this file.
From the "Built-in Shortcodes"-heading down to the bottom the page is marked as code.

Cheers
K
 2014-02-21 09:04:53 +01:00
sanjay
fff9222dd3 update dataobject.md 
fixex typo
 2014-02-20 16:40:47 +05:30
Fred Condo
46695d3b4b Combine form validation topic with forms topic 
- Proofread entire file (forms & form validation topics)
- Re-wrap paragraphs to 80 columns
- Correct/update links from other doc files
 2014-02-19 13:43:17 -08:00
Sander van Dragt
ced49d9090 Better visibility of key phrasing 2014-02-19 11:25:44 +00:00
Ingo Schommer
6ba7b2e3d8 Added changelog links 2014-02-19 15:40:16 +13:00
Ingo Schommer
2bc62f2e71 Added changelog links 2014-02-19 15:39:54 +13:00
Ingo Schommer
4af711613f 3.1.3-rc1 changelog 2014-02-19 15:24:04 +13:00
Ingo Schommer
ec02df2160 Removed SS-2014-002 from changelog, not backported to 3.0 2014-02-19 15:22:12 +13:00
Ingo Schommer
a6f794c3b9 Added 3.0.9-rc1 changelog 2014-02-19 15:20:24 +13:00
Tom Densham
f2568f8489 FIX Requirement documentation of MySQL driver 
Currently the documentation states that the `mysql` module for PHP is required, however as of #84 (over 2 years ago) this is no longer the case and the required module is now `mysqli`.
 2014-02-18 23:06:29 +13:00
Ingo Schommer
d8361f9d3f Merge remote-tracking branch 'origin/3.1' 2014-02-18 22:06:59 +13:00
Ingo Schommer
1930add745 Note about SiteTree.ExtraMeta in security docs 2014-02-18 16:07:50 +13:00
Ingo Schommer
9b57609fcd Merge pull request #2853 from hafriedlander/feature/htmltext_whitelist 
NEW Allow specifying element whitelist in HTMLText fields
 2014-02-18 15:38:30 +13:00
Hamish Friedlander
d6630d240a NEW Allow specifying element whitelist in HTMLText fields 2014-02-18 14:02:04 +13:00
Ingo Schommer
53a699527e Preliminary 3.1.3 changelog 2014-02-18 11:44:08 +13:00
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
Tom Densham
8b3d74ed0f FIX Requirement documentation of MySQL driver 
Currently the documentation states that the `mysql` module for PHP is required, however as of #84 (over 2 years ago) this is no longer the case and the required module is now `mysqli`.
 2014-02-14 13:29:54 +00:00
Sam Minnee
346d3edb37 Merge branch '3.1' 2014-02-13 17:58:30 +13:00
Hamish Friedlander
a0b21d7433 Merge pull request #2844 from chillu/pulls/security-mailinglist-docs 
Documented security pre announce mailinglist
 2014-02-12 15:32:24 +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
1121603da9 Documented security pre announce mailinglist 
See https://groups.google.com/forum/#!topic/silverstripe-dev/0mjNBaSP8vE
for details
 2014-02-12 14:37:47 +13:00
Sean Harvey
9048eab4a2 Merge branch '3.1' 2014-02-12 11:06:54 +13:00
Matt Kirwan
7b1f1a5e4d Updated add-on URL. 2014-02-07 15:48:34 +00: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
Ingo Schommer
1e2a2ca969 Merge pull request #2831 from silverstripe-rebelalliance/fixingURLs 
NEW: Updating out of date URLs in the framework source code and docs
 2014-02-07 16:16:24 +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
620ee834d0 Docs for whitespace fixes 2014-02-07 11:57:06 +13:00
Ingo Schommer
fe4ef54c7c Merge pull request #2825 from mattkirwan/patch-1 
Updated filename to reference 'Holder' not 'Page'
 2014-02-07 08:03:14 +13:00
Matt Kirwan
486af1d1a3 Updated filename to reference 'Holder' not 'Page' 2014-02-06 17:14:22 +00:00
Matt Kirwan
21b5a588c2 Updated filename to ref 'Holder' not 'Page' 2014-02-06 17:09:28 +00:00
Ingo Schommer
457ec9446b Merge pull request #2700 from ajshort/injector-factory 
Injector Factory
 2014-02-03 16:50:15 -08:00
Ingo Schommer
0d7e9a9692 Merge remote-tracking branch 'origin/3.1' 
Conflicts:
	_config/routes.yml
	docs/en/topics/datamodel.md
	forms/DropdownField.php
 2014-02-04 08:19:04 +13:00
Lukas
389b7f929b use the yml config system instead of _config.php for extensions 2014-02-03 14:26:49 +01:00
Andrew Short
1a803cbf7e Correct module inclusion criteria. 2014-02-03 15:52:57 +11:00
Andrew Short
e927fb3118 Use placeholder module name. 2014-02-03 15:48:14 +11:00
Ingo Schommer
254734982d Improved module dev docs 2014-02-03 17:01:48 +13: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
d29b083b84 Merge pull request #2812 from Rhym/patch-1 
Add a reference for setting the Limit of items.
 2014-01-30 18:44:42 -08:00
Kirk Mayo
7a9a968d1b BUG: Fixes #2808 fixed case type in documentation 2014-01-31 14:55:53 +13:00
Ryan Potter
75de6a2848 Add a reference for setting the Limit of items. 2014-01-31 11:20:17 +13:00
Ingo Schommer
48949ba89a Improved i18n JS docs 2014-01-24 11:12:23 +13:00
Ingo Schommer
53e790ff98 Improved Link() docs 2014-01-22 22:28:10 +13:00
Ingo Schommer
318073b05d Merge pull request #2789 from mrsmuneton/ControllerLinkDocumentation 
Adding a Link section to controller.md.
 2014-01-22 22:22:53 +13:00
Ray
ba6513b2b1 Adding a Link section to controller.md showing the Link() function returning custom route value. 2014-01-19 17:46:21 -08:00
Zauberfisch
0e95f7f2a6 Removed $MetaTitle from docs(closes #2761) 2014-01-13 19:00:41 +00:00
camfindlay
39ed36dad6 Typo, duplicate silverstripe-documentation 2014-01-09 19:53:42 +13:00
Simon Welsh
39d42e4ea3 Merge branch '3.1' 2014-01-09 08:22:47 +13:00
Sriram Venkatesh
efa309c977 Corrects Broken Link 2014-01-09 08:20:34 +13:00
Ed Linklater
264fbcbff6 MINOR fix typo in link 2014-01-08 03:14:20 +13:00
Tom Densham
a04c79872f FIX: Documentation for Silverstripe Test 
Change the access level of the `static $fixture_file` property in the example code.
 2014-01-02 11:38:43 +00: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
Will Rossiter
588118ade5 Merge pull request #2738 from kinglozzer/doc-file 
Update topics/file documentation (closes #1481)
 2013-12-20 17:41:00 -08:00
Will Rossiter
b47e1e0b7f Merge pull request #2732 from Firesphere/patch-1 
MINOR Documentation slightly improved for js inclusion
 2013-12-20 15:40:49 -08:00
Loz Calver
b8f9dd91d9 Update topics/file documentation (closes #1481) 2013-12-20 14:03:07 +00:00
Simon Erkelens
b64a89d103 Minor language and readability fixes. 2013-12-20 12:24:03 +01:00
Ingo Schommer
60333f68ee NEW UploadField lists all files, shows path info 
It doesn't make a lot of sense to limit the listing
to assets/Uploads/, which is the default set through FileField->folderName.
Showing all files regardless of folder makes them easier
to find, users can still opt-in to filtering by folder
through the TreeDropdownField.
 2013-12-20 01:00:36 +01:00
Ingo Schommer
7591e43ab9 Merge remote-tracking branch 'origin/3.1' 2013-12-19 23:33:58 +01:00
Stig Lindqvist
d1fe294d61 Update the yaml configuration with existing before / after syntax 2013-12-20 10:36:16 +13: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