Merge pull request from LLK/release/2019-09-11

[Develop] Release for 2019-09-11
This commit is contained in:
Ray Schamp 2019-09-12 15:20:18 -04:00 committed by GitHub
commit 510ea9acbf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 6 deletions

6
package-lock.json generated
View file

@ -15561,9 +15561,9 @@
}
},
"scratch-gui": {
"version": "0.1.0-prerelease.20190911174033",
"resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20190911174033.tgz",
"integrity": "sha512-xgxD3iHnbKkdpkpzZzLcpsimbHnRy/XpZfTw+/ByaXKnMMOPkK11IOjU/yFfRcFLzotrfMqJyC7dF9hNGqHUxQ==",
"version": "0.1.0-prerelease.20190912180550",
"resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20190912180550.tgz",
"integrity": "sha512-FPOuX1Za4vNAhOJfViEigGJ5t+dWzebgrUQWAvJDwrkhfKKHD2VE9vtaGH6H+6NNZIdW+2qcSqBPxutevdHlyA==",
"dev": true
},
"scratch-l10n": {

View file

@ -126,7 +126,7 @@
"redux-mock-store": "^1.2.3",
"redux-thunk": "2.0.1",
"sass-loader": "6.0.6",
"scratch-gui": "0.1.0-prerelease.20190911174033",
"scratch-gui": "0.1.0-prerelease.20190912180550",
"scratch-l10n": "latest",
"selenium-webdriver": "3.6.0",
"slick-carousel": "1.6.0",

View file

@ -96,6 +96,7 @@ module.exports.handleCompleteRegistration = createProject => (dispatch => {
if (createProject) {
window.location = '/projects/editor/?tutorial=getStarted';
} else {
dispatch(sessionActions.refreshSession());
dispatch(module.exports.setRegistrationOpen(false));
}
});

View file

@ -114,8 +114,8 @@ class Download extends React.Component {
className="download-button"
href={
this.state.OS === OS_ENUM.WINDOWS ?
'https://downloads.scratch.mit.edu/desktop/Scratch%20Desktop%20Setup%203.5.0.exe' :
'https://downloads.scratch.mit.edu/desktop/Scratch%20Desktop-3.5.0.dmg'
'https://downloads.scratch.mit.edu/desktop/Scratch%20Desktop%20Setup%203.6.0.exe' :
'https://downloads.scratch.mit.edu/desktop/Scratch%20Desktop-3.6.0.dmg'
}
>
<FormattedMessage id="download.downloadButton" />