Code classroom v15 - #6
Closed
jamiebenstead wants to merge 7098 commits into
Closed
jamiebenstead wants to merge 7098 commits into
jamiebenstead wants to merge 7098 commits into
Conversation
Loading
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Resolves
Part of the work for https://github.com/RaspberryPiFoundation/digital-editor-issues/issues/1772
Proposed Changes
Upgrade to upstream v15.1.1, and PR #5 is dropped in favour of upstream's
getLibraryAssetUrlNotes
482 files changed is expected — this bumps upstream Scratch from v13.7.3 to v15.1.1. 479 of those files are upstream's, 10 are ours, and 5 are touched by both.
To review just the RPF changes: git diff v15.1.1..code-classroom-v15
or
scratchfoundation/scratch-editor@v15.1.1...RaspberryPiFoundation:scratch-editor:code-classroom-v15