Commit graph

12311 commits

Author SHA1 Message Date
Christopher Willis-Ford
bf1755043d
Merge pull request #7769 from scratchfoundation/release/2023-08-01
[Master] release/2023-08-01
2023-08-03 10:36:38 -07:00
Tom Lum
2b47139208
Revert "Revert "Merge pull request #7762 from scratchfoundation/revert-7759-F…" 2023-08-03 13:00:31 -04:00
renovate[bot]
85c80718d8
Merge pull request #7775 from scratchfoundation/renovate/scratch-gui-2.x
fix(deps): update dependency scratch-gui to v2.0.85
2023-08-03 16:35:20 +00:00
renovate[bot]
9dd80e8db0
fix(deps): update dependency scratch-gui to v2.0.85 2023-08-03 14:25:48 +00:00
renovate[bot]
b837ec2b87
Merge pull request #7774 from scratchfoundation/renovate/scratch-l10n-3.x
fix(deps): update dependency scratch-l10n to v3.15.20230803032217
2023-08-03 08:29:25 +00:00
renovate[bot]
0329925179
fix(deps): update dependency scratch-l10n to v3.15.20230803032217 2023-08-03 03:59:43 +00:00
renovate[bot]
38925df792
Merge pull request #7773 from scratchfoundation/renovate/scratch-gui-2.x
fix(deps): update dependency scratch-gui to v2.0.83
2023-08-02 20:14:58 +00:00
renovate[bot]
29d732504f
fix(deps): update dependency scratch-gui to v2.0.83 2023-08-02 15:05:48 +00:00
renovate[bot]
87a6f32dc8
Merge pull request #7772 from scratchfoundation/renovate/scratch-gui-2.x
fix(deps): update dependency scratch-gui to v2.0.82
2023-08-02 12:58:59 +00:00
renovate[bot]
511a15940b
fix(deps): update dependency scratch-gui to v2.0.82 2023-08-02 10:57:41 +00:00
renovate[bot]
2f363f560e
Merge pull request #7771 from scratchfoundation/renovate/scratch-l10n-3.x
fix(deps): update dependency scratch-l10n to v3.15.20230802032213
2023-08-02 06:47:15 +00:00
Christopher Willis-Ford
abe61b29aa Merge branch 'develop' into release/2023-08-01 2023-08-01 22:12:48 -07:00
renovate[bot]
d3076d8bf7
fix(deps): update dependency scratch-l10n to v3.15.20230802032213 2023-08-02 03:59:22 +00:00
Tom Lum
40f5fe85ed
Merge pull request #7770 from scratchfoundation/revert-far
Revert "Merge pull request #7762 from scratchfoundation/revert-7759-F…
2023-08-01 17:00:40 -04:00
tomlum
723cc24c9a removes bad-username-splash 2023-08-01 14:49:31 -04:00
tomlum
2557f57272 Revert "Merge pull request #7762 from scratchfoundation/revert-7759-FAR-Revert"
This reverts commit faf84d0cfa, reversing
changes made to 5b190b3acd.
2023-08-01 14:32:02 -04:00
cwillisf
7d53c65993 Merge remote-tracking branch 'origin/develop' into release/2023-08-01 2023-08-01 16:04:51 +00:00
Christopher Willis-Ford
c8102b3476
Merge pull request #7766 from scratchfoundation/renovate/scratch-gui-2.x
fix(deps): update dependency scratch-gui to v2.0.80
2023-08-01 08:45:07 -07:00
renovate[bot]
596e0e8ff9
fix(deps): update dependency scratch-gui to v2.0.80 2023-08-01 15:18:19 +00:00
Christopher Willis-Ford
62ee1f50c9 chore(deps): revert to chromedriver@^114 to fix SauceLabs
As of this commit, SauceLabs doesn't have Chrome 115 yet.
2023-08-01 08:17:08 -07:00
Christopher Willis-Ford
90b2128eb6
Merge pull request #7763 from scratchfoundation/renovate/chromedriver-115.x
chore(deps): update dependency chromedriver to v115
2023-08-01 07:56:22 -07:00
renovate[bot]
ca437e7496
Merge pull request #7765 from scratchfoundation/renovate/scratch-l10n-3.x
fix(deps): update dependency scratch-l10n to v3.15.20230801032207
2023-08-01 09:28:16 +00:00
renovate[bot]
6bd5f79a94
fix(deps): update dependency scratch-l10n to v3.15.20230801032207 2023-08-01 08:01:14 +00:00
Christopher Willis-Ford
06af1a04a2
Merge pull request #7764 from cwillisf/move-running-check-to-troubleshooting
fix: move the 'if Scratch Link is not running' advice into the Troubleshooting section
2023-07-31 12:20:20 -07:00
Christopher Willis-Ford
4491d985fc fix: move the 'if Scratch Link is not running' advice into the Troubleshooting section 2023-07-31 11:31:34 -07:00
renovate[bot]
3879ba66ab
chore(deps): update dependency chromedriver to v115 2023-07-28 00:25:02 +00:00
Christopher Willis-Ford
45c49d2656
Merge pull request #7345 from cwillisf/scratch-link-2.0-mac-release
feat: prepare for Scratch Link 2.0 macOS release
2023-07-27 07:53:57 -07:00
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