Damian Mooyman 795ece3352 Merge 3.1 into 3.2 ...

# Conflicts:
#	javascript/lang/fa_IR.js
#	javascript/lang/ru.js
#	javascript/lang/src/fa_IR.js
#	javascript/lang/src/ru.js
#	lang/fa_IR.yml

2016-08-05 11:37:29 +12:00

..

lang

Merge 3.1 into 3.2

2016-08-05 11:37:29 +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

FIX: Incorrect field IDs breaking SiteTree settings toggles (fixes #1280)

2015-09-23 14:53:07 +01:00

CMSMain.js

API CHANGE Combined "Pages" and "Edit Page" into a single menu entry

2012-04-17 22:59:08 +02:00

CMSMain.Tree.js

BUG Fix SiteTree / SiteConfig permissions

2015-03-19 15:29:38 +13:00

CMSPageHistoryController.js

Fix typo in ONLYSELECTTWO alert

2014-01-14 13:40:06 +13:00

RedirectorPage.js

FIX: RedirectorPage toggles not working (fixes #1328)

2015-11-17 16:22:49 +00: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