Merge branch '4' into 5.0

composer.json

@@ -7,7 +7,10 @@
     "keywords": [
         "silverstripe",
         "cms",
-        "workflow"
+        "workflow",
+        "content review",
+        "review",
+        "permissions"
     ],
     "authors": [
         {

lang/en.yml

@@ -15,6 +15,12 @@ en:
     PAGEOWNERUSERS: Users
     REVIEWFREQUENCY: 'Review frequency'
     REVIEWFREQUENCYDESCRIPTION: 'The review date will be set to this far in the future, whenever the page is published.'
+    db_ReviewBody: 'Review body'
+    db_ReviewFrom: 'Review from'
+    db_ReviewPeriodDays: 'Review period days'
+    db_ReviewSubject: 'Review subject'
+    many_many_ContentReviewGroups: 'Content review groups'
+    many_many_ContentReviewUsers: 'Content review users'
   SilverStripe\ContentReview\Extensions\SiteTreeContentReview:
     ADDGROUP: 'Add groups'
     ADDUSERS: 'Add users'
@@ -34,6 +40,14 @@ en:
     REVIEWFREQUENCYDESCRIPTION: 'The review date will be set to this far in the future whenever the page is published'
     REVIEWHEADER: 'Content review'
     SETTINGSFROM: 'Options are'
+    belongs_many_many_ContentReviewGroups: 'Content review groups'
+    belongs_many_many_ContentReviewUsers: 'Content review users'
+    db_ContentReviewType: 'Content review type'
+    db_LastEditedByName: 'Last edited by name'
+    db_NextReviewDate: 'Next review date'
+    db_OwnerNames: 'Owner names'
+    db_ReviewPeriodDays: 'Review period days'
+    has_many_ReviewLogs: 'Review logs'
   SilverStripe\ContentReview\Forms\ReviewContentHandler:
     ErrorReviewPermissionDenied: 'It seems you don''t have the necessary permissions to submit a content review'
     MarkAsReviewedAction: 'Mark as reviewed'
@@ -46,6 +60,9 @@ en:
       one: 'A Content Review Log'
       other: '{count} Content Review Logs'
     SINGULARNAME: 'Content Review Log'
+    db_Note: Note
+    has_one_Reviewer: Reviewer
+    has_one_SiteTree: 'Site tree'
   SilverStripe\ContentReview\Reports\PagesDueForReviewReport:
     ONLYMYPAGES: 'Only Show pages assigned to me'
     REVIEWDATEAFTER: 'Review date after or on'
@@ -57,3 +74,5 @@ en:
   SilverStripe\ContentReview\Tasks\ContentReviewEmails:
     REVIEWPAGELINK: 'Review the page in the CMS'
     VIEWPUBLISHEDLINK: 'View this page on the website'
+  SilverStripe\ContentReview\Extensions\ContentReviewOwner:
+    many_many_SiteTreeContentReview: 'Site tree content review'