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.

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

Backport PR #7192 on branch 1.1.x (progress on icons: added inline svg icon support to toolbar buttons) #7222

Conversation

meeseeksmachine
Copy link
Contributor

Backport PR #7192: progress on icons: added inline svg icon support to toolbar buttons

@lumberbot-app lumberbot-app bot added this to the 1.2 milestone Sep 17, 2019
@jupyterlab-dev-mode
Copy link

Thanks for making a pull request to JupyterLab!

To try out this branch on binder, follow this link: Binder

@jasongrout jasongrout modified the milestones: 1.2, 1.1.x Sep 17, 2019
@jasongrout
Copy link
Contributor

Let's discuss this (and backwards compatibility in general) in the dev meeting tomorrow before merging. If we merge, I'll make a release tomorrow with it to fix a number of issues that have come up.

@telamonian
Copy link
Member

Waaait... now I'm extra confused. The changes in #7192 made it into the 1.1.4 release, right? But this backport didn't get merged? How did that happen?

Relevant quote from @jasongrout on Gitter:

we have a 1.1.x branch and a 1.x branch. Both need the backport. As a matter of process, it's good to only backport to 1.1.x from 1.x since then you know that patches in 1.1.x are also in 1.x.

@jasongrout
Copy link
Contributor

Huh. That is confusing. Here is the backport that was merged: #7236

Not sure why I didn't use this PR. I do remember there being some merge conflicts with a backport of #7192.

Anyway, closing since a backport was merged.

@jasongrout jasongrout closed this Sep 23, 2019
@jasongrout jasongrout modified the milestones: 1.1.x, Reference Sep 23, 2019
@lock lock bot added the status:resolved-locked Closed issues are locked after 30 days inactivity. Please open a new issue for related discussion. label Oct 23, 2019
@lock lock bot locked as resolved and limited conversation to collaborators Oct 23, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
status:resolved-locked Closed issues are locked after 30 days inactivity. Please open a new issue for related discussion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants