Damian Mooyman 0abacaead6 Merge remote-tracking branch 'origin/3.1' into 3 ...

Conflicts:
	admin/code/LeftAndMain.php
	forms/EmailField.php
	forms/Form.php
	forms/HeaderField.php
	forms/LiteralField.php
	forms/PasswordField.php
	forms/TextareaField.php
	forms/TreeDropdownField.php
	model/DataObject.php
	tests/forms/uploadfield/UploadFieldTest.php
	tests/model/DataObjectTest.php

2015-06-17 11:24:25 +12:00

..

themes

Add "retina" styles for high-dpi screens

2014-08-27 17:06:57 +01:00

_actionTabs.scss

FIX: Update references to ID values from 79c9433

2013-05-26 11:11:55 +12:00

_CMSSecurity.scss

API Enable re-authentication within the CMS if a user session is lost

2014-10-14 15:19:48 +13:00

_forms.scss

Merge remote-tracking branch 'origin/3.1' into 3

2015-06-17 11:24:25 +12:00

_ieShared.scss

Fix for ie8 styles for preview switch and modes

2012-12-17 23:11:05 +01:00

_menu.scss

Add 'sticky' behaviour to left menu

2015-05-25 12:09:14 +12:00

_mixins.scss

API Full-width HTMLEditorField by default

2013-05-22 16:15:16 +02:00

_ModelAdmin.scss

Side-by-side preview options styling.

2012-12-10 17:52:01 +01:00

_preview.scss

Preview Background styling

2013-06-04 12:57:09 +12:00

_retina.scss

Update 'spinner' to an SilverStripe branded version

2015-01-14 20:29:07 +11:00

_SecurityAdmin.scss

Permission list styling improvements (#8100)

2012-12-13 16:45:32 +01:00

_sprites.scss

Add "retina" styles for high-dpi screens

2014-08-27 17:06:57 +01:00

_style.scss

NEW: Files can be uploaded directly in the 'Insert Link' form

2015-06-03 11:20:29 +12:00

_tree.scss

API Deprecate delete in favour of archive

2015-06-03 14:24:27 +12:00

_typography.scss

ENHANCEMENT Adding missing MemberImportForm to SecurityAdmin, putting each importer into

2012-03-24 13:20:19 +13:00

_uitheme.scss

Merge remote-tracking branch 'origin/3.1' into 3

2015-06-02 19:13:38 +12:00

editor.scss

Render broken link in HtmlEditorField

2013-08-09 11:51:18 +02:00

ie7.scss

BUGFIX: fix for broken layout in insert media dialog - Trac #8232

2013-02-07 21:43:34 +01:00

ie8.scss

API Deprecate delete in favour of archive

2015-06-03 14:24:27 +12:00

screen.scss

Merge remote-tracking branch 'origin/3.1'

2014-11-18 12:45:54 +13:00