Daniel Hensby 39ee2ec634 Merge branch '3.2' into 3 ...

Conflicts:
	lang/en.yml

2015-08-17 14:23:16 +01:00

..

lang

Update localisation

2015-08-04 13:02:52 +12:00

AssetAdmin.DragDrop.js

BUGFIX Adding missing onunmatch in AssetAdmin.DragDrop

2012-05-23 16:09:08 +12:00

AssetAdmin.js

FIX: Prevent AssetAdmin duplicate confirmation for file deletion (fixes silverstripe/silverstripe-framework#2639)

2013-12-17 09:54:14 +00:00

CMSMain.AddForm.js

API respect custom attributes on OptionsetField and CheckboxSetField

2015-08-03 16:08:56 +12:00

CMSMain.EditForm.js

Merge branch 'pulls/localized-urlsegment-creation' of https://github.com/chillu/silverstripe-cms into chillu-pulls/localized-urlsegment-creation

2015-06-13 15:23:22 +01:00

CMSMain.js

Add three column layout to Page content view

2015-07-02 10:23:37 +12:00

CMSMain.Tree.js

Add three column layout to Page content view

2015-07-02 10:23:37 +12:00

CMSPageHistoryController.js

Move filters from panel to header

2015-06-24 09:58:48 +12:00

RedirectorPage.js

BUGFIX: add missing onunmatches causing exceptions in entwine

2012-05-18 14:33:17 +12:00

SilverStripeNavigator.js

NEW Side by side editing functionality - first cut (os#7412)

2012-12-10 18:09:54 +01:00

SiteTreeURLSegmentField.js

Better error message when attempting to enter a blank URL Segment (fixes silverstripe/silverstripe-cms#1570)

2013-04-05 14:06:32 +01:00