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

Conflicts:
	forms/HtmlEditorField.php

2014-06-15 22:50:20 +12:00

..

manifest

Merge remote-tracking branch 'origin/3.1'

2014-05-12 11:32:22 +12:00

startup

API Fix HTTPS proxy header detection

2014-05-22 18:34:15 +12:00

ArrayLib.php

API: Add ArrayLib::flatten($array, $preserveKeys)

2013-05-11 00:00:31 +12:00

ClassInfo.php

Removing ClassInfo::is_subclass_of(), use is_subclass_of() instead

2012-11-15 14:43:13 +13:00

Config.php

API Injector supports nesting

2014-04-29 08:59:33 +12:00

Constants.php

Allow ASSETS_PATH to be overridden like ASSETS_PATH (via jthomerson)

2013-11-01 11:27:03 +13:00

Convert.php

Use preg_replace_callback over preg_replace with e modifier

2013-07-05 09:08:58 +12:00

Core.php

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

2014-02-12 15:18:27 +13:00

DAG.php

Updating @package and @subpackage doc tags

2013-11-29 17:49:30 +13:00

Diff.php

API Make HTMLValue replace-able via DI

2013-03-14 12:49:02 +13:00

Extension.php

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

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

HTMLCleaner.php

API Make HTMLValue replace-able via DI

2013-03-14 12:49:02 +13:00

Object.php

Correct line length and indentation

2014-03-30 21:11:56 +13:00

PaginatedList.php

Don't show next for anything above TotalPages

2014-02-02 21:13:48 +01:00

TempPath.php

Merge branch 'pulls/apidocs-package-list' of https://github.com/madmatt/silverstripe-framework into madmatt-pulls/apidocs-package-list

2014-01-31 15:15:59 +13:00