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
..
bootstrap	MINOR: Remove training whitespace.	2016-01-07 10:32:05 +13:00
apply-formatting.feature	Migrated behat features from framework	2013-10-08 00:23:44 +02:00
create-a-page.feature	BUG Behat now uses explicit radio button behaviour	2014-05-05 12:46:57 +12:00
edit-a-page.feature	More specific behat tree assertions	2013-09-14 00:21:29 +02:00
insert-a-link.feature	Merge remote-tracking branch 'origin/3'	2016-01-20 13:16:43 +13:00
insert-an-image.feature	Update asset admin toolbar	2015-10-30 10:05:51 +13:00
manage-files.feature	API Remove filesystem sync	2015-10-19 13:42:39 +13:00
manage-page-permissions.feature	BUG Fix deleted pages redirecting the CMS	2014-06-17 10:36:08 +12:00
preview-a-page.feature	More specific behat tree assertions	2013-09-14 00:21:29 +02:00
publish-a-page.feature	API Deprecate delete in favour of archive	2015-06-03 14:46:16 +12:00
search-for-a-page.feature	Add three column layout to Page content view	2015-07-02 10:23:37 +12:00
view-reports.feature	Fixed report link escaping	2013-10-02 12:19:23 +02:00