Sam Minnee 878b348a0f Merge branch 'master' into new-orm ...

Conflicts:
	docs/en/reference/built-in-page-controls.md
	model/SQLQuery.php

2011-05-26 17:08:10 +12:00

..

CMSBatchAction.php

Merge branch 'master' into new-orm

2011-05-26 17:08:10 +12:00

CMSBatchActionHandler.php

Merge branch 'master' into new-orm

2011-05-26 17:08:10 +12:00

CMSMenu.php

MINOR: css styles and formatting for left hand side menu bar. Altered the stylesheet structure to allow future admin scss theme files to be included easier

2011-05-20 11:29:40 +12:00

CMSMenuItem.php

MINOR: css styles and formatting for left hand side menu bar. Altered the stylesheet structure to allow future admin scss theme files to be included easier

2011-05-20 11:29:40 +12:00

GroupImportForm.php

Merge branch 'master' into new-orm

2011-05-26 17:08:10 +12:00

LeftAndMain.php

Merge branch 'master' into new-orm

2011-05-26 17:08:10 +12:00

LeftAndMainDecorator.php

MINOR: css styles and formatting for left hand side menu bar. Altered the stylesheet structure to allow future admin scss theme files to be included easier

2011-05-20 11:29:40 +12:00

LeftAndMainExtension.php

MINOR: css styles and formatting for left hand side menu bar. Altered the stylesheet structure to allow future admin scss theme files to be included easier

2011-05-20 11:29:40 +12:00

MemberImportForm.php

Merge branch 'master' into new-orm

2011-05-26 17:08:10 +12:00

MemberTableField.php

API CHANGE: Deprecated CompositeField->FieldSet() in favour of CompositeField->FieldList().

2011-05-11 17:51:54 +10:00

ModelAdmin.php

API CHANGE: Deprecated CompositeField->FieldSet() in favour of CompositeField->FieldList().

2011-05-11 17:51:54 +10:00

SecurityAdmin.php

Merge branch 'master' into new-orm

2011-05-26 17:08:10 +12:00