Damian Mooyman d7d6fd8758 Merge 3 into master ...

# Conflicts:
#	code/controllers/CMSPageAddController.php
#	code/model/ErrorPage.php
#	composer.json
#	css/screen.css
#	tests/behat/features/insert-a-link.feature

2016-04-29 14:34:29 +12:00

..

ErrorPageFileExtensionTest.php

API Support renamed Versioned API

2016-04-01 16:17:47 +13:00

ErrorPageTest.php

API Support renamed Versioned API

2016-04-01 16:17:47 +13:00

ErrorPageTest.yml

API Support versioned File management

2016-02-22 12:25:25 +13:00

FileLinkTrackingTest.php

API Support renamed Versioned API

2016-04-01 16:17:47 +13:00

FileLinkTrackingTest.yml

API Update link tracking for image shortcodes

2016-03-21 09:08:31 +13:00

RedirectorPageTest.php

Cleanup trailing whitespace

2016-03-09 10:28:45 +13:00

RedirectorPageTest.yml

MINOR: Remove training whitespace.

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

SiteTreeActionsTest.php

API Support renamed Versioned API

2016-04-01 16:17:47 +13:00

SiteTreeActionsTest.yml

MINOR: Remove training whitespace.

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

SiteTreeBacklinksTest.php

API Support renamed Versioned API

2016-04-01 16:17:47 +13:00

SiteTreeBacklinksTest.yml

MINOR: Remove training whitespace.

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

SiteTreeBrokenLinksTest.php

API Support renamed Versioned API

2016-04-01 16:17:47 +13:00

SiteTreeBrokenLinksTest.yml

API Support versioned File management

2016-02-22 12:25:25 +13:00

SiteTreeHTMLEditorFieldTest.php

API Update link tracking for image shortcodes

2016-03-21 09:08:31 +13:00

SiteTreeHtmlEditorFieldTest.yml

API Remove filesystem sync

2015-10-19 13:42:39 +13:00

SiteTreeLinkTrackingTest.php

Merge 3 into master

2016-04-29 14:34:29 +12:00

SiteTreePermissionsTest.php

API Support renamed Versioned API

2016-04-01 16:17:47 +13:00

SiteTreePermissionsTest.yml

MINOR: Remove training whitespace.

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

SiteTreeTest.php

API Support renamed Versioned API

2016-04-01 16:17:47 +13:00

SiteTreeTest.yml

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

2015-03-31 19:54:43 +13:00

VirtualPageTest.php

API Support renamed Versioned API

2016-04-01 16:17:47 +13:00

VirtualPageTest.yml

API VirtualPage permissions now can be set independently of the mirrored page

2016-01-27 10:01:14 +13:00