-
Notifications
You must be signed in to change notification settings - Fork 3.8k
Comparing changes
Open a pull request
base repository: scratchfoundation/scratch-gui
base: develop
head repository: RaspberryPiFoundation/scratch-gui
compare: code-club-world
- 15 commits
- 11 files changed
- 4 contributors
Commits on Aug 23, 2021
-
The MenuBar is quite specific to the canonical version of the online Scratch editor [1]. We want to make use of the scratch-gui package without displaying the MenuBar. Since the height of the menu bar is hard-coded as a CSS variable, I've had to override the height calculation for the body wrapper when the menu bar is not visible. Ideally the height of the menu bar wouldn't be hard-coded and this wouldn't be necessary. [1]: https://scratch.mit.edu/projects/editor
Configuration menu - View commit details
-
Copy full SHA for 539e54a - Browse repository at this point
Copy the full SHA 539e54aView commit details -
Configure CircleCI builds to deploy code-club-world branch to GH Pages
This is specific to the RPF CodeClubWorld app and should not be merged into the main "develop" branch or pushed to the upstream repo. I don't think we need the deploy-npm or push-translations workflows. The `npm run deploy -- -e $CIRCLE_BRANCH` step in the deploy-gh-pages job appears to make use of the gh-pages `-e` option [1] to publish the changes to the gh-pages branch within a sub-directory named after the current branch. I've retained this functionality given that it may well be useful if we want to try out changes without affecting production. [1]: scratchfoundation/gh-pages@e0dd4ea#diff-558572b6f7bd7068bbbd3db502651a5a313bfc3901d72eb2995833592e4434edR30
Configuration menu - View commit details
-
Copy full SHA for adc052a - Browse repository at this point
Copy the full SHA adc052aView commit details -
Add deploy key with write access to repo for deploying to GH Pages
I followed these instructions [1] to create the key and add it to GitHub and CircleCI. [1]: https://circleci.com/docs/2.0/gh-bb-integration/#creating-a-github-deploy-key
Configuration menu - View commit details
-
Copy full SHA for 94f268e - Browse repository at this point
Copy the full SHA 94f268eView commit details -
Configuration menu - View commit details
-
Copy full SHA for ff77f18 - Browse repository at this point
Copy the full SHA ff77f18View commit details -
Export saveProjectToServer & add support for extra HTTP headers
I want to be able to send an X-CSRF-Token HTTP header when sending a POST or PUT request to create or update the project. * Exporting saveProjectToServer means that I can set the onUpdateProjectData property to a function which wraps saveProjectToServer. * Adding the optional headers parameter to the saveProjectToServer function means that the wrapping function can pass in extra HTTP headers to be sent in any request.
Configuration menu - View commit details
-
Copy full SHA for 97f7c9e - Browse repository at this point
Copy the full SHA 97f7c9eView commit details -
Publish scoped package on successful builds
This reinstates the deploy-npm CircleCI job and tweaks it slightly: * Scope the package name by organisation. This ties the package to the RPF organisation rather than just to my user and means that, for example, any member of the organisation can publish the package. * Only publish package on successful builds of the code-club-world branch. * Use organisation-specific release version and git tag to avoid confusion with versions in the canonical package and tags in upstream repo. * Always publish using "latest" npm tag; not "hotfix" or "stable". * Add `--access public` option to `npm publish` command, because scoped packages only allow "restricted" access by default. * I've added the access token from my npmjs.org account as the NPM_TOKEN env var in the CircleCI project settings. * Add ssh key fingerprint to allow `git push`.
Configuration menu - View commit details
-
Copy full SHA for 5a82c84 - Browse repository at this point
Copy the full SHA 5a82c84View commit details -
Change homepage & repo metadata for forked package
These are used by npmjs.org to display links on the package page. Since this is a public package I think it's sensible to point at our fork of the canonical repo.
Configuration menu - View commit details
-
Copy full SHA for 7cef984 - Browse repository at this point
Copy the full SHA 7cef984View commit details -
Configuration menu - View commit details
-
Copy full SHA for 2bb6725 - Browse repository at this point
Copy the full SHA 2bb6725View commit details -
Fix prop type validation warning in SpriteSelectorItem
In ./src/containers/costume-tab.jsx:271 the SpriteSelctorItem `dragPayload` prop is set to be an object. To supress the prop type warning, I've added `propTypes.object` to the array of allowed types.
Configuration menu - View commit details
-
Copy full SHA for fa974ec - Browse repository at this point
Copy the full SHA fa974ecView commit details -
Fix proptype validation warning in SpriteList
We've seen a PropType warning for this prop in development. It seems that when the SpriteList component is used to manage the costumes in the left hand side of the Costumes tab, numeric identifiers are used for `sprite`. When the SpriteList is used in the sprite selection area under the stage, strings are used. There's probably a way of fixing this at source, but for now being a bit more permissive with the validation removes the warning. As far as I can tell from reading the source, we use this id for comparison with the `===` operator, so I think numbers or strings are functionally equivalent.
Configuration menu - View commit details
-
Copy full SHA for bba18ce - Browse repository at this point
Copy the full SHA bba18ceView commit details
Commits on May 19, 2023
-
Magdalena Jadach committed
May 19, 2023 Configuration menu - View commit details
-
Copy full SHA for 3baff16 - Browse repository at this point
Copy the full SHA 3baff16View commit details
Commits on May 22, 2023
-
Merge pull request #4 from RaspberryPiFoundation/tweak-color-block
Bump color shade
MagdalenaJadach authoredMay 22, 2023 Configuration menu - View commit details
-
Copy full SHA for f088086 - Browse repository at this point
Copy the full SHA f088086View commit details
Commits on May 30, 2023
-
Magdalena Jadach committed
May 30, 2023 Configuration menu - View commit details
-
Copy full SHA for 5e2d980 - Browse repository at this point
Copy the full SHA 5e2d980View commit details
Commits on Jun 6, 2023
-
Scott committed
Jun 6, 2023 Configuration menu - View commit details
-
Copy full SHA for c5b8727 - Browse repository at this point
Copy the full SHA c5b8727View commit details -
Merge pull request #5 from RaspberryPiFoundation/alt-images
Fix nav images alt
MagdalenaJadach authoredJun 6, 2023 Configuration menu - View commit details
-
Copy full SHA for 8c1fa78 - Browse repository at this point
Copy the full SHA 8c1fa78View commit details
This comparison is taking too long to generate.
Unfortunately it looks like we can’t render this comparison for you right now. It might be too big, or there might be something weird with your repository.
You can try running this command locally to see the comparison on your machine:
git diff develop...code-club-world