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

Add displayName to all components #160

Merged
merged 7 commits into from
Aug 7, 2018
Merged

Add displayName to all components #160

merged 7 commits into from
Aug 7, 2018

Conversation

shawnbot
Copy link
Contributor

Fixes #141.

@shawnbot shawnbot changed the base branch from release-0.0.12-beta to release-0.0.13-beta July 31, 2018 23:34
@emplums emplums mentioned this pull request Aug 1, 2018
Merged
@emplums
Copy link

emplums commented Aug 1, 2018

🤔 Wonder why all these live editor commits are showing up as diffs when they were merged into master in 0.0.12?

@shawnbot
Copy link
Contributor Author

shawnbot commented Aug 1, 2018

Yeah, I'm doing a git rebase -i release-0.0.13-beta to pick only the relevant commits, and will force-push when the docs are done rebuilding.

@shawnbot shawnbot mentioned this pull request Aug 1, 2018
Merged
4 tasks
@shawnbot shawnbot added enhancement New feature or request 💓collab a vibrant hub of collaboration status: review needed labels Aug 1, 2018
@emplums emplums mentioned this pull request Aug 3, 2018
Merged
12 tasks
@emplums emplums changed the base branch from release-0.0.13-beta to release-1.0.0-beta August 3, 2018 16:54
jonrohan
jonrohan approved these changes Aug 3, 2018
View reviewed changes
Copy link
Member

@jonrohan jonrohan left a comment

Choose a reason for hiding this comment

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

💯 Need to double check other displaynames aren't still in there

shawnbot
shawnbot commented Aug 6, 2018
View reviewed changes
.eslintrc.json Outdated
@@ -5,6 +5,6 @@
"plugin:jsx-a11y/recommended"
],
"rules": {
"no-unused-vars": ["error", {"args": "after-used"}]
"import/no-namespace": "warn"

This comment was marked as outdated.

Sign in to view

@shawnbot
Copy link
Contributor Author

shawnbot commented Aug 6, 2018

Okay, conflicts fixed. This should be ready to include in #182.

@shawnbot shawnbot merged commit d5eba9e into release-1.0.0-beta Aug 7, 2018
@shawnbot shawnbot deleted the add-displayname branch August 7, 2018 05:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jonrohan jonrohan jonrohan approved these changes

Assignees
No one assigned
Labels
💓collab a vibrant hub of collaboration enhancement New feature or request
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@shawnbot @emplums @jonrohan