Simon Welsh fbce9fd7cd Merge branch '3.1' ...

Conflicts:
	.travis.yml
	docs/en/misc/contributing/code.md
	javascript/HtmlEditorField.js

2013-07-05 10:22:58 +12:00

..

_images

API CHANGE Moved Translatable class into new 'translatable' module

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

testing

Merge branch '3.1'

2013-07-05 10:22:58 +12: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

Update documentation static declarations to private

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

configuration.md

Add configuration system tests for Only and Except combinations.

2013-07-02 15:51:53 +12:00

controller.md

API Enforce $allowed_actions in RequestHandler->checkAccessAction()

2013-06-24 14:50:40 +02: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

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

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

datamodel.md

Update documentation static declarations to private

2013-06-08 15:16:59 +12: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

Fixed references to deprecated APIs in docs

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

form-validation.md

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

2013-04-09 14:45:35 +02:00

forms.md

Update documentation static declarations to private

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

i18n.md

Added docs for i81n.moduole_priority.

2013-05-06 12:51:46 +12:00

index.md

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

2013-05-17 13:51:54 +02:00

javascript.md

Remove references to ComplexTableField

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

module-development.md

A few minor improvements to the "Module development" documentation

2013-06-16 12:55:39 +03:00

modules.md

Update module development, remove outdated release steps

2013-06-15 12:06:25 +12:00

page-type-templates.md

Update page-type-templates.md

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

page-types.md

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

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

rich-text-editing.md

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

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

search.md

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

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

security.md

FIX HtmlEditorField not re-checking sanitisation server side

2013-07-04 08:53:23 +12:00

theme-development.md

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

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

themes.md

Fixed _config.php references and usage in docs

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

versioning.md

Fixed _config.php references and usage in docs

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

widgets.md

Update widget documentation (fixes #706)

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