Commit Graph

1511 Commits

Author SHA1 Message Date
Cam Findlay
66d0fcc11c Migrate 3.2 docs into new docs structure 2014-12-17 15:50:06 +13:00
Ingo Schommer
e48e4cac06 Semver documented in release process
See https://groups.google.com/forum/#!topic/silverstripe-dev/J4U4Nl2qTSg.
2014-12-17 15:50:06 +13:00
Cam Findlay
c358ac6496 FIX How to folder on forms 2014-12-17 15:50:06 +13:00
Cam Findlay
10ce9b9db4 Typo fixes for committers 2014-12-17 15:50:06 +13:00
Cam Findlay
9f12a08f47 Rebased on 3.1 - moved new change logs into place. 2014-12-17 15:50:06 +13:00
Cam Findlay
bdb3b7f085 FIX: Feedback to name the fields section to "field types" to make it clearer what the section is about. 2014-12-17 15:50:06 +13:00
Cam Findlay
aba966729a FIX: use GFMD code blocks to fix code formatting consistency. 2014-12-17 15:50:06 +13:00
Stevie Mayhew
6d0cd49d6d MINOR: spelling mistake 2014-12-17 15:50:06 +13:00
Cam Findlay
afc8db7e33 Rebased on 3.1 and added missing site reports doc 2014-12-17 15:50:06 +13:00
Cam Findlay
fc110e34fb Added documentation writing style guide points 2014-12-17 15:50:05 +13:00
Ingo Schommer
11c1563778 Docs for exec pipeline and manifests
- Added manifest logic docs
- More obvious pointers to flushing
- Removed Director page since it duplicated a lot of information already presenting in routing,
which in itself is already duplicated between routing.md and controllers.md.
- Merged Director execution rundown into main exec pipeline docs
- Moved YAML security note from main installation docs to "secure coding", making it less obvious
2014-12-17 15:50:05 +13:00
Will Rossiter
e743fedc65 Importing cookie content 2014-12-17 15:50:05 +13:00
Cam Findlay
4d0448c254 Tutorials review and update image path 2014-12-17 15:50:05 +13:00
Will Rossiter
e729131a63 Move CMS Howtos 2014-12-17 15:50:05 +13:00
Uncle Cheese
fe62a2fa79 developer guides, templates review 2014-12-17 15:50:05 +13:00
Will Rossiter
ff91f99522 Add brief highlevel docs on cookie / session 2014-12-17 15:50:05 +13:00
Will Rossiter
fe96fc581d Clean up search documentation 2014-12-17 15:50:01 +13:00
Uncle Cheese
f83c8f0821 developer guides / models 2014-12-17 15:49:27 +13:00
Will Rossiter
e448fb9434 Model guide documentation 2014-12-17 15:49:24 +13:00
Will Rossiter
e65b3ad3fb Review and clean up of extending section 2014-12-17 15:49:08 +13:00
Cam Findlay
1df3d7cee1 Rebased additional documentation since May 2014.
New pages filed and metadata added.
2014-12-17 15:48:58 +13:00
Will Rossiter
48f53b98a1 Rewrite, tidy and format of Forms documentation 2014-12-17 15:48:58 +13:00
Will Rossiter
b4d8dfc9ee Controller documentation 2014-12-17 15:48:58 +13:00
Will Rossiter
bbfc03ad51 Review and tidy up of configuration guide 2014-12-17 15:48:58 +13:00
Will Rossiter
627cc520d9 Rewrite and tidy up of performance section 2014-12-17 15:48:58 +13:00
Will Rossiter
576f34a539 Review and rewrites for Testing Developer Guide 2014-12-17 15:48:58 +13:00
Will Rossiter
4fcbc9a402 Clean up debugging documentation 2014-12-17 15:48:57 +13:00
Will Rossiter
7fc6110a6f Tidy up templates guide 2014-12-17 15:48:57 +13:00
Will Rossiter
c54dee5452 Review email documentation 2014-12-17 15:48:57 +13:00
Will Rossiter
3d8c9232e0 Review, cleanup and refresh of integration section 2014-12-17 15:48:57 +13:00
Will Rossiter
0c73768e8c Review, clean up of CLI documentation 2014-12-17 15:48:57 +13:00
Will Rossiter
f633236e78 Review and tidy up contributing documentation. 2014-12-17 15:48:57 +13:00
Will Rossiter
084286af4c Add introduction files to each of the sections 2014-12-17 15:48:54 +13:00
Will Rossiter
7e83d70e69 Move todo list to trello. 2014-12-17 15:48:41 +13:00
Will Rossiter
1ceb10be4a Update documentation introduction 2014-12-17 15:48:41 +13:00
Will Rossiter
015afe83e8 Add readme to include status of docs rewrite and high level todos
Conflicts:
	docs/en/03_Upgrading.md
	docs/en/03_Upgrading/00_Upgrading.md
	docs/en/03_Upgrading/index.md
