Damian Mooyman 748866ec0f Merge remote-tracking branch 'origin/3.2' into 3 ... Conflicts: code/controllers/CMSMain.php code/model/ErrorPage.php		2015-11-03 13:11:26 +13:00
..
bootstrap	fixing phpdoc blocks to refering to Objects to built-in types of PHP	2015-09-28 22:31:31 +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	Add three column layout to Page content view	2015-07-02 10:23:37 +12:00
insert-an-image.feature	API respect custom attributes on OptionsetField and CheckboxSetField	2015-08-03 16:08:56 +12:00
manage-files.feature	Add three column layout to Page content view	2015-07-02 10:23:37 +12: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