Skip to content

Conversation

@backportbot-nextcloud
Copy link

backport of #1682

@backportbot-nextcloud backportbot-nextcloud bot added bug feature: chat 💬 Chat and system messages feature: talk-sidebar ⬅️ Sidebar integration of Talk into other apps like sharing and documents labels Apr 9, 2019
@backportbot-nextcloud backportbot-nextcloud bot added this to the 💜 Next Minor (15) milestone Apr 9, 2019
Copy link
Member

@danxuliu danxuliu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The backported tests fail because @all was not implemented in Talk 5; I will fix those tests.

danxuliu added 2 commits April 9, 2019 10:30
In regular rooms only the current participants are candidates in
mentions, but in file rooms the candidates are all the users with access
to the file, even if they are not currently participants of the room.
However, as the users with access to the file are a superset of the
current participants those participants were returned twice. Therefore,
now candidates for mentions in file rooms are got only from the users
with access to the file instead of in addition to the current
participants.

Signed-off-by: Daniel Calviño Sánchez <[email protected]>
@danxuliu danxuliu force-pushed the backport/1682/stable15 branch from 58b512b to c68ab9a Compare April 9, 2019 08:31
Copy link
Member

@danxuliu danxuliu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Backported tests fixed; failing tests are not related to the backported ones.

@nickvergessen nickvergessen merged commit 1925c41 into stable15 Apr 9, 2019
@nickvergessen nickvergessen deleted the backport/1682/stable15 branch April 9, 2019 11:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug feature: chat 💬 Chat and system messages feature: talk-sidebar ⬅️ Sidebar integration of Talk into other apps like sharing and documents

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants