Ingo Schommer 99ca0471f7 Merge remote-tracking branch 'origin/2.4' into 3.0 ...

Conflicts:
	control/RequestHandler.php
	core/control/ContentController.php
	dev/CsvBulkLoader.php
	docs/en/changelogs/index.md
	docs/en/reference/execution-pipeline.md
	docs/en/topics/commandline.md
	docs/en/topics/controller.md
	docs/en/topics/form-validation.md
	docs/en/topics/forms.md
	docs/en/topics/security.md
	model/MySQLDatabase.php
	security/Security.php
	tests/control/ControllerTest.php
	tests/control/RequestHandlingTest.php

2013-03-19 13:56:04 +01:00

..

_images

API CHANGE Moved Translatable class into new 'translatable' module

2011-03-29 18:07:56 +13:00

testing

NEW FixtureFactory separated out from YamlFixture

2012-12-11 17:06:27 +01:00

access-control.md

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

2011-03-21 11:53:06 +13:00

commandline.md

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

2013-03-19 13:56:04 +01:00

configuration.md

NEW Add documentation for the new config system in 3.0

2012-10-04 16:34:57 +13:00

controller.md

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

2013-03-19 13:56:04 +01:00

css.md

API-CHANGE Update docs to match renaming of sapphire to framework

2012-04-15 10:50:19 +12:00

data-types.md

Method visibility according to coding conventions

2012-09-20 10:46:59 +02:00

datamodel.md

Clarified docs on isDev usage in dev/build

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

debugging.md

MINOR Removed references to outdated versions from docs

2012-03-09 21:34:05 +01:00

directory-structure.md

Corrected a number of inbound links pointing to the documentation.

2012-10-09 14:53:47 +13:00

email.md

Email doc formatting

2012-12-04 20:00:09 +13:00

environment-management.md

API-CHANGE Update docs to match renaming of sapphire to framework

2012-04-15 10:50:19 +12:00

error-handling.md

MINOR Removed references to outdated versions from docs

2012-03-09 21:34:05 +01:00

files.md

Fixed references to deprecated APIs in docs

2012-06-28 14:49:55 +02:00

form-validation.md

Improved docs on $allowed_actions

2013-02-17 23:30:40 +01:00

forms.md

Improved docs on $allowed_actions

2013-02-17 23:30:40 +01:00

i18n.md

Partially revert docs commit 7710cf59

2013-03-04 08:48:16 +01:00

index.md

DOC Removed link to missing 'extending-the-cms.md'

2012-12-14 16:15:22 +13:00

javascript.md

Method visibility according to coding conventions

2012-09-20 10:46:59 +02:00

module-development.md

Removed invalid characters

2013-03-16 23:17:02 +13:00

modules.md

Updated composer docs

2013-02-25 11:47:11 +01:00

page-type-templates.md

Consolidated template and page-type docs

2012-06-27 16:09:32 +02:00

page-types.md

Fixed references to deprecated APIs in docs

2012-06-28 14:49:55 +02:00

rich-text-editing.md

Fixed references to deprecated APIs in docs

2012-06-28 14:49:55 +02:00

search.md

Fixed references to deprecated APIs in docs

2012-06-28 14:49:55 +02:00

security.md

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

2013-03-19 13:56:04 +01:00

theme-development.md

Fixed references to deprecated APIs in docs

2012-06-28 14:49:55 +02:00

themes.md

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

2011-03-21 11:53:06 +13:00

versioning.md

NEW Documentation for Versioned

2012-06-27 16:09:31 +02:00

widgets.md

Update widget documentation (fixes #706)

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