silverstripe-framework/core
Damian Mooyman dff65867cc Merge remote-tracking branch 'origin/3.1' into 3
Conflicts:
	control/HTTP.php
	control/HTTPResponse.php
	docs/en/05_Contributing/01_Code.md
	forms/CompositeField.php
	forms/FormAction.php
	forms/FormField.php
	forms/InlineFormAction.php
	forms/NumericField.php
	forms/TreeDropdownField.php
	forms/TreeMultiselectField.php
	templates/forms/TreeDropdownField.ss
	tests/core/CoreTest.php
	tests/forms/NumericFieldTest.php
	tests/model/DataDifferencerTest.php
2015-02-20 10:17:19 +13:00
..
manifest Merge remote-tracking branch 'composer/3.1' into 3 2015-01-15 18:52:46 +13: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 Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
Constants.php Fixed infinity loop when searching _ss_environment 2015-02-17 04:33:40 +00:00
Convert.php API Convert::html2raw no longer wraps text automatically 2014-09-25 16:04:48 +12:00
Core.php Merge remote-tracking branch 'origin/3.1' into 3 2015-02-20 10:17:19 +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 Moved deprecation of SQLQuery to 4.0 2014-12-04 09:30:50 +13:00
TempPath.php Merge remote-tracking branch 'origin/3.1' into 3 2015-02-20 10:17:19 +13:00