Skip to content
This repository was archived by the owner on Apr 3, 2020. It is now read-only.

Fixes #132 Add new permission#147

Open
JN-Jones wants to merge 25 commits intomybb:masterfrom
JN-Jones:fix-132-new_permissions
Open

Fixes #132 Add new permission#147
JN-Jones wants to merge 25 commits intomybb:masterfrom
JN-Jones:fix-132-new_permissions

Conversation

@JN-Jones
Copy link
Contributor

#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

JN-Jones added 8 commits May 26, 2015 11:54
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
@JN-Jones
Copy link
Contributor Author

Note that this is now based on #174 due to the nestedset issue and for some reasons shows the .css files as modified too.

@euantorano
Copy link
Member

Conflicts :(

@JN-Jones
Copy link
Contributor Author

This is still WIP anyways as there are more permissions to include

@euantorano
Copy link
Member

Ok, thanks.

On 19 Oct 2015, at 14:44, Jones notifications@github.com wrote:

This is still WIP anyways as there are more permissions to include


Reply to this email directly or view it on GitHub.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants