Commit graph

11347 commits

Author SHA1 Message Date
Sarah Otts
0d07cf5c44
Merge pull request #6753 from seotts/annual-report-intl-file
Make /annual-report use localization file of 2020 report
2022-04-29 17:17:55 -04:00
caseymm
527003703c content alignment 2022-04-29 13:15:05 -07:00
caseymm
9a62939680 through scracth team on yt 2022-04-29 11:02:51 -07:00
caseymm
27e60171e4 timeline spacing 2022-04-29 10:12:00 -07:00
picklesrus
c681b4dac3
Merge pull request #6755 from picklesrus/banner-update
Update donate banner for Scratch celebration.
2022-04-29 09:45:38 -04:00
caseymm
ca5ed3e19c margins 2022-04-28 17:46:43 -07:00
caseymm
f403bee5ab tweaks 2022-04-28 17:28:15 -07:00
caseymm
c419ac71d3 some timeline work 2022-04-28 16:59:55 -07:00
picklesrus
0566724640 Make it start now and stop after may 21 2022-04-28 17:25:53 -04:00
picklesrus
29bbd5c720 Update donate banner for Scratch celebration. 2022-04-28 17:10:54 -04:00
caseymm
5ee959e185 images and aqua bg 2022-04-28 13:54:57 -07:00
seotts
c30f99c0da Add optional “intlName” route attribute for annual report 2022-04-28 14:31:07 -04:00
Tom Lum
5fdec8c1fa
Merge pull request #6749 from LLK/release/2022-04-27
[Develop] release/2022-04-27
2022-04-28 10:28:33 -04:00
Tom Lum
7bf3e20800
Merge pull request #6750 from LLK/release/2022-04-27
[Master] release/2022-04-27
2022-04-28 10:28:24 -04:00
renovate[bot]
55c52472cf
Merge pull request #6751 from LLK/renovate/scratch-l10n-3.x
chore(deps): update dependency scratch-l10n to v3.14.20220428031608
2022-04-28 06:21:23 +00:00
Renovate Bot
1abd8c9311
chore(deps): update dependency scratch-l10n to v3.14.20220428031608 2022-04-28 03:41:18 +00:00
caseymm
240d6c0c87 start working on sparkles 2022-04-27 12:18:50 -07:00
tomlum
491bef30ff Merge remote-tracking branch 'origin/develop' into release/2022-04-27 2022-04-27 18:04:04 +00:00
Sarah Otts
c641430fe3
Merge pull request #6748 from seotts/fix-placeholder
Change placeholder name in AR string
2022-04-27 10:38:08 -04:00
seotts
11be5ee3f7 Change placeholder name 2022-04-27 10:30:47 -04:00
Sarah Otts
51d8a182ff
Merge pull request #6738 from bocoup/2021-annual-report
2021 annual report (QA through map section)
2022-04-27 10:26:03 -04:00
renovate[bot]
734ae3ab36
Merge pull request #6747 from LLK/renovate/scratch-l10n-3.x
chore(deps): update dependency scratch-l10n to v3.14.20220427031558
2022-04-27 09:59:27 +00:00
Renovate Bot
c75c763a79
chore(deps): update dependency scratch-l10n to v3.14.20220427031558 2022-04-27 04:49:39 +00:00
Karishma Chadha
23181c0248
Merge pull request #6736 from LLK/renovate/scratch-l10n-3.x
chore(deps): update dependency scratch-l10n to v3.14.20220426031558
2022-04-26 18:13:30 -04:00
caseymm
7295ea98ef alignment through Volunteer Translators 2022-04-26 14:37:23 -07:00
Renovate Bot
ac8429d540
chore(deps): update dependency scratch-l10n to v3.14.20220426031558 2022-04-26 21:20:02 +00:00
renovate[bot]
6595c3803b
Merge pull request #6737 from LLK/renovate/scratch-gui-0.x
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20220426200048
2022-04-26 21:14:49 +00:00
Renovate Bot
67821cec6c
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20220426200048 2022-04-26 21:11:26 +00:00
Renovate Bot
ee2c14b9d8
chore(deps): update dependency async [security] 2022-04-26 21:10:33 +00:00
Karishma Chadha
e12bd10823
Merge pull request #5780 from LLK/renovate/babel-monorepo
chore(deps): update babel monorepo
2022-04-26 17:08:43 -04:00
Renovate Bot
eda111f8a6
chore(deps): update babel monorepo 2022-04-26 21:04:57 +00:00
caseymm
52f216ee98 work up to community 2022-04-26 11:47:25 -07:00
picklesrus
4d4a2f87b2
Merge pull request #6741 from picklesrus/update-image-link
Serve images from uploads instead of cdn2.
2022-04-26 12:55:04 -04:00
picklesrus
236bb6dea7
Merge pull request #6745 from picklesrus/banner-update
Add messages for scratch week banner so they can be translated.
2022-04-26 09:47:40 -04:00
caseymm
6c3dc25c11 work on fullshear spotlight story 2022-04-25 16:36:14 -07:00
picklesrus
3224d25a7e Add messages for scratch week banner so they can be translated. Banner changes coming in a later PR. 2022-04-25 16:40:16 -04:00
picklesrus
96650c3fe0 Serve images from uploads instead of cdn2. cdn2 redirects to uploads already anyway. 2022-04-21 14:54:41 -04:00
caseymm
4821a03baf through map section 2022-04-15 13:03:21 -07:00
caseymm
6279acb267 alignment through emerging themes 2022-04-15 12:57:26 -07:00
caseymm
4453edac93 through saudi arabia 2022-04-14 16:43:46 -07:00
Sarah Otts
e9abb0db4f
Merge pull request #6734 from LLK/release/2022-04-13
[Develop] release/2022-04-13
2022-04-14 10:41:23 -04:00
Sarah Otts
6b3e703960
Merge pull request #6735 from LLK/release/2022-04-13
[Master] release/2022-04-13
2022-04-14 10:26:12 -04:00
seotts
604238d1a0 Revert "Merge pull request #6731 from LLK/studios-rtl"
This reverts commit 830a2e3ebf, reversing
changes made to 1a2d1db3a1.
2022-04-13 16:17:49 -04:00
seotts
2a72ab4adc Merge remote-tracking branch 'origin/develop' into release/2022-04-13 2022-04-13 17:07:40 +00:00
Sarah Otts
34346d2806
Merge pull request #6725 from LLK/renovate/scratch-gui-0.x
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20220412150200
2022-04-13 13:00:03 -04:00
Christopher Willis-Ford
f9430ccb69 chore(deps): fix package-lock.json for scratch-gui@0.1.0-prerelease.20220412150200 2022-04-13 09:29:04 -07:00
Renovate Bot
bd07793176
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20220412150200 2022-04-13 16:15:57 +00:00
Christopher Willis-Ford
0a5503be62
Merge pull request #6726 from LLK/renovate/scratch-l10n-3.x
chore(deps): update dependency scratch-l10n to v3.14.20220412031641
2022-04-13 09:14:00 -07:00
Christopher Willis-Ford
4269be1dc0 chore(deps): fix package-lock.json 2022-04-13 09:07:04 -07:00
Renovate Bot
46afed1887
chore(deps): update dependency scratch-l10n to v3.14.20220412031641 2022-04-13 15:12:03 +00:00