Merge branch 'develop' into greenkeeper/scratch-render-0.1.0-prerelease.20181102130522
Showing
- package.json 3 additions, 3 deletionspackage.json
- src/components/backpack/backpack.css 16 additions, 0 deletionssrc/components/backpack/backpack.css
- src/components/backpack/backpack.jsx 20 additions, 2 deletionssrc/components/backpack/backpack.jsx
- src/components/language-selector/language-selector.jsx 1 addition, 3 deletionssrc/components/language-selector/language-selector.jsx
- src/components/menu-bar/login-dropdown.jsx 27 additions, 0 deletionssrc/components/menu-bar/login-dropdown.jsx
- src/components/menu-bar/menu-bar.jsx 20 additions, 29 deletionssrc/components/menu-bar/menu-bar.jsx
- src/components/menu/menu.jsx 4 additions, 3 deletionssrc/components/menu/menu.jsx
- src/components/spinner/spinner.css 54 additions, 0 deletionssrc/components/spinner/spinner.css
- src/components/spinner/spinner.jsx 26 additions, 0 deletionssrc/components/spinner/spinner.jsx
- src/components/sprite-selector-item/sprite-selector-item.css 2 additions, 1 deletionsrc/components/sprite-selector-item/sprite-selector-item.css
- src/components/sprite-selector/sprite-list.jsx 2 additions, 1 deletionsrc/components/sprite-selector/sprite-list.jsx
- src/containers/backpack.jsx 55 additions, 22 deletionssrc/containers/backpack.jsx
- src/containers/language-selector.jsx 1 addition, 23 deletionssrc/containers/language-selector.jsx
- src/containers/sb-file-uploader.jsx 5 additions, 1 deletionsrc/containers/sb-file-uploader.jsx
- src/containers/sb3-downloader.jsx 5 additions, 0 deletionssrc/containers/sb3-downloader.jsx
- src/containers/stage-selector.jsx 9 additions, 1 deletionsrc/containers/stage-selector.jsx
- src/containers/target-pane.jsx 9 additions, 2 deletionssrc/containers/target-pane.jsx
- src/lib/backpack-api.js 29 additions, 11 deletionssrc/lib/backpack-api.js
- src/lib/backpack/block-to-image.js 3 additions, 0 deletionssrc/lib/backpack/block-to-image.js
- src/lib/backpack/jpeg-thumbnail.js 4 additions, 1 deletionsrc/lib/backpack/jpeg-thumbnail.js
Loading
Please register or sign in to comment