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

Added Muted Topic screen in Setting Detail Screen. #982

Closed
wants to merge 3 commits into from
Closed

Added Muted Topic screen in Setting Detail Screen. #982

wants to merge 3 commits into from

Conversation

jainkuniya
Copy link
Member

screen shot 2017-08-04 at 4 21 08 pm

screen shot 2017-08-04 at 4 20 06 pm

screen shot 2017-08-04 at 4 20 23 pm

screen shot 2017-08-04 at 4 20 42 pm

@jainkuniya jainkuniya force-pushed the mutedTopicScreen branch 2 times, most recently from a30621b to f797ed7 Compare August 5, 2017 04:39
@jainkuniya
Copy link
Member Author

Updated.
Fixed travis build.

@zulipbot
Copy link
Member

zulipbot commented Aug 6, 2017

Heads up @vishwesh3, we just merged some commits that conflict with the changes your made in this pull request! You can review this repository's recent commits to see where the conflicts occur. Please rebase your feature branch against the upstream/master branch and resolve your pull request's merge conflicts accordingly.

@jainkuniya
Copy link
Member Author

rebased 👍

@zulipbot
Copy link
Member

Heads up @vishwesh3, we just merged some commits that conflict with the changes your made in this pull request! You can review this repository's recent commits to see where the conflicts occur. Please rebase your feature branch against the upstream/master branch and resolve your pull request's merge conflicts accordingly.

kunall17
kunall17 suggested changes Sep 22, 2017
View reviewed changes
Copy link
Contributor

@kunall17 kunall17 left a comment

Choose a reason for hiding this comment

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

Will look good after a rebase 👍

@borisyankov LGTM after a rebase?

src/types.js Outdated
@@ -356,6 +356,8 @@ export type ReactionType = {

export type LocalizableText = string | { text: string, values: Object };

export type MutedTopic = [];
Copy link
Contributor

Choose a reason for hiding this comment

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

We can specify this at more detail
export type MutedTopic = [string, string]

Copy link
Member Author

Choose a reason for hiding this comment

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

Done 👍

@jainkuniya
Copy link
Member Author

Rebased 👍
ready to go in 🏃

@borisyankov
Copy link
Contributor

Closing this, but feel free to move some of the work to the new topic screen.

@borisyankov borisyankov closed this Mar 1, 2018
@jainkuniya jainkuniya mentioned this pull request May 8, 2019
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kunall17 kunall17 kunall17 requested changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@jainkuniya @zulipbot @borisyankov @kunall17