2014-12-17 15:48:41 +13:00
Will Rossiter
6c5ddaf054 Restructure of the docs markdown source files into more logical taxonomy 2014-12-17 15:48:35 +13:00
Cam Findlay
deff519789 DOCS Added links to the video lessons on silverstripe.org 2014-12-17 09:41:38 +13:00
Ingo Schommer
f2237aff8d Semver documented in release process
See https://groups.google.com/forum/#!topic/silverstripe-dev/J4U4Nl2qTSg.
2014-12-15 17:56:32 +13:00
Cam Findlay
658216237e FIX How to folder on forms 2014-12-15 14:49:46 +13:00
Cam Findlay
f387ffebe6 Typo fixes for committers 2014-12-15 09:12:49 +13:00
Cam Findlay
9e7fc7618c Rebased on 3.1 - moved new change logs into place. 2014-12-15 09:12:49 +13:00
Cam Findlay
3ac705f4b3 FIX: Feedback to name the fields section to "field types" to make it clearer what the section is about. 2014-12-15 09:12:48 +13:00
Cam Findlay
e9fd03bf8a FIX: use GFMD code blocks to fix code formatting consistency. 2014-12-15 09:12:48 +13:00
Stevie Mayhew
34c812131d MINOR: spelling mistake 2014-12-15 09:12:48 +13:00
Cam Findlay
987fde2bed Rebased on 3.1 and added missing site reports doc 2014-12-15 09:12:48 +13:00
Cam Findlay
36f62b6d4f Added documentation writing style guide points 2014-12-15 09:12:48 +13:00
Ingo Schommer
7e0276b8ad Docs for exec pipeline and manifests
- Added manifest logic docs
- More obvious pointers to flushing
- Removed Director page since it duplicated a lot of information already presenting in routing,
which in itself is already duplicated between routing.md and controllers.md.
- Merged Director execution rundown into main exec pipeline docs
- Moved YAML security note from main installation docs to "secure coding", making it sless obvious
2014-12-15 09:12:48 +13:00
Will Rossiter
304f89bd12 Importing cookie content 2014-12-15 09:12:48 +13:00
Cam Findlay
cdae3fadea Tutorials review and update image path 2014-12-15 09:12:48 +13:00
Will Rossiter
d01c8d7990 Move CMS Howtos 2014-12-15 09:12:47 +13:00
Uncle Cheese
b7daa8d1ee developer guides, templates review 2014-12-15 09:12:47 +13:00
Will Rossiter
ae4d61eefb Add brief highlevel docs on cookie / session 2014-12-15 09:12:47 +13:00
Will Rossiter
a7971d0540 Clean up search documentation 2014-12-15 09:12:47 +13:00
Uncle Cheese
c1c0ad3dac developer guides / models 2014-12-15 09:12:47 +13:00
Will Rossiter
699b999f1e Model guide documentation 2014-12-15 09:12:47 +13:00
Will Rossiter
918baf1ca3 Review and clean up of extending section 2014-12-15 09:12:47 +13:00
Cam Findlay
b7272e09c6 Rebased additional documentation since May 2014.
New pages filed and metadata added.
2014-12-15 09:12:47 +13:00
Will Rossiter
86812c0937 Rewrite, tidy and format of Forms documentation 2014-12-15 09:12:47 +13:00
Will Rossiter
30cf733948 Controller documentation 2014-12-15 09:12:46 +13:00
Will Rossiter
1d31611e7e Review and tidy up of configuration guide 2014-12-15 09:12:46 +13:00
Will Rossiter
f4dad25af0 Rewrite and tidy up of performance section 2014-12-15 09:12:46 +13:00
Will Rossiter
549531798f Review and rewrites for Testing Developer Guide 2014-12-15 09:12:46 +13:00
Will Rossiter
ebf28bc66b Clean up debugging documentation 2014-12-15 09:12:46 +13:00
Will Rossiter
fc952ef1e8 Tidy up templates guide 2014-12-15 09:12:46 +13:00
Will Rossiter
720ff48d28 Review email documentation 2014-12-15 09:12:45 +13:00
Will Rossiter
7458b10b6d Review, cleanup and refresh of integration section 2014-12-15 09:12:45 +13:00
Will Rossiter
65309fa5d4 Review, clean up of CLI documentation 2014-12-15 09:12:45 +13:00
Will Rossiter
80d4127f43 Review and tidy up contributing documentation. 2014-12-15 09:12:45 +13:00
Will Rossiter
d52b475cfb Add introduction files to each of the sections 2014-12-15 09:12:45 +13:00
Will Rossiter
1b8f2478e6 Move todo list to trello. 2014-12-15 09:12:45 +13:00
Will Rossiter
85f3beee2c Update documentation introduction 2014-12-15 09:12:45 +13:00
Will Rossiter
79e9254f05 Add readme to include status of docs rewrite and high level todos
Conflicts:
	docs/en/03_Upgrading.md
	docs/en/03_Upgrading/00_Upgrading.md
	docs/en/03_Upgrading/index.md
2014-12-15 09:12:45 +13:00
Will Rossiter
e9d88dd8ee Restructure of the docs markdown source files into more logical taxonomy.
Rebased on 3.1
2014-12-15 09:12:44 +13:00
Will Morgan
80092e5daa Merge pull request #3662 from camfindlay/corecommiters
DOCS Repositioned house rules and added core commiter list.
2014-12-09 00:21:13 +00:00
Corey Sewell
fbebf96d66 Add detection for PHP running in CGI mode and add HTTP_AUTHORIZATION rewrite rule
Detect and parse HTTP_AUTHORIZATION for basic authentication running PHP in CGI mode
Add comments about using CGI mode with Apache and Basic Auth in /docs/en/topics/environment-management.md
Added notes  to docs/en/changelogs/3.1.9.md
2014-12-05 11:35:52 +13:00
Cam Findlay
22ecab555c DOCS Repositioned house rules and added core commiter list. 2014-12-04 15:39:19 +13:00
Damian Mooyman
19549d620f Moved deprecation of SQLQuery to 4.0 2014-12-04 09:30:50 +13:00
Antony Thorpe
6c6d217273 Update error-handling.md
Add how to log notices (deprecation notifications can help with discovering problems caused by old code).
2014-12-03 16:56:53 +13:00
Daniel Hensby
ca7030d70d Merge pull request #3683 from bendubuisson/patch-2
Update 5-dataobject-relationship-management.md
2014-11-26 20:42:17 +00:00
Ben Dubuisson
e30a354076 Update access-control.md
small typo
2014-11-27 09:25:43 +13:00
Antony Thorpe
9a7686c8b9 Update docs/en/reference/index.md
GridField line included twice
2014-11-27 08:06:00 +13:00
Ben Dubuisson
514098c01a Update member.md
small typo
2014-11-26 16:32:57 +13:00
Ben Dubuisson
efd978074c Update 5-dataobject-relationship-management.md
Some more typos, sorry didn't pick them all up at the same time!
2014-11-26 14:37:33 +13:00
Ben Dubuisson
a622fce073 Update 5-dataobject-relationship-management.md
typos
2014-11-26 11:43:49 +13:00
Gabriele Brosulo
90a7761394 Update datamodel.md
Syntax error
2014-11-24 10:50:38 +01:00
Phill Price
ff65f5e00f Update csv-import.md
Translated the German to English to match up other areas in document
2014-11-19 21:29:54 +00:00
Damian Mooyman
fe0d330c59 Merge pull request #3656 from halkyon/nginx_buffers
Adding appropriate nginx fastcgi buffer config required for admin
2014-11-19 15:50:55 +13:00
Damian Mooyman
6baf63e18c Merge remote-tracking branch 'origin/3.1'
Conflicts:
	dev/install/install.php5
	docs/en/changelogs/index.md
	security/Security.php
2014-11-19 11:16:46 +13:00
Josh Kosmala
2e416b60f3 Update javascript.md fixes #3652
I needed to know how to do this to do some jQuery manipulation in the CMS.
2014-11-18 21:56:51 +00:00
Daniel Hensby
e5bed94d07 Merge pull request #3626 from 3Dgoo/feature/site-reports-doc-fix
Updating Site Reports documentation
2014-11-18 20:59:57 +00:00
Sean Harvey
8d2727eab6 Adding appropriate nginx fastcgi buffer config required for admin 2014-11-19 09:56:40 +13:00
Damian Mooyman
72484cd0bf Update index.md 2014-11-18 18:41:23 +13:00
Damian Mooyman
c279ff7f0c Merge remote-tracking branch 'origin/3.1.8' into 3.1 2014-11-18 18:40:15 +13:00
Damian Mooyman
8b3695bd41 Added 3.1.8 changelog 2014-11-18 18:30:19 +13:00
Damian Mooyman
0b1f297873 Merge remote-tracking branch 'origin/3.1'
Conflicts:
	.travis.yml
	README.md
	admin/code/LeftAndMain.php
	admin/css/screen.css
	admin/scss/screen.scss
	api/RestfulService.php
	conf/ConfigureFromEnv.php
	control/injector/ServiceConfigurationLocator.php
	control/injector/SilverStripeServiceConfigurationLocator.php
	core/ClassInfo.php
	core/Object.php
	css/AssetUploadField.css
	css/ComplexTableField_popup.css
	dev/CSSContentParser.php
	dev/DevelopmentAdmin.php
	docs/en/changelogs/index.md
	docs/en/misc/contributing/code.md
	docs/en/reference/execution-pipeline.md
	filesystem/GD.php
	filesystem/ImagickBackend.php
	filesystem/Upload.php
	forms/Form.php
	forms/FormField.php
	forms/HtmlEditorConfig.php
	forms/gridfield/GridFieldDetailForm.php
	forms/gridfield/GridFieldSortableHeader.php
	lang/en.yml
	model/Aggregate.php
	model/DataList.php
	model/DataObject.php
	model/DataQuery.php
	model/Image.php
	model/MySQLDatabase.php
	model/SQLQuery.php
	model/fieldtypes/HTMLText.php
	model/fieldtypes/Text.php
	scss/AssetUploadField.scss
	search/filters/SearchFilter.php
	security/Authenticator.php
	security/LoginForm.php
	security/Member.php
	security/MemberAuthenticator.php
	security/MemberLoginForm.php
	security/Security.php
	tests/behat/features/bootstrap/SilverStripe/Framework/Test/Behaviour/CmsFormsContext.php
	tests/control/HTTPTest.php
	tests/control/RequestHandlingTest.php
	tests/filesystem/UploadTest.php
	tests/forms/FormTest.php
	tests/forms/NumericFieldTest.php
	tests/model/DataListTest.php
	tests/model/DataObjectTest.php
	tests/model/TextTest.php
	tests/security/MemberAuthenticatorTest.php
	tests/security/SecurityDefaultAdminTest.php
	tests/view/SSViewerCacheBlockTest.php
	tests/view/SSViewerTest.php
2014-11-18 12:45:54 +13:00
Stevie Mayhew
41ea83b337 FEATURE: add validation to form field subclasses 2014-11-17 08:17:38 +13:00
Damian Mooyman
7b89c17349 Merge remote-tracking branch 'origin/3.1.7' into 3.1 2014-11-14 16:30:14 +13:00
Damian Mooyman
4ece737220 Update changelogs 2014-11-14 15:38:19 +13:00
Sam Minnée
421152f722 Merge pull request #3627 from nhorstmeier/patch-1
Should use <% with %> rather than <% loop %>
2014-11-12 13:38:10 +13:00
muskie9
a526c45d64 Should use <% with %> rather than <% loop %> 2014-11-11 08:44:37 -06:00
3Dgoo
89ff059334 Site Reports documentation fix
Fixing typo in Site Reports documentation. Adding more detail to Custom Report example.
2014-11-11 15:52:45 +10:30
bob (Plastyk)
45924f1402 Updating Site Reports documentation to show the Silverstripe 3.1 method of adding custom reports. 2014-11-11 15:45:34 +10:30
Antony Thorpe
98937f2467 Update forms.md
Should be "set" not "get" in FormField->setSmallFieldHolderTemplate().
2014-11-11 18:04:40 +13:00
Phill Price
a184d228e3 Filter heading being processed as part of code
Whitespace issue causing the filter header to become part of the sorting example above - fixed whitespace.
2014-11-10 11:08:12 +00:00
Damian Mooyman
0a5c380c92 Added 3.1.7-rc1 changelog 2014-11-08 18:50:54 +13:00
Damian Mooyman
8468546876 Add changelogs for 3.1.7-rc1 2014-11-08 18:36:03 +13:00
Gabriele Brosulo
f2a059b148 Update versioning.md 2014-11-06 11:31:55 +01:00
Gabriele Brosulo
b64cfaf649 Update versioning.md
Added information about $SilverStripeNavigator
2014-11-06 10:55:32 +01:00
Sean Harvey
ce797773da Improvements to nginx and HHVM installation docs
* Fix a few missing packages in `apt-get install` command
 * Add command to start HHVM automatically on boot
 * Remove unnecessary `sendfile on` (already in /etc/nginx/nginx.conf)
