renovate[bot]
b743f6fc3b
Merge pull request #7706 from scratchfoundation/renovate/scratch-l10n-3.x
...
fix(deps): update dependency scratch-l10n to v3.15.20230701032155
2023-07-01 12:58:45 +00:00
renovate[bot]
95d4dbbe5e
fix(deps): update dependency scratch-l10n to v3.15.20230701032155
2023-07-01 11:45:15 +00:00
renovate[bot]
0dbf4e8654
Merge pull request #7705 from scratchfoundation/renovate/scratch-gui-2.x
...
fix(deps): update dependency scratch-gui to v2.0.23
2023-06-30 22:33:44 +00:00
renovate[bot]
dee35cfc48
fix(deps): update dependency scratch-gui to v2.0.23
2023-06-30 19:31:16 +00:00
Christopher Willis-Ford
a625e37d9f
Merge branch 'master' into develop
2023-06-30 12:30:01 -07:00
Christopher Willis-Ford
a1fd3c9466
Merge pull request #7704 from scratchfoundation/hotfix/ga4
...
hotfix for GA4
2023-06-30 11:25:52 -07:00
renovate[bot]
081899f46b
fix(deps): update dependency scratch-gui to v2.0.22
2023-06-30 10:18:56 -07:00
Christopher Willis-Ford
f6953b7185
test: fix join flow analytics test for GTM/GA4
2023-06-30 10:18:56 -07:00
Christopher Willis-Ford
60c81e5435
chore: replace UA with GA4 through GTM
2023-06-30 10:18:56 -07:00
renovate[bot]
366e4a9301
Merge pull request #7703 from scratchfoundation/renovate/scratch-gui-2.x
...
fix(deps): update dependency scratch-gui to v2.0.22
2023-06-30 16:58:59 +00:00
renovate[bot]
f06b86e3d5
fix(deps): update dependency scratch-gui to v2.0.22
2023-06-30 16:53:29 +00:00
Christopher Willis-Ford
62326c3aa7
Merge pull request #7702 from scratchfoundation/ga4-events
...
chore: replace UA with GA4 through GTM
2023-06-30 09:52:44 -07:00
Christopher Willis-Ford
233049d0a3
test: fix join flow analytics test for GTM/GA4
2023-06-30 08:53:01 -07:00
Christopher Willis-Ford
84fab48560
chore: replace UA with GA4 through GTM
2023-06-30 08:52:55 -07:00
renovate[bot]
763e203b69
Merge pull request #7701 from scratchfoundation/renovate/scratch-gui-2.x
...
fix(deps): update dependency scratch-gui to v2.0.20
2023-06-30 11:09:09 +00:00
renovate[bot]
3f4277d7cd
fix(deps): update dependency scratch-gui to v2.0.20
2023-06-30 07:08:33 +00:00
renovate[bot]
a2feed1fe3
Merge pull request #7700 from scratchfoundation/renovate/scratch-l10n-3.x
...
fix(deps): update dependency scratch-l10n to v3.15.20230630032209
2023-06-30 07:08:02 +00:00
renovate[bot]
92b6e6240a
fix(deps): update dependency scratch-l10n to v3.15.20230630032209
2023-06-30 05:00:46 +00:00
renovate[bot]
0af8d9be44
Merge pull request #7699 from scratchfoundation/renovate/scratch-gui-2.x
...
fix(deps): update dependency scratch-gui to v2.0.19
2023-06-29 21:04:32 +00:00
renovate[bot]
678f0015bd
fix(deps): update dependency scratch-gui to v2.0.19
2023-06-29 19:59:06 +00:00
renovate[bot]
8196f86390
Merge pull request #7696 from scratchfoundation/renovate/scratch-gui-2.x
...
fix(deps): update dependency scratch-gui to v2.0.18
2023-06-29 17:00:42 +00:00
renovate[bot]
e3b6cf4df1
fix(deps): update dependency scratch-gui to v2.0.18
2023-06-29 14:26:02 +00:00
Andy O'Neill
fb6fd91b24
Merge pull request #7693 from mrsrec/patch-1
...
Update cookies.jsx
2023-06-29 10:25:17 -04:00
renovate[bot]
5a9f0a9a6f
Merge pull request #7695 from scratchfoundation/renovate/scratch-gui-2.x
...
fix(deps): update dependency scratch-gui to v2.0.17
2023-06-29 12:46:53 +00:00
renovate[bot]
edc8e56636
fix(deps): update dependency scratch-gui to v2.0.17
2023-06-29 10:58:42 +00:00
renovate[bot]
bc438b4260
Merge pull request #7694 from scratchfoundation/renovate/scratch-l10n-3.x
...
fix(deps): update dependency scratch-l10n to v3.15.20230629032156
2023-06-29 10:58:11 +00:00
renovate[bot]
3bf0385cbc
fix(deps): update dependency scratch-l10n to v3.15.20230629032156
2023-06-29 07:16:36 +00:00
mrsrec
24dac1f94b
Update cookies.jsx
...
* Updates incorrect info in cookie page (scratchsessionid -> scratchsessionsid; session -> 2 weeks)
* Sets "last updated" date to July 6 by request of @aoneill01
2023-06-28 19:44:57 -04:00
renovate[bot]
384bc4f40e
Merge pull request #7692 from scratchfoundation/renovate/scratch-gui-2.x
...
fix(deps): update dependency scratch-gui to v2.0.16
2023-06-28 21:18:22 +00:00
renovate[bot]
3296d13469
fix(deps): update dependency scratch-gui to v2.0.16
2023-06-28 20:37:49 +00:00
renovate[bot]
003c373263
Merge pull request #7691 from scratchfoundation/renovate/scratch-gui-2.x
...
fix(deps): update dependency scratch-gui to v2.0.15
2023-06-28 14:11:47 +00:00
Andy O'Neill
140b3fd755
Merge pull request #7686 from scratchfoundation/release/2023-06-27
...
[Develop] release/2023-06-27
2023-06-28 10:10:53 -04:00
renovate[bot]
0e2b37c23e
fix(deps): update dependency scratch-gui to v2.0.15
2023-06-28 13:30:22 +00:00
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
