Commit graph

11984 commits

Author SHA1 Message Date
Christopher Willis-Ford
3a4c0c38bc Merge branch 'develop' into scratch-link-2.0-mac-release 2023-07-27 07:44:40 -07:00
Christopher Willis-Ford
da5ad7c190 chore(lint): fix lint issue in bad-username-splash.jsx 2023-07-27 07:44:12 -07:00
Christopher Willis-Ford
0ebd9a9245 Merge branch 'develop' into scratch-link-2.0-mac-release 2023-07-27 07:29:37 -07:00
Tom Lum
faf84d0cfa
Merge pull request #7762 from scratchfoundation/revert-7759-FAR-Revert
Revert "revert FAR"
2023-07-26 13:23:12 -04:00
Tom Lum
e6153740b7
Revert "revert FAR" 2023-07-26 13:10:49 -04:00
Ron de las Alas
5b190b3acd
Merge pull request #7760 from scratchfoundation/release/2023-07-25
[Develop] release/2023-07-25
2023-07-26 10:32:40 -04:00
Ron de las Alas
3dd06703c9
Merge pull request #7761 from scratchfoundation/release/2023-07-25
[Master] release/2023-07-25
2023-07-26 10:24:50 -04:00
renovate[bot]
f60c990478
Merge pull request #7755 from scratchfoundation/renovate/scratch-gui-2.x
fix(deps): update dependency scratch-gui to v2.0.78
2023-07-25 17:11:34 +00:00
delasare
7426e1d96c Merge remote-tracking branch 'origin/develop' into release/2023-07-25 2023-07-25 17:11:15 +00:00
renovate[bot]
62e6c75608
fix(deps): update dependency scratch-gui to v2.0.78 2023-07-25 15:19:59 +00:00
Tom Lum
ddc63f11f8
Merge pull request #7759 from scratchfoundation/FAR-Revert
revert FAR
2023-07-25 11:19:17 -04:00
tomlum
3d607cdb3b revert FAR 2023-07-25 11:11:09 -04:00
Tom Lum
4b81f7dd70
Merge pull request #7756 from scratchfoundation/far-style-fixes
far style fixes
2023-07-18 16:06:14 -04:00
tomlum
bfb7c0e06c far style fixes 2023-07-18 16:05:42 -04:00
Ron de las Alas
00a1498432
Merge pull request #7752 from scratchfoundation/renovate/scratch-gui-2.x
fix(deps): update dependency scratch-gui to v2.0.77
2023-07-18 10:49:10 -04:00
renovate[bot]
8f72fcd332
fix(deps): update dependency scratch-gui to v2.0.77 2023-07-18 14:44:47 +00:00
Ron de las Alas
8930f05a0f
Merge pull request #7751 from scratchfoundation/renovate/scratch-gui-2.x
fix(deps): update dependency scratch-gui to v2.0.76
2023-07-18 10:44:02 -04:00
renovate[bot]
69b2d80925
fix(deps): update dependency scratch-gui to v2.0.76 2023-07-18 13:35:49 +00:00
renovate[bot]
111e96d547
Merge pull request #7750 from scratchfoundation/renovate/scratch-l10n-3.x
fix(deps): update dependency scratch-l10n to v3.15.20230718032211
2023-07-18 06:28:28 +00:00
renovate[bot]
2bcd34918e
fix(deps): update dependency scratch-l10n to v3.15.20230718032211 2023-07-18 05:09:17 +00:00
renovate[bot]
4d59ee4a26
Merge pull request #7748 from scratchfoundation/renovate/scratch-gui-2.x
fix(deps): update dependency scratch-gui to v2.0.75
2023-07-17 23:02:59 +00:00
renovate[bot]
4a7d052194
fix(deps): update dependency scratch-gui to v2.0.75 2023-07-17 20:14:27 +00:00
Christopher Willis-Ford
b4000c9a8f
Merge pull request #7738 from mrsrec/patch-2
LLK -> scratchfoundation
2023-07-17 08:21:39 -07:00
Christopher Willis-Ford
5a26da9bd3
Merge pull request #7739 from cwillisf/scratch-link-2.0-prep
Scratch link 2.0 prep
2023-07-17 07:43:14 -07:00
Christopher Willis-Ford
d5ce8aa542 fix: remove EV3 info from Scratch Link page
Based on feedback from Kevin B
2023-07-17 07:33:54 -07:00
renovate[bot]
5e706d0b2d
Merge pull request #7749 from scratchfoundation/renovate/scratch-l10n-3.x
fix(deps): update dependency scratch-l10n to v3.15.20230717032228
2023-07-17 10:04:45 +00:00
renovate[bot]
3b7e9c3a60
fix(deps): update dependency scratch-l10n to v3.15.20230717032228 2023-07-17 08:08:24 +00:00
renovate[bot]
71939696d3
Merge pull request #7747 from scratchfoundation/renovate/scratch-gui-2.x
fix(deps): update dependency scratch-gui to v2.0.71
2023-07-15 00:18:36 +00:00
renovate[bot]
35bc1a4d43
fix(deps): update dependency scratch-gui to v2.0.71 2023-07-14 21:41:54 +00:00
renovate[bot]
287b991312
Merge pull request #7746 from scratchfoundation/renovate/scratch-gui-2.x
fix(deps): update dependency scratch-gui to v2.0.69
2023-07-14 15:36:50 +00:00
renovate[bot]
bda6ee93df
fix(deps): update dependency scratch-gui to v2.0.69 2023-07-14 14:13:04 +00:00
renovate[bot]
6c1b0fb28b
Merge pull request #7745 from scratchfoundation/renovate/scratch-gui-2.x
fix(deps): update dependency scratch-gui to v2.0.68
2023-07-14 09:51:02 +00:00
renovate[bot]
c45233cdd9
fix(deps): update dependency scratch-gui to v2.0.68 2023-07-14 06:59:49 +00:00
renovate[bot]
7a544d4fce
Merge pull request #7744 from scratchfoundation/renovate/scratch-l10n-3.x
fix(deps): update dependency scratch-l10n to v3.15.20230714032252
2023-07-14 06:59:18 +00:00
renovate[bot]
b80cdf2518
fix(deps): update dependency scratch-l10n to v3.15.20230714032252 2023-07-14 04:30:37 +00:00
renovate[bot]
deda466b14
Merge pull request #7743 from scratchfoundation/renovate/scratch-gui-2.x
fix(deps): update dependency scratch-gui to v2.0.67
2023-07-14 00:58:24 +00:00
renovate[bot]
9f679cf124
fix(deps): update dependency scratch-gui to v2.0.67 2023-07-13 22:53:23 +00:00
renovate[bot]
caedaa514f
Merge pull request #7740 from scratchfoundation/renovate/scratch-l10n-3.x
fix(deps): update dependency scratch-l10n to v3.15.20230713032224
2023-07-13 18:38:22 +00:00
renovate[bot]
0749e0a096
fix(deps): update dependency scratch-l10n to v3.15.20230713032224 2023-07-13 16:37:39 +00:00
renovate[bot]
8ca1c7df6d
Merge pull request #7741 from scratchfoundation/renovate/scratch-gui-2.x
fix(deps): update dependency scratch-gui to v2.0.65
2023-07-13 16:37:04 +00:00
renovate[bot]
dc96eb1c60
fix(deps): update dependency scratch-gui to v2.0.65 2023-07-13 14:40:19 +00:00
Tom Lum
2d11733ac2
Merge pull request #7742 from scratchfoundation/far-lint-fixes
far lint fixes
2023-07-13 10:39:32 -04:00
tomlum
d21ebc5c56 indent fix 2023-07-13 10:34:42 -04:00
tomlum
4d73900c77 far lint fixes 2023-07-13 10:11:55 -04:00
Tom Lum
daa12e193d
Merge pull request #7656 from scratchfoundation/force-account-rename
Force Account Rename
2023-07-12 18:24:21 -04:00
Christopher Willis-Ford
5af85a596f fix: update browser compatibility text for Scratch Link 2.0 2023-07-12 15:21:05 -07:00
Christopher Willis-Ford
2935d7dd01 fix: move EV3 troubleshooting into troubleshooting section 2023-07-12 15:21:00 -07:00
tomlum
c276e006ff updates design and fixes redux issues 2023-07-12 17:01:45 -04:00
renovate[bot]
4bcb55c21d
Merge pull request #7737 from scratchfoundation/renovate/scratch-gui-2.x
fix(deps): update dependency scratch-gui to v2.0.63
2023-07-12 20:05:51 +00:00
mrsrec
9e2c5b27c2
Update download.jsx 2023-07-12 12:12:55 -04:00