2014-10-27 14:26:42 +13:00
Gabriele Brosulo
6683f3d283 Update cache-control.md
Added useful information after half an hour trying to have cache working :)
2014-10-23 14:00:32 +01:00
Sean Harvey
95963b19b8 Merge pull request #3559 from g4b0/patch-2
Update versioning.md
2014-10-16 11:54:46 +13:00
Gabriele Brosulo
1770161550 Update fixtures.md
syntax error
2014-10-15 15:31:32 +02:00
Gabriele Brosulo
8a7a25edf5 Update versioning.md
Removed parent::onAfterPublish(); because Page parents does not implement it. The old code generate this error:

Error at framework/core/Object.php line 761: Uncaught Exception: Object->__call(): the method 'onafterpublish' does not exist on 'MyPage' (http://ssdev-master.zk/admin/pages/edit/EditForm)
2014-10-15 15:25:13 +02:00
Sam Minnée
73c52a6eeb Merge pull request #3539 from halkyon/hhvm_nginx_docs2
Adding documentation for installing HHVM with nginx on Linux
2014-10-15 18:14:00 +13:00
Michael Strong
a401db2d34 Duplicated content
For some reason the quick fire dos and donts were duplicated.
2014-10-15 12:47:55 +13:00
Damian Mooyman
53c40a94fa API Enable re-authentication within the CMS if a user session is lost
BUG Resolve issue with error redirection being ignored within CMS
BUG Fix issue with invalid securityID being re-emitted on failure
2014-10-14 15:19:48 +13:00
spekulatius
450ccb9781 Update permission.md
Throws warning without call of parent::init()
2014-10-13 15:00:50 +13:00
Sean Harvey
6cda801ec3 Adding documentation for installing HHVM with nginx on Linux 2014-10-10 15:00:21 +13:00
Damian Mooyman
1e612607aa Suggested improvements / test case fixes 2014-10-10 09:28:11 +13:00
muskie9
5f0dba5398 Update remove extra ); 2014-10-08 15:32:05 -05:00
Daniel Hensby
3b9056fc01 NEW Cookie_Backend for managing cookie state
I've decoupled `Cookie` from the actual act of setting and getting
cookies. Currently there are a few limitations to how Cookie works that
this change mitigates:

0. `Cookie` currently changes the super global `$_COOKIE` when setting
to make the state of an application a bit more managable, but this is
bad because we shouldn't be modifying super globals
0. One can't actually change the `$cookie_class` once the
`Cookie::$inst` has been instantiated
0. One can't test cookies as there is no class that holds the state of
the cookies (it's just held in the super global which is reset as part
of `Director::test()`
0. One can't tell the origin of a cookie (eg: did the application set it
and it needs to be sent, or did we receive it from the browser?)
0. `time()` was used, so testing was made difficult
0. There was no way to get all the cookies at once (without accessing
the super global)

Todos are on the phpdoc and I'd like to write some tests for the backend
as well as update the docs (if there are any) around cookies.
DOCS Adding `Cookie` docs

Explains basic usage of `Cookie` as well as how the `Cookie_Backend`
controls the setting and getting of cookies and manages state of sent vs
received cookies
Fixing `Cookie` usage

`Cookie` is being used inconsistently with the API throughout framework.
Either by not using `force_expiry` to expire cookies or setting them to
null and then expiring them (which is redundant).
NEW `Director::test()` takes `Cookie_Backend` rather than `array` for `$cookies` param
2014-10-06 17:44:51 +13:00
Michal Kleiner
1c09d31719 fixed anonymous function declaration
uses changed to use
2014-10-02 11:51:23 +13:00
Damian Mooyman
db0cad4616 BUG ErrorControlChain now supports exception handling 2014-09-26 16:54:34 +12:00
Sean Harvey
c55e4fe7e2 Merge pull request #3475 from AntonyThorpe/PHPUnitDocs
Update testing/index.md for clearer PHPUnit installation instructions
2014-09-26 11:11:19 +12:00
Nicolaas
ea62bf9eed Adding link to UserVoice 2014-09-26 11:07:38 +12:00
Will Rossiter
61ec808604 Set $lock_out_after_incorrect_logins out of the box 2014-09-26 10:49:53 +12:00
Sean Harvey
99f8fb29b5 Merge pull request #3507 from tractorcow/pulls/fix-mailer
API / FIX / Cleanup - Mailer and Convert::html2raw
2014-09-26 10:15:18 +12:00
Damian Mooyman
bf4e9eb044 API Singleton method allowing type inference
This pattern improves over the current usage of singleton by allowing type inference.
This also better supports refactor, code usage detection, and auto-completion of classes.
2014-09-26 09:10:25 +12:00
Damian Mooyman
e47800917a API Mailer can be configured to use different encoding mechanisms, and added support for unicode quoted-string encoding
API Mailer bounce email can now be configured
API Mailer no longer calls Convert::xml2raw on all email subjects
API Deprecate dead Mailer code and refactored duplicate or mis-documented code.
2014-09-25 16:04:56 +12:00
Damian Mooyman
29e3347562 API Convert::html2raw no longer wraps text automatically
BUG Convert::html2raw now correctly decodes single quotes
2014-09-25 16:04:48 +12:00
Christopher Darling
39e9513c32 removed reference to deprecated :Negation filter 2014-09-24 12:49:12 +01:00
Sean Harvey
563155391f API Cookies set via Cookie::set() are now HTTP only by default 2014-09-24 17:48:13 +12:00
Ed Linklater
c2d02a6daf MINOR: Docs: Invalid link to WAMP page 2014-09-21 13:54:34 +12:00
AntonyThorpe
11187c56c0 Updated for PHPUnit version clarification
Updated Composer command to reference latest stable version as advised
Removed testing installation via Browser step
Added a note about the PHPUnit 3.7 requirement for running tests via the Browser
2014-09-17 16:49:52 +12:00
Damian Mooyman
062ad8e685 API Allow parameterised joins / subselects 2014-09-16 17:54:30 +12:00
muskie9
f7deaa8042 Update searchcontext.md with &hellip; showing ??? 2014-09-15 14:44:03 -05:00
AntonyThorpe
da8cebaa62 Describe adding PHPUnit as a simple one line command
- Removed the composer.json example
- Removed comment about PHPUnit versions

Signed-off-by: AntonyThorpe <antony.thorpe@budget12.com>
2014-09-12 17:02:04 +12:00
Darío
8d328944fa Update 5-dataobject-relationship-management.md
Fixed two small mistakes:

