Damian Mooyman cf4d9edafb Merge remote-tracking branch 'origin/3.1' into 3 ... Conflicts: code/model/SiteConfig.php javascript/CMSMain.AddForm.js tests/model/SiteConfigTest.php tests/model/SiteTreeTest.php		2015-03-31 19:54:43 +13:00
..
lang	Merge pull request #1154 from uniun/missing-translations-entity	2015-03-10 22:50:26 +13: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' into 3	2015-03-31 19:54:43 +13:00
CMSMain.EditForm.js	FIX. Missing translation entity	2015-01-13 12:36:09 +02: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	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