Damian Mooyman cdc0aa8a5b Merge remote-tracking branch 'origin/4.0' into 4 ... # Conflicts: # client/dist/js/bundle.js		2018-01-22 15:16:14 +13:00
..
CMSMain.AddForm.js	BUG Fix allowed children types now load properly	2017-11-20 09:17:22 +13:00
CMSMain.EditForm.js	FIX Add bootstrap styles to url segment field	2018-01-18 12:28:01 +13:00
CMSMain.js	Fix search behaviour	2017-12-13 18:16:34 +13:00
CMSMain.Tree.js	Fix icons in right click menu	2017-08-31 14:42:37 +12:00
CMSPageHistoryController.js	Merge branch '3.6' into 4.0	2018-01-15 15:49:47 +00:00
RedirectorPage.js	Upgrade to webpack2 and cleanup config file (#1833)	2017-05-29 17:24:48 +12:00
SilverStripeNavigator.js	Upgrade to webpack2 and cleanup config file (#1833)	2017-05-29 17:24:48 +12:00
SiteTreeURLSegmentField.js	Upgrade to webpack2 and cleanup config file (#1833)	2017-05-29 17:24:48 +12:00
TinyMCE_sslink-anchor.js	API Implement insert-anchor modal	2017-09-20 13:35:25 +12:00
TinyMCE_sslink-internal.js	Separate logic for whether to show the link text from the renderModal method	2017-10-25 12:11:23 +13:00