Commit graph

11467 commits

Author SHA1 Message Date
Renovate Bot
f4f4d644e8
chore(deps): update dependency scratch-l10n to v3.14.20220515031551 2022-05-15 05:08:02 +00:00
renovate[bot]
d0ed7296e4
Merge pull request #6798 from LLK/renovate/scratch-gui-0.x
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20220514183855
2022-05-14 22:14:04 +00:00
Renovate Bot
17fcc303ca
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20220514183855 2022-05-14 19:53:28 +00:00
renovate[bot]
9ded236719
Merge pull request #6797 from LLK/renovate/scratch-gui-0.x
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20220514054733
2022-05-14 13:22:14 +00:00
Renovate Bot
ce51cff801
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20220514054733 2022-05-14 10:14:17 +00:00
renovate[bot]
137d2f154f
Merge pull request #6796 from LLK/renovate/scratch-l10n-3.x
chore(deps): update dependency scratch-l10n to v3.14.20220514031546
2022-05-14 10:12:19 +00:00
Renovate Bot
718e86a28e
chore(deps): update dependency scratch-l10n to v3.14.20220514031546 2022-05-14 04:59:35 +00:00
renovate[bot]
2c3067ede8
Merge pull request #6795 from LLK/renovate/scratch-gui-0.x
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20220513195427
2022-05-13 23:37:19 +00:00
Renovate Bot
e446792446
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20220513195427 2022-05-13 20:29:07 +00:00
tomlum
97d7b00fc5 fixes package lock 2022-05-13 15:35:40 -04:00
tomlum
85c61d5478 fixes packagelock merge conflicts 2022-05-13 15:18:28 -04:00
tomlum
c4231fd178 Merge branch 'master' of https://github.com/LLK/scratch-www into send-fastly-token-to-gui 2022-05-13 14:58:33 -04:00
tomlum
09a2832215 renames getprojectdata to loadprojectdata 2022-05-13 14:51:52 -04:00
renovate[bot]
dbb124fdb1
Merge pull request #6794 from LLK/renovate/scratch-l10n-3.x
chore(deps): update dependency scratch-l10n to v3.14.20220513031553
2022-05-13 11:16:39 +00:00
Renovate Bot
cc91845c1f
chore(deps): update dependency scratch-l10n to v3.14.20220513031553 2022-05-13 05:25:39 +00:00
renovate[bot]
b22a8bfec3
Merge pull request #6793 from LLK/renovate/scratch-gui-0.x
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20220512195354
2022-05-12 23:12:09 +00:00
Renovate Bot
01391b25c8
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20220512195354 2022-05-12 20:57:11 +00:00
Sarah Otts
b79d46c7e5
Merge pull request #6789 from LLK/release/2022-05-11
[Develop] release/2022-05-11
2022-05-12 10:40:55 -04:00
Sarah Otts
edcea6b26e
Merge pull request #6790 from LLK/release/2022-05-11
[Master] release/2022-05-11
2022-05-12 10:30:16 -04:00
renovate[bot]
570ab3c865
Merge pull request #6791 from LLK/renovate/scratch-gui-0.x
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20220512062521
2022-05-12 09:35:04 +00:00
Renovate Bot
9c3d80dfb9
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20220512062521 2022-05-12 09:31:58 +00:00
renovate[bot]
596a747d3e
Merge pull request #6792 from LLK/renovate/scratch-l10n-3.x
chore(deps): update dependency scratch-l10n to v3.14.20220512031601
2022-05-12 09:29:45 +00:00
Renovate Bot
596bf3a7c3
chore(deps): update dependency scratch-l10n to v3.14.20220512031601 2022-05-12 04:23:50 +00:00
seotts
347a376595 Merge remote-tracking branch 'origin/develop' into release/2022-05-11 2022-05-11 13:55:12 +00:00
Sarah Otts
d28f64bc37
Merge pull request #6781 from seotts/annual-report-route-update
Switch /annual-report to 2021 report!
2022-05-11 09:15:06 -04:00
renovate[bot]
01e821744a
Merge pull request #6788 from LLK/renovate/scratch-l10n-3.x
chore(deps): update dependency scratch-l10n to v3.14.20220511031550
2022-05-11 11:24:12 +00:00
Renovate Bot
e4cdcda702
chore(deps): update dependency scratch-l10n to v3.14.20220511031550 2022-05-11 06:07:01 +00:00
renovate[bot]
516d571de1
Merge pull request #6787 from LLK/renovate/scratch-gui-0.x
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20220511000702
2022-05-11 03:12:36 +00:00
Renovate Bot
c9462082e9
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20220511000702 2022-05-11 01:00:55 +00:00
Sarah Otts
159be32c45
Merge pull request #6785 from seotts/annual-report-headings
More Annual Report fixes!
2022-05-10 15:28:08 -04:00
seotts
412fb2988b remove unnessesary comment 2022-05-10 14:16:04 -04:00
renovate[bot]
1aaa60ac74
Merge pull request #6784 from LLK/renovate/scratch-gui-0.x
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20220510153809
2022-05-10 17:49:50 +00:00
Renovate Bot
7be9fb656c
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20220510153809 2022-05-10 16:02:58 +00:00
seotts
6dad747671 Add margin to reach intro for small screens 2022-05-10 12:00:44 -04:00
seotts
b062893c85 Update illustrations to remove lines 2022-05-10 11:56:03 -04:00
seotts
57650fdf56 Clean up Bridges to Science spotlight 2022-05-10 11:32:47 -04:00
renovate[bot]
6ab30969d6
Merge pull request #6783 from LLK/renovate/scratch-l10n-3.x
chore(deps): update dependency scratch-l10n to v3.14.20220510031559
2022-05-10 03:34:17 +00:00
Renovate Bot
6ba974e7ee
chore(deps): update dependency scratch-l10n to v3.14.20220510031559 2022-05-10 03:31:00 +00:00
renovate[bot]
48ad809231
Merge pull request #6782 from LLK/renovate/scratch-gui-0.x
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20220509222850
2022-05-10 03:28:49 +00:00
Renovate Bot
524155cabd
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20220509222850 2022-05-10 00:53:13 +00:00
seotts
ce7e080916 Fix wrapping and padding of SEC blob
p
2022-05-09 17:04:54 -04:00
seotts
3750166b4f Use h3 in a bunch of spots instead of h4 2022-05-09 16:35:52 -04:00
seotts
65c9588aae Switch /annual-report to 2021 report! 2022-05-09 14:27:03 -04:00
Sarah Otts
adc687dcba
Merge pull request #6779 from seotts/annual-report-bug-fixes
Annual Report bug fixes
2022-05-09 13:21:17 -04:00
Karishma Chadha
ac79b96d8a
Merge pull request #6767 from LLK/release/2022-05-04
[Develop] release/2022-05-04
2022-05-09 12:31:02 -04:00
seotts
f8cc0a6e9d Remove bananas 🍌 2022-05-09 12:17:05 -04:00
seotts
52eb20cdae Bridges to Science location bolded 2022-05-09 11:59:34 -04:00
seotts
4bfe9e67a3 Fix bridges to science title copy 2022-05-09 11:48:52 -04:00
seotts
d6baafa181 Make masthead/director message breakpoint consistant 2022-05-09 10:48:33 -04:00
seotts
0854825136 Director message alignment 2022-05-09 10:48:33 -04:00