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

..

themes/controllertest

BUG Fix ContentControllerTest

2014-03-25 17:14:05 +13:00

AssetAdminTest.php

BUG Fix search range for asset filter

2014-08-06 13:26:23 +12:00

AssetAdminTest.yml

BUG Fix search range for asset filter

2014-08-06 13:26:23 +12:00

CMSBatchActionsTest.php

API batch restore action

2015-08-03 20:57:30 +12:00

CMSBatchActionsTest.yml

API batch restore action

2015-08-03 20:57:30 +12:00

CMSMainTest.php

Merge remote-tracking branch 'origin/3.2' into 3

2015-11-03 13:11:26 +13:00

CMSMainTest.yml

MINOR Moved files into a more logical structure in cms/code

2011-03-30 20:03:44 +13:00

CMSPageHistoryControllerTest.php

Page history panel: show appropriate message when viewing latest version

2013-05-07 17:14:28 +12:00

CMSPageHistoryControllerTest.yml

ENHANCEMENT: added tests for CMSPageHistoryController::VersionsForm(). BUGFIX: fixed VersionsForm hidden ID storing a reference to itself. ENHANCEMENT: changed url structure from /version/ to /show/ for consistency between CMSPageHistoryController and CMSMain. APICHANGE: moved performRollback() from CMSMain to CMSPageHistoryController

2011-09-19 17:30:47 +02:00

CMSSiteTreeFilterTest.php

Merge remote-tracking branch 'origin/3.1' into merge-back

2014-08-13 17:19:01 +12:00

CMSSiteTreeFilterTest.yml

NEW Fixes #966. Ability to filter pages on page status.

2014-04-28 14:50:07 +12:00

ContentControllerPermissionsTest.php

FIX Not checking stage in SiteTree#canView

2013-07-05 12:14:22 +12:00

ContentControllerSearchExtensionTest.php

ContentControllerSearchExtensionTest doesn't clean up after itself.

2013-10-22 15:26:40 +13:00

ContentControllerTest.php

FIX: ContentController::getViewer() not returning all found templates (fixes #1244)

2015-07-24 11:50:09 +01:00

ContentControllerTest.yml

MINOR Removing executable flag from all files (thanks miiihi)

2011-09-18 22:04:42 +02:00

ModelAsControllerTest.php

Merge remote-tracking branch 'origin/3.1' into 3.2

2015-09-09 14:09:00 +12:00

ModelAsControllerTest.yml

MINOR Moved files into a more logical structure in cms/code

2011-03-30 20:03:44 +13:00

RootURLControllerTest.php

API Marked statics private, use Config API instead (#8317)

2013-03-24 17:21:04 +01:00

RootURLControllerTest.yml

MINOR Removing executable flag from all files (thanks miiihi)

2011-09-18 22:04:42 +02:00

SilverStripeNavigatorTest.php

API Marked statics private, use Config API instead (#8317)

2013-03-24 17:21:04 +01:00