silverstripe-framework/model/connect
Damian Mooyman 0b1f297873 Merge remote-tracking branch 'origin/3.1'
Conflicts:
	.travis.yml
	README.md
	admin/code/LeftAndMain.php
	admin/css/screen.css
	admin/scss/screen.scss
	api/RestfulService.php
	conf/ConfigureFromEnv.php
	control/injector/ServiceConfigurationLocator.php
	control/injector/SilverStripeServiceConfigurationLocator.php
	core/ClassInfo.php
	core/Object.php
	css/AssetUploadField.css
	css/ComplexTableField_popup.css
	dev/CSSContentParser.php
	dev/DevelopmentAdmin.php
	docs/en/changelogs/index.md
	docs/en/misc/contributing/code.md
	docs/en/reference/execution-pipeline.md
	filesystem/GD.php
	filesystem/ImagickBackend.php
	filesystem/Upload.php
	forms/Form.php
	forms/FormField.php
	forms/HtmlEditorConfig.php
	forms/gridfield/GridFieldDetailForm.php
	forms/gridfield/GridFieldSortableHeader.php
	lang/en.yml
	model/Aggregate.php
	model/DataList.php
	model/DataObject.php
	model/DataQuery.php
	model/Image.php
	model/MySQLDatabase.php
	model/SQLQuery.php
	model/fieldtypes/HTMLText.php
	model/fieldtypes/Text.php
	scss/AssetUploadField.scss
	search/filters/SearchFilter.php
	security/Authenticator.php
	security/LoginForm.php
	security/Member.php
	security/MemberAuthenticator.php
	security/MemberLoginForm.php
	security/Security.php
	tests/behat/features/bootstrap/SilverStripe/Framework/Test/Behaviour/CmsFormsContext.php
	tests/control/HTTPTest.php
	tests/control/RequestHandlingTest.php
	tests/filesystem/UploadTest.php
	tests/forms/FormTest.php
	tests/forms/NumericFieldTest.php
	tests/model/DataListTest.php
	tests/model/DataObjectTest.php
	tests/model/TextTest.php
	tests/security/MemberAuthenticatorTest.php
	tests/security/SecurityDefaultAdminTest.php
	tests/view/SSViewerCacheBlockTest.php
	tests/view/SSViewerTest.php
2014-11-18 12:45:54 +13:00
..
Database.php API New Database abstraction layer. Ticket #7429 2014-07-09 18:04:05 +12:00
DatabaseException.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
DBConnector.php Merge remote-tracking branch 'origin/3.1' 2014-11-18 12:45:54 +13:00
DBQueryBuilder.php API Allow parameterised joins / subselects 2014-09-16 17:54:30 +12:00
DBSchemaManager.php BUG Revert some changes to ManyManyList 2014-07-23 12:38:41 +12:00
MySQLDatabase.php Removing deprecated class/functions marked for deprecation in 3.0/3.1 2014-08-25 12:06:05 +12:00
MySQLiConnector.php BUG Remove caching of statements due to risk of instability 2014-07-25 14:14:59 +12:00
MySQLQuery.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
MySQLSchemaManager.php Merge remote-tracking branch 'origin/3.1' 2014-11-18 12:45:54 +13:00
PDOConnector.php BUG Fix PDOConnector issues 2014-08-01 18:17:51 +12:00
PDOQuery.php BUG Fix PDOConnector issues 2014-08-01 18:17:51 +12:00
Query.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00