Damian Mooyman b291306c03

Merge remote-tracking branch 'origin/4.1' into 4 ...

# Conflicts:
#	client/dist/js/bundle.js

2018-02-15 09:24:08 +13:00

..

CMSMain.php

Merge pull request #2093 from open-sausages/pulls/4.1/mind-if-i-button

2018-02-12 10:47:14 +13:00

CMSPageAddController.php

Update usages of ClassInfo

2017-09-20 15:20:17 +12:00

CMSPageEditController.php

API Implement insert-anchor modal

2017-09-20 13:35:25 +12:00

CMSPageHistoryController.php

NEW Convert page history notice to use Bootstrap 4 info alert

2018-02-07 16:47:24 +13:00

CMSPagesController.php

Auto-convert to psr2

2017-01-31 13:59:35 +13:00

CMSPageSettingsController.php

BUG Fix inconsistent breadcrumbs in CMS section

2017-08-28 13:03:56 +12:00

CMSSiteTreeFilter_ChangedPages.php

Update usages of ClassInfo

2017-09-20 15:20:17 +12:00

CMSSiteTreeFilter_DeletedPages.php

Update usages of ClassInfo

2017-09-20 15:20:17 +12:00

CMSSiteTreeFilter_PublishedPages.php

Update usages of ClassInfo

2017-09-20 15:20:17 +12:00

CMSSiteTreeFilter_Search.php

Update usages of ClassInfo

2017-09-20 15:20:17 +12:00

CMSSiteTreeFilter_StatusDeletedPages.php

Update usages of ClassInfo

2017-09-20 15:20:17 +12:00

CMSSiteTreeFilter_StatusDraftPages.php

Update usages of ClassInfo

2017-09-20 15:20:17 +12:00

CMSSiteTreeFilter_StatusRemovedFromDraftPages.php

Update usages of ClassInfo

2017-09-20 15:20:17 +12:00

CMSSiteTreeFilter.php

Update usages of ClassInfo

2017-09-20 15:20:17 +12:00

ContentController.php

Fix successfullyinstalled() (#2069)

2018-01-12 14:39:27 +13:00

LeftAndMainPageIconsExtension.php

Issue-2034: Fix for Page icons using data urls

2017-11-23 15:42:31 +00:00

ModelAsController.php

Update usages of ClassInfo

2017-09-20 15:20:17 +12:00

OldPageRedirector.php

Auto-convert to psr2

2017-01-31 13:59:35 +13:00

RootURLController.php

App object refactor

2017-06-20 17:12:18 +12:00

SilverStripeNavigator.php

Update usages of ClassInfo

2017-09-20 15:20:17 +12:00

SilverStripeNavigatorItem_ArchiveLink.php

Merge branch '3' into 4

2017-07-25 14:54:33 +01:00

SilverStripeNavigatorItem_CMSLink.php

Ran upgrader for lang files

2017-04-27 11:43:04 +12:00

SilverStripeNavigatorItem_LiveLink.php

Merge branch '3' into 4

2017-07-25 14:54:33 +01:00

SilverStripeNavigatorItem_StageLink.php

New namespaced i18n keys

2017-04-27 11:43:04 +12:00

SilverStripeNavigatorItem.php

Replace use of Configurable stat() with config()->get(), will be deprecated in future

2017-08-23 09:46:46 +12:00