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

Rewrite the permission docs for IIS7.

2012-09-10 14:01:17 +12:00

common-problems.md

Docs for whitespace fixes

2014-02-07 11:57:06 +13:00

composer.md

Update composer.md

2014-08-07 20:19:14 +10:00

from-source.md

Improve docs (mostly spelling)

2013-05-29 18:23:25 +02:00

index.md

Fix misleading composer link

2013-05-25 10:41:56 +12:00

lighttpd.md

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

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

mac-osx.md

FIX - missing link url for composer

2014-04-08 13:21:05 +12:00

nginx.md

Merge branch '3.0' into 3.1

2014-03-10 22:56:27 +13:00

server-requirements.md

FIX Requirement documentation of MySQL driver

2014-02-18 23:06:29 +13:00

upgrading.md

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

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

webserver.md

Improve docs (mostly spelling)

2013-05-29 18:23:25 +02:00

windows-manual-iis-6.md

Formatted warnings correctly

2012-09-17 12:24:45 +12:00

windows-manual-iis-7.md

Raised minimum PHP Veresion to 5.3.3

2013-10-23 11:10:42 +03:00

windows-manual-iis.md

Formatted warnings correctly

2012-09-17 12:24:45 +12:00

windows-pi.md

NEW: Updating out of date URLs in the framework source code and docs

2014-02-07 15:10:44 +13:00

windows-wamp.md

Updating the WAMP docs to include composer installation and apache 2.4 fix - delete index.php

2014-07-17 09:58:14 +12:00