Merge branch 'master' of github.com:flarum/flarum-ext-approval

extensions/approval/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014-2016 Toby Zerner
+Copyright (c) 2014-2017 Toby Zerner
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

extensions/approval/composer.json

@@ -15,7 +15,7 @@
         "source": "https://github.com/flarum/flarum-ext-approval"
     },
     "require": {
-        "flarum/core": "^0.1.0-beta.6",
+        "flarum/core": "^0.1.0-beta.7",
         "flarum/flarum-ext-flags": "^0.1.0-beta.6"
     },
     "autoload": {

extensions/approval/migrations/2015_09_21_011527_add_is_approved_to_discussions.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * This file is part of Flarum.
  *

extensions/approval/migrations/2015_09_21_011706_add_is_approved_to_posts.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * This file is part of Flarum.
  *

extensions/approval/migrations/2017_07_22_000000_add_default_permissions.php

@@ -0,0 +1,19 @@
+<?php
+
+/*
+ * This file is part of Flarum.
+ *
+ * (c) Toby Zerner <toby.zerner@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use Flarum\Core\Group;
+use Flarum\Database\Migration;
+
+return Migration::addPermissions([
+    'discussion.startWithoutApproval' => Group::MEMBER_ID,
+    'discussion.replyWithoutApproval' => Group::MEMBER_ID,
+    'discussion.approvePosts' => Group::MODERATOR_ID
+]);

extensions/approval/src/Access/TagPolicy.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * This file is part of Flarum.
  *

extensions/approval/src/Event/PostWasApproved.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * This file is part of Flarum.
  *

extensions/approval/src/Listener/AddClientAssets.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * This file is part of Flarum.
  *

extensions/approval/src/Listener/AddPostApprovalAttributes.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * This file is part of Flarum.
  *

extensions/approval/src/Listener/ApproveContent.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * This file is part of Flarum.
  *

extensions/approval/src/Listener/HideUnapprovedContent.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * This file is part of Flarum.
  *

extensions/approval/src/Listener/UnapproveNewContent.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * This file is part of Flarum.
  *