Merge branch 'master' into release/bugpatch#2327
Merged
tomgreenfield merged 72 commits intorelease/bugpatchfrom May 10, 2019
Merged
Merge branch 'master' into release/bugpatch#2327tomgreenfield merged 72 commits intorelease/bugpatchfrom
tomgreenfield merged 72 commits intorelease/bugpatchfrom
Conversation
Contributor
tomgreenfield
commented
May 9, 2019
tomgreenfield
commented
- Resolve conflicts
- Ensure relative URLs in theme editor
Fix Custom LESS not working in authoring tools running framework v4
…ss to not be applied if there was no themeVariables.less present
Theme editing feature
Release/theme editing
Contributor
|
Thanks for this @tomgreenfield. I've switched to this branch locally and given it a brief test. I think it's best if I 👀 approve this. Before we release I'll put the bugpatch branch on a testing server here and ask QA to give it a smoke test. |
Contributor
Author
|
Cheers, I'll go ahead and merge this now and get the full complement of +1s for the PR into master. |
Contributor
|
@tomgreenfield It's not clear to me if we are waiting for a potential fix for the issue mentioned on #2261 ? (Before we do the release) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.