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

..

_images

Update topics/file documentation (closes #1481)

2013-12-20 14:03:07 +00:00

testing

FIX: Documentation for Silverstripe Test

2014-01-02 11:38:43 +00:00

access-control.md

Typography review

2013-12-05 21:20:49 +01:00

caching.md

FIX Prevent DOS by checking for env and admin on ?flush=1 (#1692)

2013-07-19 12:24:32 +12:00

commandline.md

Update documentation static declarations to private

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

configuration.md

Update the yaml configuration with existing before / after syntax

2013-12-20 10:36:16 +13:00

controller.md

Improved Link() docs

2014-01-22 22:28:10 +13:00

css.md

Docs: Consistent arg quoting in <% require %> (#1614)

2013-08-03 18:44:32 +02:00

data-types.md

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

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

datamodel.md

Merge remote-tracking branch 'origin/3.1'

2014-02-04 08:19:04 +13:00

debugging.md

Fixed _config.php references and usage in docs

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

directory-structure.md

Fixed _config.php references and usage in docs

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

email.md

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

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

environment-management.md

Allow SS_DATABASE_NAME in _ss_environment.php configuration

2013-04-22 14:11:37 +02:00

error-handling.md

Fixed _config.php references and usage in docs

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

files.md

Update topics/file documentation (closes #1481)

2013-12-20 14:03:07 +00:00

form-validation.md

getCMSValidator() docs

2013-09-18 14:32:38 +02:00

forms.md

Update form.md

2013-11-28 16:27:01 +05:30

i18n.md

Improved i18n JS docs

2014-01-24 11:12:23 +13:00

index.md

Merge branch 'origin/3.0' into 3.1

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

javascript.md

Remove references to ComplexTableField

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

module-development.md

Correct module inclusion criteria.

2014-02-03 15:52:57 +11:00

modules.md

MINOR fix typo in link

2014-01-08 03:14:20 +13:00

page-type-templates.md

Update page-type-templates.md

2013-05-03 15:04:30 +12:00

page-types.md

Update Page-types.md

2013-11-29 11:55:23 +05:30

rich-text-editing.md

Document how to enable TinyMCE context menu

2013-10-23 19:59:17 +02:00

search.md

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

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

security.md

Update secrity.md

2013-11-29 14:45:53 +05:30

theme-development.md

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

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

themes.md

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

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

versioning.md

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

2013-11-05 10:15:40 +01:00

widgets.md

Update widget documentation (fixes #706)

2012-08-08 21:21:58 +12:00