1
0
mirror of https://github.com/flarum/core.git synced 2025-07-30 13:10:24 +02:00

Merge branch 'master' into 1236-database-changes

# Conflicts:
#	src/Forum/Controller/IndexController.php
#	src/User/UserMetadataUpdater.php
This commit is contained in:
Toby Zerner
2018-07-21 21:37:49 +09:30
101 changed files with 3073 additions and 2272 deletions

View File

@@ -0,0 +1,30 @@
<?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\Database\Migration;
use Flarum\Group\Group;
return Migration::addPermissions([
// Guests can view the forum
'viewDiscussions' => Group::GUEST_ID,
// Members can create and reply to discussions, and view the user list
'startDiscussion' => Group::MEMBER_ID,
'discussion.reply' => Group::MEMBER_ID,
'viewUserList' => Group::MEMBER_ID,
// Moderators can edit + delete stuff
'discussion.hide' => Group::MODERATOR_ID,
'discussion.editPosts' => Group::MODERATOR_ID,
'discussion.hidePosts' => Group::MODERATOR_ID,
'discussion.rename' => Group::MODERATOR_ID,
'discussion.viewIpsPosts' => Group::MODERATOR_ID,
]);

View File

@@ -0,0 +1,17 @@
<?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\Database\Migration;
use Flarum\Group\Group;
return Migration::addPermissions([
'discussion.hidePosts' => Group::MODERATOR_ID
]);