Simon Welsh c14d58f585 Merge branch '3.1' ... Conflicts: .travis.yml model/ManyManyList.php model/fieldtypes/DBField.php		2014-07-16 21:24:02 +10:00
..
manifest	Merge remote-tracking branch 'origin/3.1'	2014-06-17 18:17:24 +12:00
startup	BUG using isDev or isTest query string no longer triggers basic auth	2014-07-02 11:51:51 +12:00
ArrayLib.php	API: Add ArrayLib::flatten($array, $preserveKeys)	2013-05-11 00:00:31 +12:00
ClassInfo.php	API New Database abstraction layer. Ticket #7429	2014-07-09 18:04:05 +12:00
Config.php	API New Database abstraction layer. Ticket #7429	2014-07-09 18:04:05 +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	Merge branch '3.1'	2014-07-16 21:24:02 +10: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	API New Database abstraction layer. Ticket #7429	2014-07-09 18:04:05 +12: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