Damian Mooyman 43f49e8434 Merge remote-tracking branch 'origin/3.1' into 3 ...

Conflicts:
	admin/code/ModelAdmin.php
	control/Director.php
	model/SQLQuery.php
	security/Member.php
	tests/control/HTTPTest.php
	tests/model/SQLQueryTest.php
	tests/security/SecurityTest.php
	tests/view/SSViewerTest.php

2015-03-31 19:54:15 +13:00

..

manifest

FIX make class loader classExists check interface_exists as per docs

2015-03-03 00:22:15 +00:00

startup

BUG ErrorControlChain now supports exception handling

2014-09-26 16:54:34 +12:00

ArrayLib.php

Remove all redundant whitespace

2014-08-19 09:17:15 +12:00

ClassInfo.php

Merge remote-tracking branch 'origin/3.1'

2014-11-18 12:45:54 +13:00

Config.php

Change the LRU cache to a simple in-memory model

2015-03-09 02:01:24 +00:00

Constants.php

Deprecate stripslashes_recursively and magic quotes

2015-03-14 21:24:11 +13:00

Convert.php

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

2015-03-31 19:54:15 +13:00

Core.php

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

2015-03-11 11:40:06 +13:00

DAG.php

Remove all redundant whitespace

2014-08-19 09:17:15 +12:00

Diff.php

Remove all redundant whitespace

2014-08-19 09:17:15 +12:00

Extension.php

Remove all redundant whitespace

2014-08-19 09:17:15 +12:00

Flushable.php

NEW Provide a consistent way of triggering flush

2014-08-22 09:24:27 +12:00

HTMLCleaner.php

Remove all redundant whitespace

2014-08-19 09:17:15 +12:00

Object.php

Merge remote-tracking branch 'origin/3.1'

2014-11-18 12:45:54 +13:00

PaginatedList.php

API enable PaginatedList to be disabled by setting page length to 0

2015-03-05 12:07:14 +13:00

TempPath.php

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

2015-02-20 10:17:19 +13:00