Simon Welsh 8f31352039 Merge remote-tracking branch 'origin/3.1' ...

Conflicts:
	.travis.yml

2014-03-16 09:36:48 +13:00

..

_images

MINOR Added CMS architecture documentation

2012-01-01 18:24:09 +01:00

bbcode.md

Small text changes, added api links, cont. updating images for tutorials, fixed tutorials from member feedback

2011-03-09 10:05:51 +13:00

cms-architecture.md

NEW: Updating out of date URLs in the framework source code and docs

2014-02-07 15:10:44 +13:00

database-structure.md

Removing broken reference to "getNextID()"

2014-02-21 15:24:01 +00:00

dataextension.md

Clarify usage of extend within DataExtensions

2013-12-18 19:59:58 +13:00

dataobject.md

update dataobject.md

2014-02-20 16:40:47 +05:30

datefield.md

API Removed auto-detection for i18n date/time formats

2014-02-16 23:57:49 +13:00

director.md

Updated github path

2013-05-17 00:45:52 +02:00

execution-pipeline.md

Merge branch '3.1'

2013-11-11 18:18:25 +11:00

form-field-types.md

Fix minor formatting issues

2013-03-18 14:37:26 +13:00

grid-field.md

API GridState_Data values can have default values specified during retrieval.

2013-10-24 16:15:33 +13:00

image.md

DOCS Added info about adjusting Image quality using new config

2014-03-12 10:44:47 +10:00

index.md

Remove references to ComplexTableField

2013-05-26 11:11:53 +12:00

injector.md

NEW: Allow specifying a factory to use for creating services.

2014-02-03 11:30:22 +11:00

layout.md

API Move state to enwtine properties, provide API for preview.

2012-12-10 17:52:01 +01:00

member.md

FieldList->insertBefore/After now accept arguments in either order (fixes #2737)

2014-03-15 11:32:51 +00:00

modeladmin.md

Fix error in code block for ModelAdmin example

2013-12-24 07:59:05 +13:00

partial-caching.md

Update partial-caching.md

2013-11-12 17:22:59 +13:00

permission.md

Squashing previous corrections into one commit along with a couple more

2013-09-24 19:21:04 +01:00

preview.md

Update preview.md

2014-03-04 11:32:45 +13:00

requirements.md

Minor language and readability fixes.

2013-12-20 12:24:03 +01:00

restfulservice.md

Fixed RSS example

2013-11-12 10:50:27 +13:00

rssfeed.md

Noting two more arguments in the list RSSFeed

2014-03-15 21:25:28 +13:00

searchcontext.md

Updating SearchContext documentation

2013-12-06 15:45:38 +13:00

shortcodes.md

Merge branch '3.0' into 3.1

2014-03-10 22:56:27 +13:00

site-reports.md

Fixed markdown whitespace usage

2012-10-02 11:38:16 +02:00

siteconfig.md

Update docs to consistently use http://localhost/ (fixes #1919)

2013-10-23 20:24:52 +01:00

sitetree.md

NEW Enforce max node counts to avoid excessive resource usage

2013-04-09 10:24:18 +12:00

sqlquery.md

API Marked statics private, use Config API instead (#8317)

2013-03-24 17:20:53 +01:00

tablefield.md

Remove references to ComplexTableField

2013-05-26 11:11:53 +12:00

tablelistfield.md

Moved GridField docs to reference

2012-10-30 18:59:26 +01:00

templates-formal-syntax.md

ENHANCEMENT: Updated the template language documentation, based on work done by mrmorphic.

2011-12-17 15:25:15 +13:00

templates-upgrading-guide.md

Consistently used dollar notation in template docs (see #1794)

2013-04-26 11:48:59 +02:00

templates.md

Merge remote-tracking branch 'origin/3.0' into 3.1

2013-09-12 17:33:36 +02:00

typography.md

MINOR Updated coding conventions to require the 'public' keyword for class methods and variables

2012-01-30 23:13:42 +01:00

uploadfield.md

use the yml config system instead of _config.php for extensions

2014-02-03 14:26:49 +01:00

urlvariabletools.md

Update docs to consistently use http://localhost/ (fixes #1919)

2013-10-23 20:24:52 +01:00