Ingo Schommer 6176d65bd2 Merge remote-tracking branch 'origin/3.1' ...

Conflicts:
	forms/gridfield/GridFieldSortableHeader.php
	model/DataList.php
	model/fieldtypes/Enum.php

2013-12-02 20:49:34 +01:00

..

_images

Rewrite the permission docs for IIS7.

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

common-problems.md

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

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

composer.md

Merge pull request #2555 from halkyon/readme_fixes

2013-10-16 18:38:58 -07: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

Improve docs (mostly spelling)

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

nginx.md

fix nginx documentation to one that actually works :-)

2013-04-23 12:37:25 +02:00

server-requirements.md

Merge remote-tracking branch 'origin/3.1'

2013-12-02 20:49:34 +01: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

ENHANCEMENT Added sapphire/docs (migrated from https://github.com/chillu/silverstripe-doc-restructuring)

2011-02-07 19:48:44 +13:00

windows-wamp.md

ENHANCEMENT Added sapphire/docs (migrated from https://github.com/chillu/silverstripe-doc-restructuring)

2011-02-07 19:48:44 +13:00