silverstripe-framework/dev
Damian Mooyman 88fdc75456 Merge remote-tracking branch 'composer/3.1' into 3
Conflicts:
	.editorconfig
	docs/en/00_Getting_Started/00_Server_Requirements.md
	docs/en/00_Getting_Started/01_Installation/04_Other_installation_Options/Windows_IIS7.md
	docs/en/00_Getting_Started/01_Installation/04_Other_installation_Options/Windows_Platform_Installer.md
	docs/en/00_Getting_Started/04_Directory_Structure.md
	docs/en/00_Getting_Started/index.md
	docs/en/01_Tutorials/01_Building_A_Basic_Site.md
	docs/en/01_Tutorials/02_Extending_A_Basic_Site.md
	docs/en/01_Tutorials/03_Forms.md
	docs/en/01_Tutorials/04_Site_Search.md
	docs/en/01_Tutorials/05_Dataobject_Relationship_Management.md
	docs/en/01_Tutorials/index.md
	docs/en/02_Developer_Guides/00_Model/01_Data_Model_and_ORM.md
	docs/en/02_Developer_Guides/00_Model/11_Scaffolding.md
	docs/en/02_Developer_Guides/01_Templates/06_Themes.md
	docs/en/02_Developer_Guides/03_Forms/How_Tos/Simple_Contact_Form.md
	docs/en/02_Developer_Guides/05_Extending/05_Injector.md
	docs/en/02_Developer_Guides/09_Security/04_Secure_Coding.md
	docs/en/02_Developer_Guides/10_Email/index.md
	docs/en/02_Developer_Guides/11_Integration/01_RestfulService.md
	docs/en/02_Developer_Guides/12_Search/01_Searchcontext.md
	docs/en/02_Developer_Guides/14_Files/index.md
	docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/03_CMS_Layout.md
	docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/06_Javascript_Development.md
	docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Customise_CMS_Tree.md
	docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Customise_Site_Reports.md
	docs/en/02_Developer_Guides/18_Cookies_And_Sessions/01_Cookies.md
	docs/en/04_Changelogs/3.1.9.md
	docs/en/05_Contributing/00_Issues_and_Bugs.md
	docs/en/05_Contributing/02_Release_Process.md
	docs/en/05_Contributing/03_Documentation.md
	filesystem/File.php
	filesystem/GD.php
	model/DataDifferencer.php
	model/Versioned.php
	security/BasicAuth.php
	security/Member.php
	tests/filesystem/FileTest.php
	tests/forms/uploadfield/UploadFieldTest.php
	tests/model/VersionedTest.php
	tests/security/BasicAuthTest.php
2015-01-15 18:52:46 +13:00
..
install Merge remote-tracking branch 'composer/3.1' into 3 2015-01-15 18:52:46 +13:00
phpunit Merge remote-tracking branch 'origin/3.1' 2014-11-18 12:45:54 +13:00
Backtrace.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
BehatFixtureFactory.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
BuildTask.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
BulkLoader.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
Cli.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
CliDebugView.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
CliTestReporter.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
CSSContentParser.php Merge remote-tracking branch 'origin/3.1' 2014-11-18 12:45:54 +13:00
CsvBulkLoader.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
CSVParser.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
Debug.php Merge remote-tracking branch 'origin/3.1' 2014-11-18 12:45:54 +13:00
DebugView.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
Deprecation.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
DevBuildController.php ENH making /dev extendable 2014-08-06 16:29:52 +12:00
DevelopmentAdmin.php Merge remote-tracking branch 'origin/3.1' 2014-11-18 12:45:54 +13:00
FixtureBlueprint.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
FixtureFactory.php Removing @deprecated 3.1 functionality and classes. 2014-08-18 16:00:13 +12:00
FunctionalTest.php BUG Fixing Director::test() failing on BASE_URL prefixed URLs 2014-08-22 15:21:53 +12:00
InstallerTest.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
JSTestRunner.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
Log.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
LogEmailWriter.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
LogErrorEmailFormatter.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
LogErrorFileFormatter.php Adding defaults for unhandled event priorities in log formatters. 2014-02-24 15:41:03 +13:00
LogFileWriter.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
MigrationTask.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
SapphireInfo.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
SapphireREPL.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
SapphireTest.php Removing @deprecated 3.1 functionality and classes. 2014-08-18 16:00:13 +12:00
SapphireTestReporter.php Merge remote-tracking branch 'origin/3.0' into 3.1 2014-08-22 17:50:36 +12:00
SapphireTestSuite.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
SilverStripeListener.php Support PHPUnit 3.8+ compatibility 2014-08-22 13:43:23 +12:00
SysLogWriter.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
TaskRunner.php Merge remote-tracking branch 'origin/3.1' 2014-11-18 12:45:54 +13:00
TeamCityListener.php Support PHPUnit 3.8+ compatibility 2014-08-22 13:43:23 +12:00
TestListener.php Merge remote-tracking branch 'origin/3.0' into 3.1 2014-08-22 17:50:36 +12:00
TestMailer.php Remove all redundant whitespace 2014-08-19 09:17:15 +12: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.1' 2014-11-18 12:45:54 +13:00
TestSession.php Suggested improvements / test case fixes 2014-10-10 09:28:11 +13:00
YamlFixture.php Removing @deprecated 3.1 functionality and classes. 2014-08-18 16:00:13 +12:00
ZendLog.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00