Commit graph

11671 commits

Author SHA1 Message Date
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
renovate[bot]
030d5f5ee2
fix(deps): update dependency scratch-l10n to v3.15.20230620032154 2023-06-20 05:21:14 +00:00
renovate[bot]
6e63418cd0
Merge pull request #7665 from scratchfoundation/renovate/scratch-gui-1.x
fix(deps): update dependency scratch-gui to v1.9.9
2023-06-18 16:35:04 +00:00
renovate[bot]
20aafcf491
fix(deps): update dependency scratch-gui to v1.9.9 2023-06-18 13:58:08 +00:00
renovate[bot]
8e520cca15
Merge pull request #7664 from scratchfoundation/renovate/scratch-gui-1.x
fix(deps): update dependency scratch-gui to v1.9.8
2023-06-18 11:19:31 +00:00
renovate[bot]
45a152cb1f
fix(deps): update dependency scratch-gui to v1.9.8 2023-06-18 08:07:23 +00:00
renovate[bot]
4d7ea0abb3
Merge pull request #7663 from scratchfoundation/renovate/scratch-l10n-3.x
fix(deps): update dependency scratch-l10n to v3.15.20230618032152
2023-06-18 08:06:49 +00:00
renovate[bot]
2fe63bf4b9
fix(deps): update dependency scratch-l10n to v3.15.20230618032152 2023-06-18 03:29:57 +00:00
renovate[bot]
05f7f76242
Merge pull request #7662 from scratchfoundation/renovate/scratch-gui-1.x
fix(deps): update dependency scratch-gui to v1.9.7
2023-06-17 19:12:29 +00:00
renovate[bot]
20564e8ba5
fix(deps): update dependency scratch-gui to v1.9.7 2023-06-17 16:52:11 +00:00
renovate[bot]
c924016cae
Merge pull request #7661 from scratchfoundation/renovate/scratch-gui-1.x
fix(deps): update dependency scratch-gui to v1.9.6
2023-06-17 13:37:40 +00:00
renovate[bot]
21ec673de8
fix(deps): update dependency scratch-gui to v1.9.6 2023-06-17 09:28:28 +00:00
renovate[bot]
49613847f5
Merge pull request #7660 from scratchfoundation/renovate/scratch-l10n-3.x
fix(deps): update dependency scratch-l10n to v3.15.20230617032419
2023-06-17 09:27:55 +00:00
renovate[bot]
cab01eb9e7
fix(deps): update dependency scratch-l10n to v3.15.20230617032419 2023-06-17 06:43:06 +00:00
renovate[bot]
4b06720ef2
Merge pull request #7659 from scratchfoundation/renovate/scratch-gui-1.x
fix(deps): update dependency scratch-gui to v1.9.5
2023-06-16 17:37:20 +00:00
renovate[bot]
09c591cd1a
fix(deps): update dependency scratch-gui to v1.9.5 2023-06-16 14:31:04 +00:00
renovate[bot]
24571edf5f
Merge pull request #7658 from scratchfoundation/renovate/scratch-l10n-3.x
fix(deps): update dependency scratch-l10n to v3.15.20230616032229
2023-06-16 07:59:39 +00:00
renovate[bot]
1ec28b007d
fix(deps): update dependency scratch-l10n to v3.15.20230616032229 2023-06-16 03:41:32 +00:00
renovate[bot]
4040751fd2
Merge pull request #7657 from scratchfoundation/renovate/scratch-gui-1.x
fix(deps): update dependency scratch-gui to v1.9.3
2023-06-16 03:40:53 +00:00
renovate[bot]
1e457c46b9
fix(deps): update dependency scratch-gui to v1.9.3 2023-06-16 02:01:25 +00:00
cori hudson
8ff3932e7f fix(about): update annual report link
now points to the page on scratchfoundation.org
2023-06-15 10:56:50 -04:00
renovate[bot]
e871a53591
Merge pull request #7654 from scratchfoundation/renovate/scratch-gui-1.x
fix(deps): update dependency scratch-gui to v1.9.2
2023-06-15 14:19:38 +00:00
renovate[bot]
832424bf86
fix(deps): update dependency scratch-gui to v1.9.2 2023-06-15 09:06:26 +00:00
renovate[bot]
c715d02ead
Merge pull request #7653 from scratchfoundation/renovate/scratch-l10n-3.x
fix(deps): update dependency scratch-l10n to v3.15.20230615032202
2023-06-15 09:05:51 +00:00
renovate[bot]
448a3ea5e9
fix(deps): update dependency scratch-l10n to v3.15.20230615032202 2023-06-15 03:24:06 +00:00
renovate[bot]
29e384cca5
Merge pull request #7652 from scratchfoundation/renovate/scratch-gui-1.x
feat(deps): update dependency scratch-gui to v1.9.1
2023-06-15 01:23:29 +00:00
renovate[bot]
22489cef7c
feat(deps): update dependency scratch-gui to v1.9.1 2023-06-14 23:00:57 +00:00
renovate[bot]
1d83d97572
Merge pull request #7651 from scratchfoundation/renovate/scratch-l10n-3.x
fix(deps): update dependency scratch-l10n to v3.15.20230614032217
2023-06-14 07:36:25 +00:00
renovate[bot]
a5cdbe76ed
fix(deps): update dependency scratch-l10n to v3.15.20230614032217 2023-06-14 03:54:27 +00:00
cori hudson
c088f71b3a fix(credits page): fix ron and jess's entries on credits page
fixes incorrectly swapped userName and name fields, also realphabetizes people.json
2023-06-13 09:53:13 -04:00
renovate[bot]
b04209d585
Merge pull request #7647 from scratchfoundation/renovate/scratch-l10n-3.x
fix(deps): update dependency scratch-l10n to v3.15.20230612032227
2023-06-12 23:03:52 +00:00
renovate[bot]
4129f91bbd
fix(deps): update dependency scratch-l10n to v3.15.20230612032227 2023-06-12 18:23:32 +00:00
Christopher Willis-Ford
fd4e4c2305 build: fix GTM_ENV_AUTH escaping 2023-06-12 09:11:51 -07:00
Christopher Willis-Ford
f2de55b5ff
Merge pull request #7642 from cwillisf/enable-gtm-environments
build: enable GTM environments feature
2023-06-12 08:52:03 -07:00
Andy O'Neill
3970ff4514
Merge pull request #7638 from scratchfoundation/release/2023-06-05
[Develop] release/2023-06-05
2023-06-08 11:58:55 -04:00
Andy O'Neill
ec161205ef
Merge pull request #7639 from scratchfoundation/release/2023-06-05
[Master] release/2023-06-05
2023-06-08 10:22:09 -04:00
renovate[bot]
c342f5966c
Merge pull request #7644 from scratchfoundation/renovate/scratch-gui-1.x
fix(deps): update dependency scratch-gui to v1.8.109
2023-06-07 15:38:39 +00:00
renovate[bot]
3d69b05387
fix(deps): update dependency scratch-gui to v1.8.109 2023-06-07 09:49:38 +00:00
renovate[bot]
65f03360d8
Merge pull request #7643 from scratchfoundation/renovate/scratch-l10n-3.x
fix(deps): update dependency scratch-l10n to v3.15.20230607032205
2023-06-07 09:48:57 +00:00
renovate[bot]
b5f835c9ab
fix(deps): update dependency scratch-l10n to v3.15.20230607032205 2023-06-07 07:10:38 +00:00
Christopher Willis-Ford
7d358a67af build: enable GTM environments feature
- Document all GA/GTM-related variables in `template-config.js`
- Add `gtm_env_auth` variable (from `GTM_ENV_AUTH` environment variable)
  to enable alternative GTM environments

This will let us test new GTM configurations in staging without sending
the data to our production data stream.
2023-06-06 14:31:16 -07:00
renovate[bot]
097acfe625
Merge pull request #7641 from scratchfoundation/renovate/scratch-gui-1.x
fix(deps): update dependency scratch-gui to v1.8.108
2023-06-06 14:19:10 +00:00
renovate[bot]
b0fdd5fa13
fix(deps): update dependency scratch-gui to v1.8.108 2023-06-06 11:03:31 +00:00
renovate[bot]
2b065c7a44
Merge pull request #7640 from scratchfoundation/renovate/scratch-l10n-3.x
fix(deps): update dependency scratch-l10n to v3.15.20230606032220
2023-06-06 07:07:01 +00:00
renovate[bot]
cec6eccc04
fix(deps): update dependency scratch-l10n to v3.15.20230606032220 2023-06-06 04:06:29 +00:00