Mateusz Uzdowski 52d297e6ef Merge remote-tracking branch 'origin/3.1' into merge-back ... Conflicts: code/controllers/CMSSiteTreeFilter.php code/controllers/ReportAdmin.php code/reports/Report.php		2014-08-13 17:19:01 +12:00
..
lang	Update translations	2014-08-05 15:01: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	Merge remote-tracking branch 'origin/3.1'	2013-12-19 20:22:26 +01:00
CMSMain.EditForm.js	FIX JS issue when enabling save buttons for when the content has changed. Current implementation triggers a 'Object is not a function' error. New implementation follows the same logic as in the onmatch function, and uses .button() as the function	2014-02-17 14:34:12 +13: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	Calculate where to scroll to based off the position in the div	2013-10-10 15:42:49 +13:00
CMSPageHistoryController.js	Fix typo in ONLYSELECTTWO alert	2014-01-14 13:40:06 +13: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