Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
4b7aaf8
Always apply min-height: 0
apple502j Mar 30, 2020
2f45d32
Add iconAltText
apple502j May 20, 2020
29558b8
Update username-step.jsx
R4356th May 20, 2020
847c64e
Add node12 support
southwolf May 27, 2020
d9d9265
Update username-step.jsx
R4356th May 30, 2020
00a2dca
Update username-step.jsx
R4356th May 31, 2020
5a46a90
Update username-step.jsx
R4356th May 31, 2020
364f6da
Remove hasOwnProperty
R4356th Jun 1, 2020
c390e57
Update people.json
GrahamSH-LLK Jun 4, 2020
40ced63
Remove Ellen Daoust, add Elizabeth Foster
GrahamSH-LLK Jun 4, 2020
74032c7
Updated username Harakou's Capitalization
GrahamSH-LLK Jun 4, 2020
997806a
Fix Translators page URL
R4356th Jun 13, 2020
9b380e9
Fix text overflow in what's happening
BoomerScratch Jun 14, 2020
a214ddb
Change to overflow-wrap
BoomerScratch Jun 14, 2020
72d9ba2
Update splash.scss
BoomerScratch Jun 15, 2020
927a4b9
Fix welcomingcommittee mention link href
apple502j Jun 20, 2020
6a4ed0e
Merge pull request #4026 from southwolf/fix-node12-support
benjiwheeler Jun 25, 2020
150296a
Revert "Add node12 support, Fix #4025"
benjiwheeler Jun 25, 2020
9dd8775
Merge pull request #4142 from LLK/revert-4026-fix-node12-support
benjiwheeler Jun 25, 2020
7d8536a
Merge pull request #4140 from LLK/release/2020-06-24
ericrosenbaum Jun 25, 2020
75dbbd0
Merge pull request #4000 from apple502j/patch-17
benjiwheeler Jun 25, 2020
b627081
Merge pull request #4002 from R4356th/patch-1
benjiwheeler Jun 25, 2020
03c5f7f
Merge pull request #4099 from R4356th/patch-4
benjiwheeler Jun 25, 2020
9766d84
Merge pull request #4101 from BoomerScratch/patch-1
benjiwheeler Jun 25, 2020
a5e0fbc
Merge pull request #4065 from GrahamSH-LLK/develop
benjiwheeler Jun 25, 2020
08e8bb0
Merge pull request #4125 from apple502j/patch-21
benjiwheeler Jun 25, 2020
2a16790
Merge pull request #3776 from apple502j/patch-15
benjiwheeler Jun 25, 2020
7c05ebf
Bump scratch-gui
dependabot-preview[bot] Jun 25, 2020
6098ed8
Merge pull request #4143 from LLK/dependabot/npm_and_yarn/scratch-gui…
dependabot-preview[bot] Jun 25, 2020
220cdf4
Bump scratch-gui
dependabot-preview[bot] Jun 26, 2020
0fe41b4
Merge pull request #4148 from LLK/dependabot/npm_and_yarn/scratch-gui…
dependabot-preview[bot] Jun 26, 2020
3527e42
use overflow auto in different place
benjiwheeler Jun 26, 2020
374af98
revert guiPlayer switch to max-width
benjiwheeler Jun 26, 2020
cf50ee4
Bump scratch-gui
dependabot-preview[bot] Jun 29, 2020
b385288
Merge pull request #4155 from LLK/dependabot/npm_and_yarn/scratch-gui…
dependabot-preview[bot] Jun 29, 2020
c100c37
Redirect the old join flow to the new one.
picklesrus Jun 29, 2020
5a76d80
Merge pull request #4149 from benjiwheeler/fix-safari-fullscreen
benjiwheeler Jun 29, 2020
996a80d
Merge pull request #4145 from LLK/hotfix/scratch-desktop-evergreen
cwillisf Jun 29, 2020
e89705d
Bump scratch-gui
dependabot-preview[bot] Jun 30, 2020
4a2ce58
Merge pull request #4161 from LLK/dependabot/npm_and_yarn/scratch-gui…
dependabot-preview[bot] Jun 30, 2020
7eef29c
Merge pull request #4156 from picklesrus/redirect-join
picklesrus Jun 30, 2020
ff2743b
Bump scratch-l10n from 3.10.20200624030914 to 3.10.20200708030815
dependabot-preview[bot] Jul 8, 2020
923d011
Merge pull request #4173 from LLK/dependabot/npm_and_yarn/scratch-l10…
dependabot-preview[bot] Jul 8, 2020
484d8a5
Bump scratch-gui
dependabot-preview[bot] Jul 8, 2020
9090aab
Merge pull request #4174 from LLK/dependabot/npm_and_yarn/scratch-gui…
dependabot-preview[bot] Jul 8, 2020
e5d2fd6
Merge pull request #4176 from LLK/develop
chrisgarrity Jul 8, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
544 changes: 272 additions & 272 deletions package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@
"redux-mock-store": "^1.2.3",
"redux-thunk": "2.0.1",
"sass-loader": "6.0.6",
"scratch-gui": "0.1.0-prerelease.20200622200348",
"scratch-gui": "0.1.0-prerelease.20200708034512",
"scratch-l10n": "latest",
"selenium-webdriver": "3.6.0",
"slick-carousel": "1.6.0",
Expand Down
4 changes: 2 additions & 2 deletions src/components/join-flow/username-step.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class UsernameStep extends React.Component {
};
// simple object to memoize remote requests for usernames.
// keeps us from submitting multiple requests for same data.
this.usernameRemoteCache = {};
this.usernameRemoteCache = Object.create(null);
}
componentDidMount () {
// Send info to analytics when we aren't on the standalone page.
Expand All @@ -58,7 +58,7 @@ class UsernameStep extends React.Component {
}
// simple function to memoize remote requests for usernames
validateUsernameRemotelyWithCache (username) {
if (this.usernameRemoteCache.hasOwnProperty(username)) {
if (typeof this.usernameRemoteCache[username] === 'object') {
return Promise.resolve(this.usernameRemoteCache[username]);
}
// username is not in our cache
Expand Down
6 changes: 2 additions & 4 deletions src/components/modal/addtostudio/modal.scss
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,8 @@
background-color: $ui-blue-10percent;
flex: 1;
height: calc(100% - 5rem);

@media #{$small-height} {
min-height: 0;
}
/* Firefox requires min-height:0: #3775 */
min-height: 0;
}

.studio-list-inner-scrollbox {
Expand Down
2 changes: 1 addition & 1 deletion src/lib/decorate-text.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ module.exports = (text, opts) => {
if (opts.usernames) {
replacedText = reactStringReplace(replacedText, /@([\w-]+)/g, (match, i) => (
<a
href={`/users/${match}`}
href={match.toLowerCase() === 'welcomingcommittee' ? '/studios/146521/' : `/users/${match}`}
key={match + i}
>@{match}</a>
));
Expand Down
6 changes: 6 additions & 0 deletions src/routes.json
Original file line number Diff line number Diff line change
Expand Up @@ -434,6 +434,12 @@
"routeAlias": "/info/?(\\?.*)?$",
"redirect": "/ideas"
},
{
"name": "register-redirect",
"pattern": "^/accounts/standalone-registration/?$",
"routeAlias": "/accounts/standalone-registration/",
"redirect": "/join"
},
{
"name": "research-redirect",
"pattern": "^/info/research/?$",
Expand Down
6 changes: 3 additions & 3 deletions src/views/credits/credits.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ const Credits = () => (
id="credits.acknowledgementsTranslators"
values={{
translatorsLink: (
<a href="http://wiki.scratch.mit.edu/wiki/Translators">
<a href="https://en.scratch-wiki.info/wiki/Translators">
<FormattedMessage id="credits.acknowledgementsTranslatorsLinkText" />
</a>
)
Expand Down Expand Up @@ -151,8 +151,8 @@ const Credits = () => (
{' '}
Ben Berg, Amos Blanton, Karen Brennan, Juanita Buitrago,
Leo Burd, Gaia Carini, Kasia Chmielinski, Michelle Chung,
Shane Clements, Hannah Cole, Ellen Daoust, Sayamindu Dasgupta,
Margarita Dekoli, Dave Feinberg, Linda Fernsel,
Shane Clements, Hannah Cole, Sayamindu Dasgupta,
Margarita Dekoli, Dave Feinberg, Linda Fernsel, Elizabeth Foster,
Chris Graves, Joel Gritter, Megan Haddadi, Connor Hudson,
Christina Huang, Tony Hwang, Abdulrahman Idlbi, Randy Jou,
Lily Kim, Tauntaun Kim, Saskia Leggett, Tim Mickel,
Expand Down
23 changes: 19 additions & 4 deletions src/views/credits/people.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
[
{
"userName": "originalwow",
"userId": 56182496,
"name": "Amielle"
},
{
"userName": "amylaser",
"userId": 17462181,
Expand Down Expand Up @@ -53,9 +58,14 @@
"userName": "codubee",
"userId": 10866958,
"name": "Colby"
},
{
"userName": "noncanonical",
"userId": 55851826,
"name": "Craig"
},
{
"userName": "harakou",
"userName": "Harakou",
"userId": 373646,
"name": "Dalton"
},
Expand All @@ -65,9 +75,9 @@
"name": "DD"
},
{
"userName": "rmiel",
"userId": 34557192,
"name": "Elizabeth"
"userName": "SunnyDay4aBlueJay",
"userId": 24164779,
"name": "Ellen"
},
{
"userName": "ericr",
Expand Down Expand Up @@ -104,6 +114,11 @@
"userId": 2496866,
"name": "Jolie"
},
{
"userName": "Class12321",
"userId": 2871308,
"name": "Joshua"
},
{
"userName": "bluecrazie",
"userId": 50257624,
Expand Down
3 changes: 2 additions & 1 deletion src/views/download/l10n.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,5 +50,6 @@
"download.whyAskForLocation" : "Why is {operatingsystem} asking for my location?",
"download.whyAskForLocationAnswer" : "Scratch uses bluetooth to connect to other devices, such as a micro:bit or LEGO BOOST. Bluetooth can be used to provide location data to the app, so Google requires every app that uses bluetooth ask users for permission to access their location. Scratch will not use bluetooth to track your location.",
"download.whereProjectStored" : "Where does the Scratch App store my projects?",
"download.whereProjectStoredAnswer" : "Projects are saved internally in the app. To export a project file, click the 3-dot menu and select \"Share\". On the next screen select \"export\". The options visible depend on the applications installed on your device. Common options are Google Drive, Files, and email."
"download.whereProjectStoredAnswer" : "Projects are saved internally in the app. To export a project file, click the 3-dot menu and select \"Share\". On the next screen select \"export\". The options visible depend on the applications installed on your device. Common options are Google Drive, Files, and email.",
"download.iconAltText" : "Download"
}
5 changes: 2 additions & 3 deletions src/views/preview/preview.scss
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ $stage-width: 480px;

.inner {
margin: 0 auto;
overflow: auto;

@media #{$medium-and-smaller} {
// subtract page padding
Expand Down Expand Up @@ -365,7 +364,7 @@ $stage-width: 480px;
.guiPlayer {
display: inline-block;
position: relative;
max-width: $player-width;
width: $player-width;
z-index: 1;

$alert-bg: rgba(255, 255, 255, .85);
Expand Down Expand Up @@ -402,6 +401,7 @@ $stage-width: 480px;
flex: 1;
flex-flow: column;
margin-top: .3125rem;
overflow: auto;

@media #{$medium-and-smaller} {
margin-top: .5rem;
Expand Down Expand Up @@ -479,7 +479,6 @@ $stage-width: 480px;
line-height: 1.5rem;
flex: 1;
overflow-wrap: break-word;
word-break: break-word;
}

.project-description:last-of-type {
Expand Down
2 changes: 2 additions & 0 deletions src/views/splash/splash.scss
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,8 @@
.social-message {
border: 0;
padding: 0;
overflow-wrap: anywhere;
word-break: break-word;
}

.activity-img {
Expand Down