"select one the the mentors" -> "select one of the mentors"
WYSIWIG -> WYSIWYG
2014-09-11 13:15:38 +02:00
AntonyThorpe
f5ccdda22f Updated en/topics/testing/index.md for clearer PHPUnit installation instructions
Step by step Composer installation instructions, including a composer.json example.

In addition:
- Removed self-page reference to an introduction
- Removed reference to PEAR installation instructions due to end of life
- Removed reference to Ruby as doesn't add value
- Shortened testing via Web Browser section (as covered in Composer installation instructions)
2014-09-10 17:20:29 +12:00
Sean Harvey
6267d2e51e Fixing broken docs on setting allowed extensions on a FileField
Refers to an invalid variable, and is overriding the entire Upload,
which isn't necessary.
2014-09-09 11:14:38 +12:00
spekulatius
400bea1ee1 Update templates.md
Remove link to page which wasn't continued since 2.4.
2014-09-04 10:51:02 +12:00
Sean Harvey
70dfc55d34 Minor correction to documentation 2014-08-26 14:55:45 +12:00
Sean Harvey
07eef2ece2 Removing deprecated class/functions marked for deprecation in 3.0/3.1 2014-08-25 12:06:05 +12:00
Damian Mooyman
9ec4669a59 Merge remote-tracking branch 'origin/3.1.6' into 3.1 2014-08-25 11:38:13 +12:00
Damian Mooyman
9da3357e3a add 3.1.6 docs 2014-08-25 11:25:01 +12:00
Ingo Schommer
5c9e88b9a0 Updated contrib docs, mention "DO NOT MERGE" pull requests
These should be avoided because they undermine the process of
peer review and merging in github, we should strive to have
zero open pull requests, as opposed to treating it as a stage
for work in progress. Intermediary code review can happen in github forks instead.

Also remove some checklist items which were based on the Trac bugtracker,
e.g. its not longer possible to assign yourself to issues because
of github's limited permission abilities.
2014-08-25 08:29:25 +12:00
Sean Harvey
6e0d9df331 Merge pull request #3406 from ss23/patch-2
Update urlvariabletools.md
2014-08-22 17:24:36 +12:00
Damian Mooyman
aec8430395 Merge pull request #3393 from halkyon/flushable
NEW Provide a consistent way of triggering flush
2014-08-22 10:28:26 +12:00
Sean Harvey
2b316e79e5 NEW Provide a consistent way of triggering flush
Provides an interface for classes to implement their own flush()
functionality. This function gets called early in a request on
all implementations of Flushable when flush=1|all is requested in the
URL.

This fix came out of an issue where Requirements combined files were not
being cleaned up after dev/build?flush=1, due to the fact that flush
would only occur when you called it while on a page that used those
combined files, but not in any other contexts. This will now call flush
on any implementors of Flushable regardless of the context of where
flush was called.
2014-08-22 09:24:27 +12:00
Christopher Darling
d89ed7c4a7 DOCS: correct notes on TEMP_FOLDER
getTempParentFolder() in framewor/core/TempPath.php checks for silverstripe-cache directory in webroot first, failing that it falls back on the sys_get_temp_dir() folder.

also, getTempFolder() is no longer in framework/core/Core.php since #b075fa29c59f970bea31bbe8be1bd6560a8778b6, it is now located in framework/core/TempPath.php
2014-08-21 14:31:55 +01:00
☃ Stephen Shkardoon ☃
8c12af6acb Update urlvariabletools.md
Remove strange reference to flush values in showtemplate line.
2014-08-20 21:52:14 +12:00
Damian Mooyman
a838e9bae6 Merge remote-tracking branch 'origin/3.1.6' into 3.1 2014-08-19 09:38:17 +12:00
Damian Mooyman
f49416858c Added 3.1.6-rc3 changelog 2014-08-18 17:42:31 +12:00
Sean Harvey
404478b07f Removing @deprecated 3.1 functionality and classes.
Changelog has been updated to include what was removed in terms of
major functionality, and what to use as a replacement.
2014-08-18 16:00:13 +12:00
Sean Harvey
8cf99b9bec Fixing inconsistent use of RewriteRule in docs and install.php5
It currently doesn't match the .htaccess that comes with a checkout of
silverstripe-installer.
2014-08-18 10:55:47 +12:00
Mateusz Uzdowski
8bf3853887 Merge remote-tracking branch 'origin/3.1'
Conflicts:
	docs/en/misc/contributing/issues.md
	docs/en/reference/uploadfield.md
	forms/HtmlEditorField.php
	i18n/i18n.php
	javascript/HtmlEditorField.js
	model/DB.php
	model/Image.php
	model/SQLQuery.php
2014-08-14 09:08:26 +12:00
Damian Mooyman
0b6c68f903 Merge remote-tracking branch 'origin/3.1.6' into 3.1 2014-08-12 16:28:39 +12:00
Damian Mooyman
a8685d0aa6 Fix link 2014-08-12 15:12:44 +12:00
Damian Mooyman
2b25ab37f6 3.1.6-rc2 docs 2014-08-12 15:09:13 +12:00
Michael
8ab12567a8 Update shortcodes.md
Replaced $args with $arguments as $args wasn't correct
2014-08-12 13:02:24 +12:00
Elliot Sawyer
ee489582e9 Fix typo in sitetree.md
Found a typo in the PHP class: StaggPage should be StaffPage
2014-08-12 13:02:13 +12:00
colymba
e535c35542 API New JS sprintf and inject replacement functions
Fix sprintf issues when replacement was at start of string + introduce
new inject function using injection map similar to the PHP version of
_t()
2014-08-12 13:01:29 +12:00
JorisDebonnet
3b6fc08f0f Update customize-cms-menu.md
Corrected a few typos.
2014-08-12 13:00:09 +12:00
JorisDebonnet
af333bd40d Update dataobject.md
There's no way to make things like [api:DataObject->beforeUpdateCMSFields()] work, is there?

