Mateusz Uzdowski 8bf3853887 Merge remote-tracking branch 'origin/3.1' ...

Conflicts:
	docs/en/misc/contributing/issues.md
	docs/en/reference/uploadfield.md
	forms/HtmlEditorField.php
	i18n/i18n.php
	javascript/HtmlEditorField.js
	model/DB.php
	model/Image.php
	model/SQLQuery.php

2014-08-14 09:08:26 +12:00

..

_images

Update topics/file documentation (closes #1481)

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

testing

Better support for overloading start and destroy methods in Session

2014-06-20 10:35:53 +12:00

access-control.md

Typography review

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

caching.md

Improved SS_Cache docs, moved to /docs

2014-03-16 11:55:55 +13: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

Update css.md

2014-03-03 02:40:33 -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-08-14 09:08:26 +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

Update topics/file documentation (closes #1481)

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

forms.md

Merge pull request #3219 from AntonyThorpe/patch-1

2014-06-19 15:43:11 +12:00

i18n.md

Merge pull request #3180 from colymba/i18n-js-injection-fix

2014-08-07 21:24:52 +10:00

index.md

Update index.md

2014-04-02 10:19:47 +13:00

javascript.md

Merge branch '3.1'

2014-07-16 21:24:02 +10:00

module-development.md

Correct module inclusion criteria.

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

modules.md

Updated add-on URL.

2014-02-07 15:48:34 +00:00

page-type-templates.md

Update page-type-templates.md

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

page-types.md

remove leading tab

2014-04-23 14:50:34 +09:00

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

API New Database abstraction layer. Ticket #7429

2014-07-09 18:04:05 +12:00

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