silverstripe-framework/dev
Damian Mooyman e6b877df27 Merge remote-tracking branch 'origin/3'
# Conflicts:
#	control/Director.php
#	control/HTTP.php
#	core/startup/ParameterConfirmationToken.php
#	docs/en/00_Getting_Started/01_Installation/05_Common_Problems.md
#	docs/en/00_Getting_Started/04_Directory_Structure.md
#	docs/en/00_Getting_Started/05_Coding_Conventions.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/02_Developer_Guides/12_Search/01_Searchcontext.md
#	docs/en/02_Developer_Guides/13_i18n/index.md
#	docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/06_Javascript_Development.md
#	docs/en/03_Upgrading/index.md
#	docs/en/changelogs/index.md
#	docs/en/howto/customize-cms-menu.md
#	docs/en/howto/navigation-menu.md
#	docs/en/index.md
#	docs/en/installation/index.md
#	docs/en/installation/windows-manual-iis-6.md
#	docs/en/misc/contributing/code.md
#	docs/en/misc/contributing/issues.md
#	docs/en/misc/module-release-process.md
#	docs/en/reference/dataobject.md
#	docs/en/reference/execution-pipeline.md
#	docs/en/reference/grid-field.md
#	docs/en/reference/modeladmin.md
#	docs/en/reference/rssfeed.md
#	docs/en/reference/templates.md
#	docs/en/topics/commandline.md
#	docs/en/topics/debugging.md
#	docs/en/topics/email.md
#	docs/en/topics/forms.md
#	docs/en/topics/index.md
#	docs/en/topics/module-development.md
#	docs/en/topics/modules.md
#	docs/en/topics/page-type-templates.md
#	docs/en/topics/page-types.md
#	docs/en/topics/search.md
#	docs/en/topics/testing/index.md
#	docs/en/topics/testing/testing-guide-troubleshooting.md
#	docs/en/topics/theme-development.md
#	docs/en/tutorials/1-building-a-basic-site.md
#	docs/en/tutorials/2-extending-a-basic-site.md
#	docs/en/tutorials/3-forms.md
#	docs/en/tutorials/4-site-search.md
#	docs/en/tutorials/5-dataobject-relationship-management.md
#	docs/en/tutorials/building-a-basic-site.md
#	docs/en/tutorials/dataobject-relationship-management.md
#	docs/en/tutorials/extending-a-basic-site.md
#	docs/en/tutorials/forms.md
#	docs/en/tutorials/index.md
#	docs/en/tutorials/site-search.md
#	main.php
#	model/SQLQuery.php
#	security/ChangePasswordForm.php
#	security/MemberLoginForm.php
#	tests/control/ControllerTest.php
#	tests/core/startup/ParameterConfirmationTokenTest.php
#	tests/model/SQLQueryTest.php
#	tests/security/SecurityTest.php
#	tests/view/SSViewerTest.php
#	view/SSTemplateParser.php
#	view/SSTemplateParser.php.inc
#	view/SSViewer.php
2016-01-20 13:16:27 +13:00
..
install Merge remote-tracking branch 'origin/3' 2016-01-20 13:16:27 +13:00
phpunit Add missing packages 2015-08-24 16:15:38 +12:00
Backtrace.php API Refactor of File / Folder to use DBFile 2015-10-13 11:57:39 +13: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 Splitting BulkLoader imports to reduce memory consumption 2015-09-15 10:06:06 +12:00
Cli.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
CliDebugView.php NEW: Replace DebugView’s writeX() functions with renderX() functions. 2015-08-28 16:06:37 +12:00
CliTestReporter.php API Asset Access Control implementation 2016-01-13 18:18:22 +13:00
CSSContentParser.php Merge remote-tracking branch 'origin/3.1' 2014-11-18 12:45:54 +13:00
CsvBulkLoader.php Merge remote-tracking branch 'origin/3.2' into 3 2015-11-03 13:06:39 +13:00
CSVParser.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
Debug.php API CHANGE: Shift to Monolog for error reporting and logging 2015-08-28 16:06:41 +12:00
DebugView.php API CHANGE: Shift to Monolog for error reporting and logging 2015-08-28 16:06:41 +12:00
Deprecation.php MINORE: Remove training whitespace. 2016-01-07 10:15:54 +13:00
DevBuildController.php Fixed permission checks for /dev/build action 2016-01-13 14:05:14 +01:00
DevelopmentAdmin.php Fixed permission checks for /dev/build action 2016-01-13 14:05:14 +01:00
FixtureBlueprint.php Merge remote-tracking branch 'origin/3' 2016-01-20 13:16:27 +13:00
FixtureFactory.php MINORE: Remove training whitespace. 2016-01-07 10:15:54 +13:00
FunctionalTest.php Update FunctionalTest.php API notes 2015-03-04 18:38:43 +13: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
MigrationTask.php Unable to migrate down 2015-06-20 00:38:59 +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 MINORE: Remove training whitespace. 2016-01-07 10:15:54 +13:00
SapphireTestReporter.php API Asset Access Control implementation 2016-01-13 18:18:22 +13: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
TaskRunner.php Allow abstract BuildTask subclasses (closes #4538) 2015-08-25 10:14:15 +01:00
TeamCityListener.php Merge remote-tracking branch 'origin/3.1' into 3.2 2015-09-09 14:35:29 +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' 2015-09-09 15:44:47 +12:00
TestSession.php MINORE: Remove training whitespace. 2016-01-07 10:15:54 +13:00
YamlFixture.php MINORE: Remove training whitespace. 2016-01-07 10:15:54 +13:00