Skip to content
Snippets Groups Projects
Commit 67aa7c32 authored by str4d's avatar str4d
Browse files

Merge branch '461-forum-invitation-can-not-be-accepted-if-forum-already-added' into 'master'

Show all Forum Invitations, not only the first one to prevent cut-offs and forks

This MR solves the problems outlined in #461 by always showing forum invitations, even if the user already subscribed to the forum.

Available Forums have been renamed to Forum Invitations in the UI:

![device-2016-07-07-144141](/uploads/9c8d06decdd19117250e3faca0c38192/device-2016-07-07-144141.png)
![device-2016-07-07-144150](/uploads/9803f567c962a721b24d79359974a29f/device-2016-07-07-144150.png)

Closes #461

See merge request !241
parents 89469f9d 85f96d88
No related branches found
No related tags found
No related merge requests found
Showing
with 286 additions and 132 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment