Commit graph

12687 commits

Author SHA1 Message Date
Andy O'Neill
9dc7fbb67d
Merge pull request #7687 from scratchfoundation/release/2023-06-27
[Master] release/2023-06-27
2023-06-28 09:29:39 -04:00
renovate[bot]
5088451c63
Merge pull request #7690 from scratchfoundation/renovate/scratch-l10n-3.x
fix(deps): update dependency scratch-l10n to v3.15.20230628032227
2023-06-28 06:17:51 +00:00
renovate[bot]
751990bde5
fix(deps): update dependency scratch-l10n to v3.15.20230628032227 2023-06-28 03:45:53 +00:00
Andy O'Neill
2a13587d5d Merge branch 'develop' into release/2023-06-27 2023-06-27 16:19:41 -04:00
Andy O'Neill
b58fe4715b
Merge pull request #7689 from scratchfoundation/renovate/scratch-gui-2.x
fix(deps): update dependency scratch-gui to v2.0.13
2023-06-27 16:01:15 -04:00
renovate[bot]
351323ebdc
fix(deps): update dependency scratch-gui to v2.0.13 2023-06-27 18:26:37 +00:00
renovate[bot]
43b16a1dee
Merge pull request #7688 from scratchfoundation/renovate/scratch-l10n-3.x
fix(deps): update dependency scratch-l10n to v3.15.20230627032203
2023-06-27 08:13:39 +00:00
renovate[bot]
5746644e3a
fix(deps): update dependency scratch-l10n to v3.15.20230627032203 2023-06-27 04:40:53 +00:00
aoneill01
5ef9fc9865 Merge remote-tracking branch 'origin/develop' into release/2023-06-27 2023-06-27 00:31:56 +00:00
Christopher Willis-Ford
006f744063
Merge pull request #7670 from scratchfoundation/release/2023-06-20
[Develop] release/2023-06-20
2023-06-26 13:41:19 -07:00
Christopher Willis-Ford
86415ec7ee
Merge pull request #7671 from scratchfoundation/release/2023-06-20
[Master] release/2023-06-20
2023-06-26 12:24:23 -07:00
renovate[bot]
571cb56374
Merge pull request #7685 from scratchfoundation/renovate/scratch-gui-2.x
fix(deps): update dependency scratch-gui to v2.0.10
2023-06-26 19:16:26 +00:00
renovate[bot]
60c4405744
fix(deps): update dependency scratch-gui to v2.0.10 2023-06-26 17:39:32 +00:00
cori hudson
172edcdc04
Merge pull request #7679 from scratchfoundation/hotfix/cori/annual-report-link
fix: add link to annual report in correct place
2023-06-26 13:38:50 -04:00
Christopher Willis-Ford
519b476dc5 fix: copy micro:bit hex file into the right place 2023-06-26 10:34:59 -07:00
Christopher Willis-Ford
4bd6023a10 refactor: consolidate CopyWebpackPlugin instances 2023-06-26 10:34:59 -07:00
Christopher Willis-Ford
7fbaf96fa0
Merge pull request #7684 from cwillisf/fix-microbit-hex
Fix micro:bit hex file location
2023-06-26 09:51:10 -07:00
Christopher Willis-Ford
5b43dc0be5 fix: copy micro:bit hex file into the right place 2023-06-26 09:12:46 -07:00
Christopher Willis-Ford
8dc793ffa5 refactor: consolidate CopyWebpackPlugin instances 2023-06-26 09:12:05 -07:00
renovate[bot]
d3d778c155
Merge pull request #7683 from scratchfoundation/renovate/scratch-gui-2.x
fix(deps): update dependency scratch-gui to v2.0.9
2023-06-26 12:54:57 +00:00
renovate[bot]
88b9dbb9d0
fix(deps): update dependency scratch-gui to v2.0.9 2023-06-26 11:31:00 +00:00
renovate[bot]
e2ebb33927
Merge pull request #7682 from scratchfoundation/renovate/scratch-l10n-3.x
fix(deps): update dependency scratch-l10n to v3.15.20230626032211
2023-06-26 06:17:29 +00:00
renovate[bot]
9fc0e66a46
fix(deps): update dependency scratch-l10n to v3.15.20230626032211 2023-06-26 04:20:47 +00:00
renovate[bot]
a6cd7daa0e
Merge pull request #7681 from scratchfoundation/renovate/scratch-gui-2.x
fix(deps): update dependency scratch-gui to v2.0.8
2023-06-24 00:10:06 +00:00
renovate[bot]
5174da661a
fix(deps): update dependency scratch-gui to v2.0.8 2023-06-23 21:44:16 +00:00
renovate[bot]
b6d7098a83
Merge pull request #7680 from scratchfoundation/renovate/scratch-l10n-3.x
fix(deps): update dependency scratch-l10n to v3.15.20230623032228
2023-06-23 09:50:27 +00:00
renovate[bot]
db6ae394e1
fix(deps): update dependency scratch-l10n to v3.15.20230623032228 2023-06-23 07:43:49 +00:00
renovate[bot]
5a2aedc943
Merge pull request #7678 from scratchfoundation/renovate/scratch-gui-2.x
fix(deps): update dependency scratch-gui to v2.0.6
2023-06-22 18:01:30 +00:00
cori hudson
cc47f9b69c fix: add link to annual report in correct place 2023-06-22 13:47:38 -04:00
renovate[bot]
cbab0c6e59
fix(deps): update dependency scratch-gui to v2.0.6 2023-06-22 17:04:35 +00:00
renovate[bot]
22f90219e3
Merge pull request #7677 from scratchfoundation/renovate/scratch-l10n-3.x
fix(deps): update dependency scratch-l10n to v3.15.20230622032210
2023-06-22 06:24:53 +00:00
renovate[bot]
42527c1f1e
fix(deps): update dependency scratch-l10n to v3.15.20230622032210 2023-06-22 03:57:56 +00:00
renovate[bot]
639742de4d
Merge pull request #7676 from scratchfoundation/renovate/scratch-gui-2.x
fix(deps): update dependency scratch-gui to v2.0.4
2023-06-21 19:50:42 +00:00
renovate[bot]
ab69a7a775
fix(deps): update dependency scratch-gui to v2.0.4 2023-06-21 15:24:29 +00:00
renovate[bot]
a5ac8351a1
Merge pull request #7675 from scratchfoundation/renovate/scratch-l10n-3.x
fix(deps): update dependency scratch-l10n to v3.15.20230621032221
2023-06-21 10:39:31 +00:00
renovate[bot]
7a2c3449a7
fix(deps): update dependency scratch-l10n to v3.15.20230621032221 2023-06-21 06:22:01 +00:00
renovate[bot]
2b45938786
Merge pull request #7673 from scratchfoundation/renovate/scratch-gui-2.x
fix(deps): update dependency scratch-gui to v2.0.1
2023-06-21 06:21:21 +00:00
renovate[bot]
2a86b06e2b
fix(deps): update dependency scratch-gui to v2.0.1 2023-06-21 03:07:42 +00:00
Andy O'Neill
cec5d7d91d
Merge pull request #7674 from scratchfoundation/beta
Beta
2023-06-20 16:00:03 -04:00
Andy O'Neill
637890b7de Merge branch 'develop' into beta 2023-06-20 15:36:26 -04:00
renovate[bot]
2dd17ada93
Merge pull request #7672 from scratchfoundation/renovate/scratch-gui-1.x
fix(deps): update dependency scratch-gui to v1.9.11
2023-06-20 18:50:18 +00:00
Andy O'Neill
fcf696a635 Merge branch 'develop' into beta 2023-06-20 14:49:26 -04:00
renovate[bot]
8463ef00ee
fix(deps): update dependency scratch-gui to v1.9.11 2023-06-20 17:54:56 +00:00
Andy O'Neill
f2f2178e05 chore(deps): update to release scratch-www version 2023-06-20 13:49:06 -04:00
ckilroy
dda206b626 Merge remote-tracking branch 'origin/develop' into release/2023-06-20 2023-06-20 15:15:25 +00:00
cori hudson
1d916d4071
Merge pull request #7655 from corihudson/req-56-fix-annual-report-link
REQ-56: update annual report link
2023-06-20 10:28:46 -04:00
cori hudson
c155c4c609
Merge pull request #7648 from corihudson/req-59-team-page
REQ-59: fix ron and jess's entries on credits page
2023-06-20 10:28:21 -04:00
renovate[bot]
ad02c2396c
Merge pull request #7667 from scratchfoundation/renovate/scratch-gui-1.x
fix(deps): update dependency scratch-gui to v1.9.10
2023-06-20 13:32:30 +00:00
renovate[bot]
31beb44e20
fix(deps): update dependency scratch-gui to v1.9.10 2023-06-20 09:10:25 +00:00
renovate[bot]
b99b24e77c
Merge pull request #7666 from scratchfoundation/renovate/scratch-l10n-3.x
fix(deps): update dependency scratch-l10n to v3.15.20230620032154
2023-06-20 09:09:51 +00:00