diff --git a/changelog.md b/changelog.md index b5ecba9..d4acecf 100644 --- a/changelog.md +++ b/changelog.md @@ -4,6 +4,16 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). +## [3.0.0] + +- Replace review page form with inline form +- Update translations +- Convert to psr-2 +- Change "mark as reviewed" page action panel styles +- Add report filter for only the pages a user is assigned to +- BUG Show inherited date even when inheriting settings +- API CMS Editable notification templates + ## [2.1.0] - Added translations @@ -12,4 +22,4 @@ This project adheres to [Semantic Versioning](http://semver.org/). ## [2.0.0] -Changelog added. +Changelog added. \ No newline at end of file diff --git a/composer.json b/composer.json index 0c9f25c..46ea759 100644 --- a/composer.json +++ b/composer.json @@ -22,5 +22,10 @@ }, "suggests": { "silverstripe/queuedjobs": "Automatically schedules content review emails to be sent, only requiring one crontask to be created" - } + }, + "extra": { + "branch-alias": { + "dev-master": "3.0.x-dev" + } + } }