Damian Mooyman afc9bb0dc6 Merge 3.3 into 3.4 ...

# Conflicts:
#	code/controllers/CMSPageHistoryController.php
#	code/controllers/SilverStripeNavigator.php
#	lang/bg.yml
#	lang/cs.yml
#	lang/it.yml
#	lang/sk.yml

2016-08-05 16:46:35 +12:00

..

AssetAdmin.php

FIX Direct edit file by URL

2016-07-29 16:53:31 -07:00

CMSFileAddController.php

FIX Direct edit file by URL

2016-07-29 16:53:31 -07:00

CMSMain.php

Merge branch '3.3' into 3.4

2016-07-12 01:08:54 +01:00

CMSPageAddController.php

Removed dependency for translatable module

2016-03-03 23:11:49 +00:00

CMSPageEditController.php

BUG Fix legacy breadcrumbs appearing on page save

2016-01-20 15:29:51 +13:00

CMSPageHistoryController.php

Merge 3.3 into 3.4

2016-08-05 16:46:35 +12:00

CMSPagesController.php

fixing phpdoc blocks to refering to Objects to built-in types of PHP

2015-09-28 22:31:31 +13:00

CMSPageSettingsController.php

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

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

CMSSettingsController.php

increase CMSSettingsController:url_priority to suppress SiteConfigLeftAndMain

2015-06-22 14:15:49 +02:00

CMSSiteTreeFilter.php

MINOR: Remove training whitespace.

2016-01-07 10:32:05 +13:00

ContentController.php

Merge pull request #1354 from sminnee/remove-trailing-whitespace

2016-01-13 09:30:01 +13:00

ErrorPageControllerExtension.php

MINOR: Remove training whitespace.

2016-01-07 10:32:05 +13:00

LeftAndMainPageIconsExtension.php

MINOR: Remove training whitespace.

2016-01-07 10:32:05 +13:00

ModelAsController.php

UPDATE: make all response code use getResponse() method

2015-09-25 09:10:24 +12:00

NestedController.php

MINOR: Remove training whitespace.

2016-01-07 10:32:05 +13:00

OldPageRedirector.php

FIX OldPageRedirector no longer loops infinitely if 404 thrown on existing page

2016-05-31 15:46:17 +01:00

RootURLController.php

UPDATE: make all response code use getResponse() method

2015-09-25 09:10:24 +12:00

SilverStripeNavigator.php

Merge 3.3 into 3.4

2016-08-05 16:46:35 +12:00