Ingo Schommer 03d1d58148 Merge remote-tracking branch 'origin/3.0' into 3.1 ...

Conflicts:
	admin/code/SecurityAdmin.php
	css/AssetUploadField.css
	docs/en/topics/configuration.md
	security/PermissionRole.php

2013-09-12 17:33:36 +02: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

Return jQuery deferred object from LeftAndMain's loadFragment.

2013-08-23 09:39:38 +12:00

complextablefield.md

Moved GridField docs to reference

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

database-structure.md

Clarified docs on isDev usage in dev/build

2013-01-22 14:29:58 +01:00

dataextension.md

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

dataobject.md

API Allow $summary_fields to support methods on DBFields

2013-06-13 09:41:24 +12:00

datefield.md

NEW Hints for scaffolded date/time fields

2013-04-08 19:38:50 +12:00

director.md

Updated github path

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

execution-pipeline.md

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

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

form-field-types.md

Fix minor formatting issues

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

grid-field.md

DOCFIX: small typo causing linking error

2013-07-11 13:40:34 +00:00

image.md

Merge branch 'patch-2' of https://github.com/anselmdk/sapphire into 3.0

2012-09-24 18:22:49 +12:00

index.md

Merge branch 'refindex' of git://github.com/silverstripe-rebelalliance/sapphire into silverstripe-rebelalliance-refindex

2013-02-25 15:05:15 +13:00

injector.md

Fixed markdown whitespace usage

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

layout.md

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

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

member.md

Fixed _config.php references and usage in docs

2013-03-27 12:06:57 +01:00

modeladmin.md

Fixed _config.php references and usage in docs

2013-03-27 12:06:57 +01:00

partial-caching.md

Fix misleading documentation about Children.max

2013-07-29 15:18:39 +12:00

permission.md

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

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

preview.md

Doc cleanup (spelling, line length, grammar)

2013-06-02 13:38:10 +12:00

requirements.md

Update requirements.md

2013-09-03 01:18:58 -05:00

restfulservice.md

Fixed markdown whitespace usage

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

rssfeed.md

Fix typo with setTemplate() rss docs.

2012-12-04 19:54:26 +13:00

searchcontext.md

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

2013-05-09 10:34:20 +02:00

shortcodes.md

Fixed conventions in shortcode docs

2013-05-17 14:02:33 +02:00

site-reports.md

Fixed markdown whitespace usage

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

siteconfig.md

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

2013-05-09 10:34:20 +02: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

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

2011-03-09 10:05:51 +13: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

Update documentation static declarations to private

2013-06-08 15:16:59 +12:00

urlvariabletools.md

Merge branch 'origin/3.0' into 3.1

2013-07-19 14:18:49 +12:00