Damian Mooyman 7dfe145412 Merge remote-tracking branch 'origin/3' ... # Conflicts: # code/controllers/CMSFileAddController.php # code/controllers/CMSPageAddController.php # code/controllers/CMSPageHistoryController.php # code/controllers/CMSSiteTreeFilter.php # code/controllers/ContentController.php # code/controllers/LeftAndMainPageIconsExtension.php # code/controllers/SilverStripeNavigator.php # code/model/SiteTreeFileExtension.php # code/model/VirtualPage.php # composer.json # tests/model/ErrorPageTest.yml # tests/model/FileLinkTrackingTest.yml # tests/model/VirtualPageTest.yml		2016-01-20 13:16:43 +13:00
..
lang	Merge remote-tracking branch 'origin/3.3' into 3	2016-01-19 17:10:41 +13:00
AssetAdmin.DragDrop.js	MINOR: Remove training whitespace.	2016-01-07 10:32:05 +13:00
AssetAdmin.js	Merge remote-tracking branch 'origin/3'	2016-01-20 13:16:43 +13:00
CMSMain.AddForm.js	MINOR: Remove training whitespace.	2016-01-07 10:32:05 +13:00
CMSMain.EditForm.js	MINOR: Remove training whitespace.	2016-01-07 10:32:05 +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	MINOR: Remove training whitespace.	2016-01-07 10:32:05 +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	MINOR: Remove training whitespace.	2016-01-07 10:32:05 +13:00