Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Hide chat tab for folders #2605

Merged
merged 3 commits into from
Jan 7, 2020
Merged

Hide chat tab for folders #2605

merged 3 commits into from
Jan 7, 2020

Conversation

marcoambrosini
Copy link
Member

@marcoambrosini marcoambrosini commented Dec 19, 2019 •
edited
Loading

Based on nextcloud/server#18449

Signed-off-by: Marco Ambrosini marcoambrosini@pm.me

@marcoambrosini marcoambrosini added this to the 💚 Next Major (18) milestone Dec 19, 2019
@marcoambrosini marcoambrosini self-assigned this Dec 19, 2019
danxuliu
danxuliu approved these changes Dec 19, 2019
View reviewed changes
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 👍

danxuliu
danxuliu requested changes Dec 19, 2019
View reviewed changes
Copy link
Member

@danxuliu danxuliu left a comment •
edited
Loading

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).

@danxuliu danxuliu mentioned this pull request Dec 20, 2019
Merged
@nickvergessen
Copy link
Member

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

nickvergessen
nickvergessen approved these changes Dec 20, 2019
View reviewed changes
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
Closed
4 tasks
marcoambrosini and others added 3 commits January 6, 2020 06:20
@marcoambrosini @danxuliu
Hide chat tab for folders
350f67c 
Signed-off-by: Marco Ambrosini <marcoambrosini@pm.me>
@danxuliu
Explicitly leave conversation when a chat tab is not displayed
7375900 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
@danxuliu
Remove no longer needed placeholder
4bc3b69 
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 <danxuliu@gmail.com>
@danxuliu danxuliu force-pushed the bugfix/noid/hide-chat-tab-for-folders branch from 0f4d73a to 4bc3b69 Compare January 6, 2020 05:55
danxuliu
danxuliu approved these changes Jan 6, 2020
View reviewed changes
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
Reviewers

@nickvergessen nickvergessen nickvergessen approved these changes

@skjnldsv skjnldsv skjnldsv approved these changes

@danxuliu danxuliu danxuliu approved these changes

Assignees

@marcoambrosini marcoambrosini

Labels
3. to review
Projects
None yet
Milestone
v8.0.0
Development

Successfully merging this pull request may close these issues.
4 participants
@marcoambrosini @nickvergessen @danxuliu @skjnldsv