I removed those kind of api tags (the links yielded a 404 page), and corrected a few other link-rendering issues.
2014-08-12 12:59:44 +12:00
Shaun de Greeff
953992e896 Update composer.md
Add a link to the Windows wamp page so that people will find info on how to install composer on windows more readily
2014-08-12 12:57:51 +12:00
Stefan Neuser
f0ed9e78a9 Update customize-cms-tree.md 2014-08-12 12:57:16 +12:00
Michael
52624e7505 Update shortcodes.md
Replaced $args with $arguments as $args wasn't correct
2014-08-08 16:02:10 +01:00
Elliot Sawyer
c09638f057 Fix typo in sitetree.md
Found a typo in the PHP class: StaggPage should be StaffPage
2014-08-08 15:53:03 +12:00
Simon Welsh
9b8d07ca5b Merge pull request #3180 from colymba/i18n-js-injection-fix
API New i18n JS sprintf and inject replacement functions
2014-08-07 21:24:52 +10:00
Simon Welsh
5283700ae0 Merge branch 'JorisDebonnet-3.1' into 3.1
Closes #3170
2014-08-07 21:07:48 +10:00
JorisDebonnet
bde5301e41 Update customize-cms-menu.md
Corrected a few typos.
2014-08-07 21:05:08 +10:00
Simon Welsh
b3994cd456 Merge pull request #3168 from JorisDebonnet/patch-2
Update dataobject.md
2014-08-07 21:04:05 +10:00
Shaun de Greeff
079e86163b Update composer.md
Add a link to the Windows wamp page so that people will find info on how to install composer on windows more readily
2014-08-07 20:19:14 +10:00
Stefan Neuser
4be04921de Update customize-cms-tree.md 2014-08-07 20:16:11 +10:00
Marcus Nyeholt
2ca94e9869 DOC Added aspect oriented proxy documentation 2014-08-06 13:48:26 +10:00
Damian Mooyman
9912410e7b Update documentation links 2014-08-05 16:14:39 +12:00
Damian Mooyman
259850477c Update release docs 2014-08-05 15:50:03 +12:00
Damian Mooyman
d42edae617 Added 3.1.6-rc1 changelog 2014-08-05 15:38:41 +12:00
Sean Harvey
1759d5d017 API Use "number" HTML5 type for NumericField by default 2014-08-04 14:27:35 +12:00
Damian Mooyman
26a0e91553 API SS_Filterable, SS_Limitable and SS_Sortable now explicitly extend SS_List 2014-07-30 11:07:01 +12:00
Ingo Schommer
48dd233050 Removed link to outdated docs mailinglist 2014-07-28 08:56:21 +12:00
Damian Mooyman
0433ba1642 BUG Revert some changes to ManyManyList
BUG Fix incompatibility in Member_GroupList
Fix regressions in merges from 3.1
BUG Fix Security failing on test classes
BUG Fix postgresql compatibility
Clarify sql encoding of table names
2014-07-23 12:38:41 +12:00
Damian Mooyman
350ee4d421 Merge pull request #3277 from kopymark/patch-3
Fix for joins code block
2014-07-23 08:54:18 +12:00
Cam Findlay
6f08484a90 DOCS Setting allowed_extensions in YAML
3.1 compatible docs in place of #3267
2014-07-20 14:25:21 +12:00
Sean Harvey
cfe8e15da9 Merge pull request #3268 from camfindlay/wamp-docs
Updating the WAMP docs to latest version and include composer installation notes
2014-07-17 10:29:39 +12:00
Cam Findlay
081087c977 Updating the WAMP docs to include composer installation and apache 2.4 fix - delete index.php
Now uses GFM for code blocks.
2014-07-17 09:58:14 +12:00
Simon Welsh
c14d58f585 Merge branch '3.1'
Conflicts:
	.travis.yml
	model/ManyManyList.php
	model/fieldtypes/DBField.php
2014-07-16 21:24:02 +10:00
Simon Welsh
8a3eebf289 Merge remote-tracking branch 'origin/3.0' into 3.1
Conflicts:
	i18n/i18n.php
2014-07-16 21:18:07 +10:00
Marijn Kampf
3fc371b24a Removed trailing : from yml example causing error
[Warning] Illegal offset type

Line 597 in \framework\view\Requirements.php
2014-07-15 09:59:43 +01:00
Adam Judd
171eb42c9e Fix for joins code block 2014-07-09 22:31:41 +09:30
Damian Mooyman
d8e9af8af8 API New Database abstraction layer. Ticket #7429
Database abstraction broken up into controller, connector, query builder, and schema manager, each independently configurable via YAML / Injector
Creation of new DBQueryGenerator for database specific generation of SQL
Support for parameterised queries, move of code base to use these over escaped conditions
Refactor of SQLQuery into separate query classes for each of INSERT UPDATE DELETE and SELECT
Support for PDO
Installation process upgraded to use new ORM
SS_DatabaseException created to handle database errors, maintaining details of raw sql and parameter details for user code designed interested in that data.
Renamed DB static methods to conform correctly to naming conventions (e.g. DB::getConn -> DB::get_conn)
3.2 upgrade docs
Performance Optimisation and simplification of code to use more concise API
API Ability for database adapters to register extensions to ConfigureFromEnv.php
2014-07-09 18:04:05 +12:00
Sam Minnée
14faf95f35 Fixed wrong variable name in modeladmin docs 2014-07-05 14:34:42 +12:00
Sam Minnée
ac9a6cbc62 Merge pull request #3169 from JorisDebonnet/patch-3
Update modeladmin.md
2014-07-05 14:33:49 +12:00
Sam Minnée
2a3eebf6df Merge pull request #3261 from oceanmountain/patch-1
Update templates.md
2014-07-05 14:23:20 +12:00
kay
f3f6f8a8be Update templates.md
Changed Fragment links to Anchor links, however it's is slighty confusing what the right name for the thing is.
According to w3.org: "Some URIs refer to a location within a resource. This kind of URI ends with "#" followed by an anchor identifier (called the fragment identifier)." - http://www.w3.org/TR/html401/intro/intro.html#fragment-uri

After doing some research in the most common used name for the #some-link identifier I came to the conclusion that most of the time (about 70% on StackOverflow/BlogArticles/Interwebz) Anchor-link was the term used to describe the identifier. Imho, Anchor is the prefered term for the identifier.

Is it acceptable to change fragment to anchor, since it seems more used?
2014-07-04 13:40:26 +02:00
Damian Mooyman
d3c7e41419 BUG using isDev or isTest query string no longer triggers basic auth 2014-07-02 11:51:51 +12:00
Cam Findlay
1fee81acef DOCS Document that you can set the global allow extensions via YAML.
Fixes #3233
2014-06-27 08:50:42 +12:00
Mateusz U
32ae468454 Merge pull request #3216 from halkyon/session_inst
Better support for overloading start and destroy methods in Session
2014-06-23 10:15:15 +12:00
daslicht
e0c4a70a8d Update javascript.md
Replaced deprecated jQuery live() with on(), updated link to documentation.
2014-06-22 10:59:59 +02:00
Sean Harvey
0ee3a683a5 Better support for overloading start and destroy methods in Session
Move functionality from static start and destroy functions into instance
methods, allowing these to be overloaded. This works the same way as
calling Session::set() which then in turn calls inst_set()

Additionally use Injector to create the default Session instance to
allow the class to be swapped out.
2014-06-20 10:35:53 +12:00
Cam Findlay
3e91900cc1 Fixes to the :::ss parsing - extra tabs were breaking it. 2014-06-20 10:13:07 +12:00
Stig Lindqvist
86e91b57bf Merge pull request #3219 from AntonyThorpe/patch-1
Update forms.md with additional example code in MyForm.ss
2014-06-19 15:43:11 +12:00
Antony Thorpe
6ac1c8256b Update forms.md with additional code in MyForm.ss
Show two ways of reaching a nested field plus that field's validation message
2014-06-17 17:18:04 +12:00
Ingo Schommer
bb03f6ba2f Merge remote-tracking branch 'origin/3.1'
Conflicts:
	forms/HtmlEditorField.php
2014-06-15 22:50:20 +12:00
Stig Lindqvist
1cd27ed972 Merge pull request #3105 from tractorcow/pulls/3.2-fix-fulltext-query-encoding
Changelog note for CMS:#1013
2014-06-14 17:15:14 +12:00
colymba
8fb5e9c3a4 API New JS sprintf and inject replacement functions
Fix sprintf issues when replacement was at start of string + introduce
new inject function using injection map similar to the PHP version of
_t()
2014-06-05 22:47:49 +03:00
Daniel Hensby
a32a1bcf11 DOCS Explicitly exclude dev deps for deployment
Docs should tell users how to deploy without development dependencies
2014-06-05 18:57:25 +01:00
Simon Welsh
81e6c806a7 Update modeladmin.md
DataList is immutable, so need to assign.
2014-06-05 15:03:02 +10:00
Cam Spiers
9aa7414aed Remove redundant ternary expression
Replace it with casting to a boolean
2014-05-30 14:54:57 +12:00
Stevie Mayhew
0da889bde2 Update datamodel.md
Fix broken link to SS_List->column
2014-05-29 16:25:40 +12:00
Stephen Shkardoon
6b410aa9a0 Update i18n.md
Fix a link being inside backticks, which broke the formatting.
2014-05-29 13:13:45 +12:00
JorisDebonnet
a224678d98 Update modeladmin.md
Corrected many broken link-renderings. Also removed the "Related" link to [genericviews Module](http://silverstripe.org/generic-views-module) because it doesn't work, and I can't it elswhere.
2014-05-29 00:51:27 +02:00
JorisDebonnet
9899b48daf Update dataobject.md
There's no way to make things like [api:DataObject->beforeUpdateCMSFields()] work, is there? 

I removed those kind of api tags (the links yielded a 404 page), and corrected a few other link-rendering issues.
2014-05-29 00:41:29 +02:00
sanjay
b317fbabdd Update sqlquery.md
adds missing datatype (i.e. Varchar) to the database field 'Name' of the Class 'Player'
2014-05-27 20:05:37 +05:30
sanjay
b5a7be6082 Update simple-contact-form.md
corrects the description about the order of the arguments passed while creating Form object.
2014-05-26 14:27:44 +05:30
JorisDebonnet
90bb1ec7f7 Update i18n.md
Corrected a mistake: to make a new locale available (in particular for use with silverstripe/translatable), i18n:common_locales needs to be updated, not i18n:common_languages.
2014-05-25 21:09:06 +02:00
Simon Welsh
824c6067a2 Merge pull request #3107 from micmania1/patch-1
CustomMember extends wrong class.
2014-05-24 11:08:35 +10:00
Devlin
5f7ebd3c23 API UploadField: move replaceFile to the front end config 2014-05-21 12:03:26 +02:00
Marijn Kampf
5daec94830 Update uploadfield.md
Fix 403 forbidden error: Action 'Form' isn't allowed on class GalleryPage_Controller.
2014-05-15 08:55:16 +01:00
Damian Mooyman
c3c3145d37 Merge remote-tracking branch 'origin/3.1.5' into 3.1 2014-05-13 16:51:55 +12:00
Damian Mooyman
830c10704c Fix changelog 2014-05-13 15:06:43 +12:00
Damian Mooyman
c492c5efda Merge remote-tracking branch 'origin/3.0' into 3.1.5
Conflicts:
	dev/DevelopmentAdmin.php
	docs/en/changelogs/index.md
	tests/filesystem/FolderTest.php
2014-05-13 14:32:27 +12:00
Damian Mooyman
ce516ca1cd Release docs 2014-05-13 13:02:21 +12:00
Damian Mooyman
ec578e5c8a Merge remote-tracking branch 'origin/3.1' 2014-05-12 11:32:22 +12:00
Phill Price
adf478b4e9 Update pagination.md
Eror in Limit example
2014-05-08 21:46:30 +01:00
Daniel Hensby
b873e32d9e fixing docs spacing 2014-05-07 12:06:44 +01:00
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
98e5c1556f Release docs update 2014-05-07 15:54:55 +12:00
Damian Mooyman
0ae96ab030 Changelog tags 2014-05-07 14:11:10 +12:00
Damian Mooyman
953e4b4c49 Added change log for 3.0.11-rc1 2014-05-07 14:03:13 +12:00
Damian Mooyman
617827d3ed Updated documentation index 2014-05-07 11:06:34 +12:00
Damian Mooyman
58d2535082 Added 3.1.5-rc1 change log 2014-05-07 10:54:33 +12:00
Michael Strong
9e66db4fe1 CustomMember extends wrong class.
CustomMember was extending the wrong class to be able to reference $this->owner.

Also, changed CustomMember to MyMemberExtension to remain consistent with the initial example.
2014-05-06 09:37:30 +01:00
Damian Mooyman
380e6c1952 Changelog note for https://github.com/silverstripe/silverstripe-cms/pull/1013 2014-05-06 11:45:39 +12:00
Hamish Friedlander
93cd339ff0 Merge pull request #3060 from tractorcow/pulls/tinymce-blockquote
API tinymce editor no longer transforms paragraphs with margin-left into blockquotes
2014-05-06 11:40:44 +12:00
Hamish Friedlander
bbd7bba11f Merge pull request #3058 from tractorcow/pulls/injector-stack-tests
API Injector supports nesting
2014-05-06 11:35:32 +12: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
James Pluck
4fd3015ea4 FIX: corrected link to CMS Alternating Button Page 2014-05-01 10:45:12 +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
Damian Mooyman
d06d5c113b API Injector supports nesting
BUG Resolve issue with DirectorTest breaking RequestProcessor
Injector::nest and Injector::unnest are introduced to better support sandboxing of testings.
Injector and Config ::nest and ::unnest support chaining
Test cases for both Injector::nest and Config::nest
2014-04-29 08:59:33 +12:00
Martin D.
6b3a21653b Fixed config setting link 2014-04-28 10:31:54 -04: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
7188eab905 Merge pull request #3067 from sanjaymundhra/patch-7
update 3-forms.md
2014-04-28 10:31:36 +12:00
sanjay
044b68f973 update 3-forms.md
adds the missing "/" in the url
2014-04-23 17:19:41 +05:30
Jim Tittsler
8acb28ffc5 remove leading tab
fix rendering
2014-04-23 14:50:34 +09:00
Damian Mooyman
d16db2d4f4 API tinymce editor no longer transforms paragraphs with margin-left into blockquotes
This is legacy behaviour which does not often reflect the expected behaviour of the current editor. indent and outdent can (in some situations) prefer to use margin instead of padding. sapphiremce_cleanup faultily assumes that such indented text should be block quoted, and replaces this with a block quote element. This is not necessary, since the blockquote element can be placed explicitly by the user when necessary.

To replicate the incorrect indentation behaviour, configure tinymce to use the 'lists' plugin (via admin/_config.php) and attempt to indent some text. Indented text will be unexpectedly replaced with blockquotes.
2014-04-23 12:01:50 +12:00
Damian Mooyman
982ad569b9 Merge remote-tracking branch 'origin/3.1' 2014-04-22 12:09:51 +12:00
muskie9
04f834c317 Update remove extra ); from relation callback function 2014-04-18 14:36:03 -05:00
Simon Welsh
fc9864eed3 Wording fix to forms.md
Closes #3032
2014-04-17 17:44:54 +12:00
Martin D.
4535448bce Fixed small typo
ration changed to ratio
2014-04-16 13:26:47 -04:00
Mateusz U
36d925543b Merge pull request #3020 from tractorcow/pulls/3.1-autocomplete-username
API Security.remember_username to disable login form autocompletion
2014-04-11 09:17:27 +12:00
Damian Mooyman
997077ae83 API Security.remember_username to disable login form autocompletion 2014-04-11 09:05:25 +12:00
camfindlay
86aef8a42b Fixed reference to the templates documentation 2014-04-09 18:27:43 +12:00
Damian Mooyman
ee487e28f1 Merge remote-tracking branch 'origin/3.1.4' into 3.1 2014-04-08 17:10:28 +12:00
Damian Mooyman
d8836fd488 Merge remote-tracking branch 'origin/3.0' into 3.1 2014-04-08 17:10:07 +12:00
Damian Mooyman
81b14b4352 Update upgrading docs 3.1.4 2014-04-08 16:19:19 +12:00
Damian Mooyman
b22aaaab1f 3.1.4 upgrading docs 2014-04-08 15:58:17 +12:00
Damian Mooyman
e33e869731 Merge remote-tracking branch 'composer/3.0.10' into 3.1.4 2014-04-08 15:57:57 +12:00
camfindlay
a0607845e4 FIX - missing link url for composer
My bad, have amended this.
2014-04-08 13:21:05 +12:00
Damian Mooyman
c87373d095 Add 3.0.10 upgrade docs 2014-04-08 12:30:24 +12:00
camfindlay
026e4be429 Info about getting set up using composer and MAMP
Added by request of Gábor Novoszádi from community feedback and thanks to the gist from @kkirsche. I have supplied a link to the gist as it is well written, with permission we may look to rework for direct inclusion at some point :)
2014-04-07 21:59: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
Damian Mooyman
4c69d42bd2 Merge remote-tracking branch 'origin/3.1' 2014-04-02 17:23:39 +13:00
OliBridgman
49232151af Update index.md
topics/templates doesn't exist.
2014-04-02 10:19:47 +13:00
Damian Mooyman
93ca3f7f23 Documentation link fixes 2014-04-01 17:46:08 +13:00
Damian Mooyman
2f91826b28 Merge remote-tracking branch 'origin/3.0' into 3.1 2014-04-01 17:43:38 +13:00
Damian Mooyman
9230d41186 Include announcement links for security fixes 2014-04-01 17:40:39 +13:00
Damian Mooyman
f2725523ae 3.1.4-rc1 release docs 2014-04-01 11:28:44 +13:00
Damian Mooyman
6ae7d43a5d Merge remote-tracking branch 'origin/3.0' into 3.1 2014-04-01 07:56:01 +13:00
Damian Mooyman
cf2a314a50 Added change log to upgrade docs 2014-03-31 16:31:25 +13:00
Damian Mooyman
21f50f44e5 3.0.10-rc1 upgrading docs 2014-03-31 16:07:53 +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
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