Ingo Schommer bcc73de85e Merge branch '106-add-edit-records-rc' ...

Conflicts:
	admin/code/LeftAndMain.php
	admin/css/screen.css
	admin/scss/_style.scss
	admin/templates/Includes/LeftAndMain_EditForm.ss
	css/GridField.css
	filesystem/Folder.php
	forms/gridfield/GridField.php
	forms/gridfield/GridFieldDefaultColumns.php
	forms/gridfield/GridFieldPopupForms.php

2012-02-27 23:58:10 +01:00

..

AssetUploadField.css

MINOR AssetUploadField styling

2012-02-23 18:39:42 +01:00

CheckboxSetField.css

MINOR Using SCSS/Compass for sapphire/css

2012-01-08 19:14:32 +01:00

CodeViewer.css

MINOR Using SCSS/Compass for sapphire/css

2012-01-08 19:14:32 +01:00

ComplexTableField_popup.css

MINOR Using SCSS/Compass for sapphire/css

2012-01-08 19:14:32 +01:00

ComplexTableField.css

MINOR Using SCSS/Compass for sapphire/css

2012-01-08 19:14:32 +01:00

ConfirmedPasswordField.css

MINOR Using SCSS/Compass for sapphire/css

2012-01-08 19:14:32 +01:00

DatetimeField.css

MINOR Using SCSS/Compass for sapphire/css

2012-01-08 19:14:32 +01:00

FileIFrameField.css

MINOR Using SCSS/Compass for sapphire/css

2012-01-08 19:14:32 +01:00

Form.css

MINOR Using SCSS/Compass for sapphire/css

2012-01-08 19:14:32 +01:00

GridField.css

Merge branch '106-add-edit-records-rc'

2012-02-27 23:58:10 +01:00

GridFieldPaginator.css

ENHANCEMENT Release of DataGridPagination

2011-10-28 17:34:15 +13:00

HasManyFileField.css

MINOR Using SCSS/Compass for sapphire/css

2012-01-08 19:14:32 +01:00

Security_login.css

MINOR Using SCSS/Compass for sapphire/css

2012-01-08 19:14:32 +01:00

SelectionGroup.css

MINOR Using SCSS/Compass for sapphire/css

2012-01-08 19:14:32 +01:00

SubmittedFormReportField.css

MINOR Using SCSS/Compass for sapphire/css

2012-01-08 19:14:32 +01:00

TableListField.css

MINOR Using SCSS/Compass for sapphire/css

2012-01-08 19:14:32 +01:00

TestViewer.css

MINOR Using SCSS/Compass for sapphire/css

2012-01-08 19:14:32 +01:00

TreeDropdownField.css

MINOR Using SCSS/Compass for sapphire/css

2012-01-08 19:14:32 +01:00

UnitTesting.css

BUGFIX: Prevented horizontal scrollbar apearing, irresective of screen-res.

2012-01-10 11:07:27 +13:00

UploadField.css

ENHANCEMENT Using native jQuery UI buttons and icon styling for a less coupled implementation (e.g. assuming that a "constructive" button always has a specific icon, or one at all). All CMS UI buttons switched to use <button> markup, which allows for inline icons and correctly aligned multi-line button labels.

2012-02-17 15:58:32 +01:00