silverstripe-framework/templates/Includes
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
..
Form.ss Updated loop/if/with to be more consistent 2013-07-14 20:43:52 +12:00
GridField_FormAction.ss Updated loop/if/with to be more consistent 2013-07-14 20:43:52 +12:00
GridField_Item.ss Updated loop/if/with to be more consistent 2013-07-14 20:43:52 +12:00
GridField_print.ss Updated loop/if/with to be more consistent 2013-07-14 20:43:52 +12:00
GridFieldAddExistingAutocompleter.ss Updated loop/if/with to be more consistent 2013-07-14 20:43:52 +12:00
GridFieldAddNewButton.ss ENHANCEMENT: Make GridFieldAddNewButton Content more specific 2012-05-21 17:47:14 +12:00
GridFieldButtonRow.ss FIX: GridField button styling 2013-06-21 14:22:00 +01:00
GridFieldEditButton.ss Translations: Switch to Transifex format 2013-08-07 00:25:16 +02:00
GridFieldFilterHeader_Row.ss Updated loop/if/with to be more consistent 2013-07-14 20:43:52 +12:00
GridFieldFooter.ss NEW: Make the record count in GridFieldFooter optional 2014-11-14 09:56:39 +13:00
GridFieldItemEditView.ss Translations: Switch to Transifex format 2013-08-07 00:25:16 +02:00
GridFieldLevelup.ss FEATURE: add Levelup component to GridField as GridFieldLevelup 2012-05-07 13:40:53 +12:00
GridFieldPageCount.ss Translations: Switch to Transifex format 2013-08-07 00:25:16 +02:00
GridFieldPaginator_Row.ss Translations: Switch to Transifex format 2013-08-07 00:25:16 +02:00
GridFieldSortableHeader_Row.ss Updated loop/if/with to be more consistent 2013-07-14 20:43:52 +12:00
GridFieldToolbarHeader.ss Updated loop/if/with to be more consistent 2013-07-14 20:43:52 +12:00
GridFieldViewButton.ss FEATURE: Implemented a view action for GridField, and a record viewing GridFieldConfig. 2012-05-12 18:49:56 +10:00
HtmlEditorField_viewfile.ss FIX: Defer loading of UploadField EditForm iframes (fixes #2711) 2013-12-19 09:11:31 +00:00
LeftAndMain_ViewModeSelector.ss Disable change tracking for preview state switch 2012-12-10 17:52:02 +01:00
Security_MultiAuthenticatorLogin.ss AJAX friendly responses for Security class 2013-04-26 12:29:35 +01:00
UploadField_FileButtons.ss Updated loop/if/with to be more consistent 2013-07-14 20:43:52 +12:00