This repository has been archived by the owner on Apr 3, 2020. It is now read-only.
Fixes #132 Add new permission #147
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Conflicts: app/Database/Models/Post.php app/Database/Models/Topic.php app/Http/Controllers/TopicController.php app/Http/routes.php app/Presenters/Forum.php app/Presenters/Topic.php database/seeds/PermissionsTableSeeder.php resources/views/account/profile.twig resources/views/topic/create.twig resources/views/topic/show.twig
Conflicts: app/Database/Models/AbstractCachingModel.php app/Database/Models/Forum.php app/Database/Models/Post.php app/Database/Models/Role.php app/Database/Models/Topic.php app/Services/Registrar.php composer.json composer.lock
Conflicts: app/Database/Models/Poll.php composer.lock resources/views/polls/show.twig resources/views/topic/polls.twig
|
Note that this is now based on #174 due to the nestedset issue and for some reasons shows the |
|
Conflicts :( |
|
This is still WIP anyways as there are more permissions to include |
|
Ok, thanks.
|
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
#132
Note 1: This is based on #146 so that should be merged first
Note 2: Remember that permissions are cached so every time you change something in the database you need to run
php artisan cache:clear