Commit graph

10507 commits

Author SHA1 Message Date
cwillisf
0a67f10fce Merge remote-tracking branch 'origin/develop' into release/2022-07-06 2022-07-06 18:39:56 +00:00
Christopher Willis-Ford
93e77d9378
Merge pull request #6902 from LLK/update-scratch-gui-20220706173215
chore(deps):update dependency scratch-gui to 0.1.0-prerelease.20220706173215
2022-07-06 11:05:51 -07:00
Christopher Willis-Ford
6a31761852 chore(deps):update dependency scratch-gui to 0.1.0-prerelease.20220706173215 2022-07-06 10:59:45 -07:00
renovate[bot]
c273334661
Merge pull request #6899 from LLK/renovate/scratch-l10n-3.x
chore(deps): update dependency scratch-l10n to v3.14.20220703031542
2022-07-03 05:37:11 +00:00
renovate[bot]
5244d4a9e6
chore(deps): update dependency scratch-l10n to v3.14.20220703031542 2022-07-03 04:11:27 +00:00
Tom Lum
f644c553f0
Merge pull request #6869 from LLK/release/2022-06-08
[Master] release/2022-06-08
2022-06-30 10:21:05 -04:00
Tom Lum
d02d62f661
Merge pull request #6868 from LLK/release/2022-06-08
[Develop] release/2022-06-08
2022-06-30 10:20:37 -04:00
renovate[bot]
ae15833ebf
Merge pull request #6896 from LLK/renovate/scratch-l10n-3.x
chore(deps): update dependency scratch-l10n to v3.14.20220630031554
2022-06-30 11:00:59 +00:00
renovate[bot]
d98b2996f3
chore(deps): update dependency scratch-l10n to v3.14.20220630031554 2022-06-30 04:34:42 +00:00
Benjamin Wheeler
c60ac9677d
Merge pull request #6895 from benjiwheeler/fix-footer-links-test
fixed test for conference link; changed footer link to not involve redirect
2022-06-29 14:00:44 -04:00
Ben Wheeler
d9d4b03261 fixed test for conference link; changed footer link to not involve redirect 2022-06-29 12:17:08 -04:00
Ben Wheeler
b2b521befc removed ray, carl, karishma, bryce, katelyn, sarah. <3 <3 <3 2022-06-29 09:51:02 -04:00
Benjamin Wheeler
102d682627
Merge pull request #6876 from benjiwheeler/redirect-conference
redirect conference 2022 routes to https://www.scratchfoundation.org/scratch-conference
2022-06-29 09:40:48 -04:00
renovate[bot]
b41c5d62f3
Merge pull request #6892 from LLK/renovate/scratch-l10n-3.x
chore(deps): update dependency scratch-l10n to v3.14.20220627031548
2022-06-27 10:59:57 +00:00
renovate[bot]
78914390d4
chore(deps): update dependency scratch-l10n to v3.14.20220627031548 2022-06-27 04:43:05 +00:00
renovate[bot]
ddf5687205
Merge pull request #6891 from LLK/renovate/scratch-l10n-3.x
chore(deps): update dependency scratch-l10n to v3.14.20220626031605
2022-06-26 06:43:34 +00:00
renovate[bot]
999189039c
chore(deps): update dependency scratch-l10n to v3.14.20220626031605 2022-06-26 04:09:09 +00:00
renovate[bot]
8eff62011f
Merge pull request #6889 from LLK/renovate/scratch-l10n-3.x
chore(deps): update dependency scratch-l10n to v3.14.20220623031547
2022-06-23 12:01:20 +00:00
renovate[bot]
13b14f4998
chore(deps): update dependency scratch-l10n to v3.14.20220623031547 2022-06-23 04:22:59 +00:00
renovate[bot]
d1da3c9933
Merge pull request #6886 from LLK/renovate/scratch-l10n-3.x
chore(deps): update dependency scratch-l10n to v3.14.20220622031552
2022-06-22 11:31:41 +00:00
renovate[bot]
1eb9155bd6
chore(deps): update dependency scratch-l10n to v3.14.20220622031552 2022-06-22 04:21:19 +00:00
renovate[bot]
bf7514edcb
Merge pull request #6885 from LLK/renovate/scratch-gui-0.x
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20220620170924
2022-06-20 21:09:20 +00:00
renovate[bot]
c3fc62c7cd
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20220620170924 2022-06-20 17:31:19 +00:00
renovate[bot]
ae089b8c30
Merge pull request #6884 from LLK/renovate/scratch-l10n-3.x
chore(deps): update dependency scratch-l10n to v3.14.20220620031537
2022-06-20 06:44:02 +00:00
renovate[bot]
b14fc5ef3c
chore(deps): update dependency scratch-l10n to v3.14.20220620031537 2022-06-20 03:53:26 +00:00
renovate[bot]
5d75b20b48
Merge pull request #6883 from LLK/renovate/scratch-gui-0.x
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20220619155915
2022-06-19 19:47:47 +00:00
renovate[bot]
04cabe1517
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20220619155915 2022-06-19 16:22:35 +00:00
renovate[bot]
ae4c376f15
Merge pull request #6882 from LLK/renovate/scratch-gui-0.x
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20220619062806
2022-06-19 13:52:51 +00:00
renovate[bot]
8b4ec4e6ad
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20220619062806 2022-06-19 11:25:38 +00:00
renovate[bot]
a06ed3c609
Merge pull request #6881 from LLK/renovate/scratch-l10n-3.x
chore(deps): update dependency scratch-l10n to v3.14.20220619031537
2022-06-19 11:23:36 +00:00
renovate[bot]
08009124d3
chore(deps): update dependency scratch-l10n to v3.14.20220619031537 2022-06-19 05:44:35 +00:00
renovate[bot]
e5e89d726c
Merge pull request #6880 from LLK/renovate/scratch-gui-0.x
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20220618062317
2022-06-18 21:17:35 +00:00
renovate[bot]
9529bbec59
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20220618062317 2022-06-18 10:50:36 +00:00
renovate[bot]
26c2bdaf24
Merge pull request #6879 from LLK/renovate/scratch-l10n-3.x
chore(deps): update dependency scratch-l10n to v3.14.20220618031520
2022-06-18 10:48:40 +00:00
renovate[bot]
084e55b666
chore(deps): update dependency scratch-l10n to v3.14.20220618031520 2022-06-18 05:11:05 +00:00
Ben Wheeler
6fdc5ce09e removed conference 2022 files 2022-06-13 12:11:55 -04:00
renovate[bot]
bc9936535c
Merge pull request #6873 from LLK/renovate/scratch-gui-0.x
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20220609213736
2022-06-10 05:28:07 +00:00
Renovate Bot
04591c1b93
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20220609213736 2022-06-10 00:34:12 +00:00
Ben Wheeler
54b6744599 redirect conference 2022 routes to redirect: https://www.scratchfoundation.org/scratch-conference 2022-06-09 19:14:37 -04:00
renovate[bot]
335e9ee20e
Merge pull request #6872 from LLK/renovate/scratch-l10n-3.x
chore(deps): update dependency scratch-l10n to v3.14.20220609031618
2022-06-09 15:59:05 +00:00
Renovate Bot
195c0d6ee3
chore(deps): update dependency scratch-l10n to v3.14.20220609031618 2022-06-09 15:55:48 +00:00
renovate[bot]
75b4c0b5fa
Merge pull request #6871 from LLK/renovate/scratch-gui-0.x
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20220609025020
2022-06-09 15:53:43 +00:00
Renovate Bot
4feb421de7
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20220609025020 2022-06-09 06:34:54 +00:00
renovate[bot]
54d7dd62a7
Merge pull request #6870 from LLK/renovate/scratch-gui-0.x
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20220608190058
2022-06-09 02:25:53 +00:00
Renovate Bot
c4968797c1
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20220608190058 2022-06-08 22:52:08 +00:00
renovate[bot]
ba29844c3a
Merge pull request #6866 from LLK/renovate/scratch-l10n-3.x
chore(deps): update dependency scratch-l10n to v3.14.20220608122422
2022-06-08 22:50:23 +00:00
Renovate Bot
b3af8b6a53
chore(deps): update dependency scratch-l10n to v3.14.20220608122422 2022-06-08 18:41:50 +00:00
picklesrus
cc229a28f1 Merge remote-tracking branch 'origin/develop' into release/2022-06-08 2022-06-08 17:35:48 +00:00
picklesrus
1ef6705803
Merge pull request #6711 from LLK/renovate/npm-ansi-regex-vulnerability
chore(deps): update dependency ansi-regex [security]
2022-06-08 10:41:21 -04:00
Benjamin Wheeler
bac1e17d86
Merge pull request #6648 from mxmou/studio-comments-responsive
Fix studio comment issues on narrow screens
2022-06-08 10:39:52 -04:00