Merge remote-tracking branch 'upstream/develop' into develop
Showing
- .circleci/config.yml 10 additions, 10 deletions.circleci/config.yml
- package-lock.json 2210 additions, 1621 deletionspackage-lock.json
- package.json 10 additions, 9 deletionspackage.json
- src/components/gui/gui.jsx 6 additions, 1 deletionsrc/components/gui/gui.jsx
- src/components/menu-bar/menu-bar.jsx 74 additions, 18 deletionssrc/components/menu-bar/menu-bar.jsx
- src/components/telemetry-modal/telemetry-modal.css 86 additions, 18 deletionssrc/components/telemetry-modal/telemetry-modal.css
- src/components/telemetry-modal/telemetry-modal.jsx 105 additions, 34 deletionssrc/components/telemetry-modal/telemetry-modal.jsx
- src/containers/blocks.jsx 2 additions, 2 deletionssrc/containers/blocks.jsx
- src/containers/gui.jsx 2 additions, 0 deletionssrc/containers/gui.jsx
- src/containers/paint-editor-wrapper.jsx 2 additions, 0 deletionssrc/containers/paint-editor-wrapper.jsx
- src/containers/sb-file-uploader.jsx 0 additions, 226 deletionssrc/containers/sb-file-uploader.jsx
- src/containers/sound-editor.jsx 2 additions, 2 deletionssrc/containers/sound-editor.jsx
- src/containers/sound-tab.jsx 1 addition, 1 deletionsrc/containers/sound-tab.jsx
- src/containers/stage.jsx 1 addition, 2 deletionssrc/containers/stage.jsx
- src/lib/app-state-hoc.jsx 2 additions, 0 deletionssrc/lib/app-state-hoc.jsx
- src/lib/audio/audio-util.js 1 addition, 1 deletionsrc/lib/audio/audio-util.js
- src/lib/backpack-api.js 4 additions, 4 deletionssrc/lib/backpack-api.js
- src/lib/file-uploader.js 4 additions, 4 deletionssrc/lib/file-uploader.js
- src/lib/libraries/.eslintrc.js 7 additions, 0 deletionssrc/lib/libraries/.eslintrc.js
- src/lib/sb-file-uploader-hoc.jsx 273 additions, 0 deletionssrc/lib/sb-file-uploader-hoc.jsx
Loading
Please register or sign in to comment