Damian Mooyman 18e368448a Merge remote-tracking branch 'origin/3' ... Conflicts: code/controllers/AssetAdmin.php code/controllers/CMSMain.php code/controllers/CMSSiteTreeFilter.php code/controllers/LeftAndMainPageIconsExtension.php code/controllers/ModelAsController.php code/controllers/SilverStripeNavigator.php code/model/ErrorPage.php code/model/SiteTreeFileExtension.php		2015-11-03 14:23:04 +13:00
..
lang	Update translations	2015-10-06 18:33:16 +13:00
AssetAdmin.DragDrop.js	BUGFIX Adding missing onunmatch in AssetAdmin.DragDrop	2012-05-23 16:09:08 +12:00
AssetAdmin.js	Update asset admin toolbar	2015-10-30 10:05:51 +13:00
CMSMain.AddForm.js	API respect custom attributes on OptionsetField and CheckboxSetField	2015-08-03 16:08:56 +12:00
CMSMain.EditForm.js	Merge remote-tracking branch 'origin/3.2' into 3	2015-11-03 13:11:26 +13:00
CMSMain.js	Add three column layout to Page content view	2015-07-02 10:23:37 +12:00
CMSMain.Tree.js	Update the filtered tree styling	2015-08-25 13:02:20 +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