silverstripe-framework/scss
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
..
_elementMixins.scss NEW UploadField displays a warning before overwriting files (only relevant if config.yml: Upload:replaceFile = true). 2013-05-25 19:07:06 +12:00
AssetUploadField.scss Merge remote-tracking branch 'origin/3.1' 2014-11-18 12:45:54 +13:00
CheckboxSetField.scss MINOR Using SCSS/Compass for sapphire/css 2012-01-08 19:14:32 +01:00
ConfirmedPasswordField.scss MINOR Using SCSS/Compass for sapphire/css 2012-01-08 19:14:32 +01:00
DatetimeField.scss FIX: Minor CSS issues on DatetimeField 2013-05-20 09:59:53 +01:00
debug.scss FIX Make sure that debug always shows up first 2013-08-24 12:14:11 +02:00
Form.scss Form.scss reformatting (no functional changes) 2013-06-15 11:24:22 +02:00
GridField_print.scss ENHACEMENT: SSF-168 updated the font for titles on print stylesheets 2012-04-04 14:27:50 +12:00
GridField.scss GridField 'Add existing' action styling improvements 2013-10-22 16:44:28 +01:00
GridFieldPaginator.scss ENHANCEMENT Release of DataGridPagination 2011-10-28 17:34:15 +13:00
Security_login.scss MINOR Using SCSS/Compass for sapphire/css 2012-01-08 19:14:32 +01:00
SelectionGroup.scss Polish add page screen. Disable styles and fix SelectionField 2013-04-08 19:54:46 +12:00
SubmittedFormReportField.scss MINOR Using SCSS/Compass for sapphire/css 2012-01-08 19:14:32 +01:00
TreeDropdownField.scss API: Treedropdownfield showsearch default true, provide better ui 2013-08-29 16:21:04 +12:00
UnitTesting.scss MINOR Using SCSS/Compass for sapphire/css 2012-01-08 19:14:32 +01:00
UploadField.scss Add "retina" styles for high-dpi screens 2014-08-27 17:06:57 +01:00