Skip to content

Conversation

@marcoambrosini
Copy link
Member

@marcoambrosini marcoambrosini commented Dec 19, 2019

Based on nextcloud/server#18449

Signed-off-by: Marco Ambrosini [email protected]

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.

Tested and works 👍

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.

nextcloud/server#18449 did not make it to beta 3 in server, so blocking merge of this pull request until the tarball of Talk for beta 3 is done.

Further changes are needed too for #2611 (besides just removing the placeholder message for folders).

@nickvergessen
Copy link
Member

Will merging this into master of talk break anything (problem) or will it just always show the tab (wouldnt mind)?

Copy link
Member

@nickvergessen nickvergessen left a comment

Choose a reason for hiding this comment

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

Works

@danxuliu
Copy link
Member

Will merging this into master of talk break anything (problem) or will it just always show the tab (wouldnt mind)?

It will probably break, as the constructor parameters changed (but I have not tested).

@marcoambrosini
Copy link
Member Author

It will probably break, as the constructor parameters changed (but I have not tested).

I have tested with that branch checked out in the server @danxuliu

@danxuliu
Copy link
Member

I have tested with that branch checked out in the server

Yes, what I mean is that it will break without that branch ;-)

@marcoambrosini
Copy link
Member Author

But isn't that in already?

@nickvergessen
Copy link
Member

but it was merged after beta3, so if we want to have somethign working, we have to wait until beta3 compatible package has been built

@nickvergessen nickvergessen mentioned this pull request Dec 20, 2019
4 tasks
marcoambrosini and others added 3 commits January 6, 2020 06:20
Signed-off-by: Marco Ambrosini <[email protected]>
Now the chat tab is not displayed for folders, so the placeholder that
was shown in that case can be removed.

Signed-off-by: Daniel Calviño Sánchez <[email protected]>
@danxuliu danxuliu force-pushed the bugfix/noid/hide-chat-tab-for-folders branch from 0f4d73a to 4bc3b69 Compare January 6, 2020 05:55
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.

Rebased and adjusted to explicitly leave conversations when the chat tab can not be shown.

@marcoambrosini marcoambrosini merged commit 58a905f into master Jan 7, 2020
@marcoambrosini marcoambrosini deleted the bugfix/noid/hide-chat-tab-for-folders branch January 7, 2020 08:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants