tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity
fb67181366
silverstripe-framework/dev
History
Ingo Schommer afe06661ef Merge remote-tracking branch 'origin/3.0' into 3.1 
Conflicts:
	admin/templates/Includes/LeftAndMain_Menu.ss
	admin/templates/Includes/ModelAdmin_ImportSpec.ss
	admin/templates/Includes/ModelAdmin_Tools.ss
	admin/templates/LeftAndMain.ss
	admin/templates/ModelSidebar.ss
	i18n/i18n.php
	templates/ComplexTableField.ss
	templates/ComplexTableField_popup.ss
	templates/FileIFrameField_iframe.ss
	templates/Includes/GridFieldItemEditView.ss
	templates/Includes/TableListField_PageControls.ss
	templates/RelationComplexTableField.ss
	templates/TableField.ss
	templates/TableListField.ss
2013-08-07 17:14:47 +02:00
..
install Merge remote-tracking branch 'origin/3.0' into 3.1 2013-08-07 17:14:47 +02:00
phpunit API Marked statics private, use Config API instead (#8317) 2013-03-24 17:20:53 +01:00
Backtrace.php API Marked statics private, use Config API instead (#8317) 2013-03-24 17:20:53 +01:00
BehatFixtureFactory.php BehatFixtureFactory 5.3.8 compat (wrong usage of is_a()) 2013-07-11 15:13:37 +02:00
BuildTask.php Method visibility according to coding conventions 2012-09-20 10:46:59 +02:00
BulkLoader.php FIX: Instead of CsvBulkLoader->findExistingRecord out right failing (i.e. no duplicate found) when the duplicate check field is empty, it will now continue on to check other duplicateCheck fields. 2013-04-19 16:52:39 +12:00
Cli.php FIX Remove instances of lines longer than 120c 2012-09-30 17:18:13 +13:00
CliDebugView.php Method visibility according to coding conventions 2012-09-20 10:46:59 +02:00
CliTestReporter.php FIX Remove instances of lines longer than 120c 2012-09-30 17:18:13 +13:00
CSSContentParser.php FIX Remove instances of lines longer than 120c 2012-09-30 17:18:13 +13:00
CsvBulkLoader.php Code formatting / PHPDoc cleanup 2013-05-14 22:06:02 +12:00
CSVParser.php Code formatting / PHPDoc cleanup 2013-05-14 22:06:02 +12:00
Debug.php FIX Avoid unnecessary user_error when no controller set for friendly errors in Debug class 2013-05-14 16:58:57 +12:00
DebugView.php FIX Remove instances of lines longer than 120c 2012-09-30 17:18:13 +13:00
Deprecation.php FIX Deprecation $manifest not in global scope 2013-05-31 15:32:10 +02:00
DevelopmentAdmin.php Merge remote-tracking branch 'origin/3.0' into 3.1 2013-08-07 17:14:47 +02:00
FixtureBlueprint.php Merge remote-tracking branch 'origin/3.0' into 3.1 2013-06-05 15:17:06 +02:00
FixtureFactory.php NEW FixtureFactory separated out from YamlFixture 2012-12-11 17:06:27 +01:00
FunctionalTest.php API Marked statics private, use Config API instead (#8317) 2013-03-24 17:20:53 +01:00
InstallerTest.php API Marked statics private, use Config API instead (#8317) 2013-03-24 17:20:53 +01:00
JSTestRunner.php API Marked statics private, use Config API instead (#8317) 2013-03-24 17:20:53 +01:00
Log.php API Marked statics private, use Config API instead (#8317) 2013-03-24 17:20:53 +01:00
LogEmailWriter.php API Marked statics private, use Config API instead (#8317) 2013-03-24 17:20:53 +01:00
LogErrorEmailFormatter.php BUG Exception handling and email notification mechanism now correctly considers the stacktrace as provided by the exceptionHandler function, instead of attempting to perform a debug_backtrace further down the reporting chain (which ends up generating an unnecessarily nested stacktrace). Debug was cleaned up so that errorHandler and exceptionHandler both act consistently. As a result, the LogErrorEmailFormatter class could be simplified. 2013-01-24 09:36:42 +01:00
LogErrorFileFormatter.php BUGFIX Ensure has length before using string index access. 2012-12-20 12:27:09 +10:00
LogFileWriter.php Merge branch '3.0' 2012-09-21 14:56:56 +12:00
MigrationTask.php FIX Remove instances of lines longer than 120c 2012-09-30 17:18:13 +13:00
Profiler.php Merge remote-tracking branch 'origin/3.0' into 3.1 2012-12-12 10:11:56 +01:00
SapphireInfo.php API Marked statics private, use Config API instead (#8317) 2013-03-24 17:20:53 +01:00
SapphireREPL.php API Marked statics private, use Config API instead (#8317) 2013-03-24 17:20:53 +01:00
SapphireTest.php Enforce 'dev' environment for test runs 2013-06-19 00:13:02 +02:00
SapphireTestReporter.php Add codesniffer that ensures indentation is with tabs. 2012-12-12 17:33:31 +13:00
SapphireTestSuite.php Method visibility according to coding conventions 2012-09-20 10:46:59 +02:00
SilverStripeListener.php Add codesniffer that ensures indentation is with tabs. 2012-12-12 17:33:31 +13:00
SysLogWriter.php MINOR Update @package values to match renaming sapphire 2012-04-15 10:50:19 +12:00
TaskRunner.php API Marked statics private, use Config API instead (#8317) 2013-03-24 17:20:53 +01:00
TeamCityListener.php Add codesniffer that ensures indentation is with tabs. 2012-12-12 17:33:31 +13:00
TestListener.php Add codesniffer that ensures indentation is with tabs. 2012-12-12 17:33:31 +13:00
TestMailer.php FIX Remove instances of lines longer than 120c 2012-09-30 17:18:13 +13:00
TestOnly.php MINOR Update @package values to match renaming sapphire 2012-04-15 10:50:19 +12:00
TestRunner.php Merge remote-tracking branch 'origin/3.0' into 3.1 2013-06-24 14:39:09 +02:00
TestSession.php MINOR: Minor fixes to FunctionalTest 2013-01-29 18:03:48 +01:00
YamlFixture.php NEW FixtureFactory separated out from YamlFixture 2012-12-11 17:06:27 +01:00
ZendLog.php MINOR Update @package values to match renaming sapphire 2012-04-15 10:50:19 +12:00