silverstripe-framework/core
Daniel Hensby 0b36082564 Merge branch '3'
Conflicts:
	.travis.yml
	composer.json
	docs/en/changelogs/4.0.0.md
	forms/gridfield/GridFieldExportButton.php
2015-08-17 13:12:41 +01:00
..
manifest FIX Imported namespaces now correctly used to determine class inheritance 2015-06-20 16:09:10 +01:00
startup Merge remote-tracking branch 'origin/3.1' into 3 2015-06-02 19:13:38 +12:00
ArrayLib.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
ClassInfo.php Merge branch '3.1' into 3.2 2015-08-17 11:43:28 +01:00
Config.php Merge branch '3.1' into 3.2 2015-07-20 10:48:01 +01:00
Constants.php Merge remote-tracking branch 'origin/3' 2015-07-31 15:49:35 +12:00
Convert.php Url-safe alternative for base64_encode in resampled Image filenames 2015-08-05 20:59:40 +02:00
Core.php FIX: allow for increase_time_limit_to to work if $_increase_time_limit_max is not yet set 2015-06-22 08:17:04 +12: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 Mark Object caching methods as deprecated 2015-07-27 17:15:53 +01:00
PaginatedList.php Merge remote-tracking branch 'origin/3' 2015-05-19 09:19:47 +12:00
TempPath.php Merge remote-tracking branch 'origin/3.1' into 3 2015-02-20 10:17:19 +13:00