Commit graph

9336 commits

Author SHA1 Message Date
renovate[bot]
c647a9d978
Merge pull request #6320 from LLK/renovate/scratch-gui-0.x
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20211119084451
2021-11-19 12:47:17 +00:00
Renovate Bot
8f6006ede0
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20211119084451 2021-11-19 11:00:23 +00:00
renovate[bot]
7891b2bc34
Merge pull request #6319 from LLK/renovate/scratch-l10n-3.x
chore(deps): update dependency scratch-l10n to v3.14.20211119031548
2021-11-19 05:03:35 +00:00
Renovate Bot
8630f5d0da
chore(deps): update dependency scratch-l10n to v3.14.20211119031548 2021-11-19 03:27:42 +00:00
Eric Rosenbaum
6ca2402e8a
Merge pull request #6313 from LLK/release/2021-11-17
[Develop] release/2021-11-17
2021-11-18 11:40:35 -05:00
Eric Rosenbaum
27bdbf0286
Merge pull request #6314 from LLK/release/2021-11-17
[Master] release/2021-11-17
2021-11-18 11:24:44 -05:00
renovate[bot]
17007e62b8
Merge pull request #6318 from LLK/renovate/scratch-gui-0.x
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20211118091149
2021-11-18 12:06:09 +00:00
Renovate Bot
259c71f5f3
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20211118091149 2021-11-18 09:54:02 +00:00
renovate[bot]
b1d1b24b44
Merge pull request #6317 from LLK/renovate/scratch-l10n-3.x
chore(deps): update dependency scratch-l10n to v3.14.20211118031553
2021-11-18 05:35:35 +00:00
Renovate Bot
e1b79b4fea
chore(deps): update dependency scratch-l10n to v3.14.20211118031553 2021-11-18 03:59:33 +00:00
Sarah Otts
bcaec93306
Merge pull request #6315 from seotts/fix-annual-report-link
Fix annual report link text
2021-11-17 16:18:11 -05:00
seotts
d7bfa2ed6f Remove 2019 from Annual Report 2019 2021-11-17 16:08:21 -05:00
ericrosenbaum
df57f27de5 Merge remote-tracking branch 'origin/develop' into release/2021-11-17 2021-11-17 15:58:35 +00:00
renovate[bot]
2667827840
Merge pull request #6310 from LLK/renovate/scratch-gui-0.x
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20211117061326
2021-11-17 09:16:58 +00:00
Renovate Bot
a26bae26c4
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20211117061326 2021-11-17 08:52:45 +00:00
renovate[bot]
e4416de738
Merge pull request #6309 from LLK/renovate/scratch-l10n-3.x
chore(deps): update dependency scratch-l10n to v3.14.20211117031600
2021-11-17 08:49:04 +00:00
Renovate Bot
9b6fc6bb72
chore(deps): update dependency scratch-l10n to v3.14.20211117031600 2021-11-17 04:52:24 +00:00
Karishma Chadha
78688203b1
Merge pull request #6301 from kchadha/annual-report-fixes
[Develop] Annual report fixes
2021-11-16 11:47:36 -05:00
Karishma Chadha
9d72d3766c
Merge pull request #6300 from kchadha/annual-report-fixes
[Hotfix] Annual Report 2020
2021-11-16 11:46:55 -05:00
renovate[bot]
2ff9193b8f
Merge pull request #6304 from LLK/renovate/scratch-gui-0.x
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20211116090235
2021-11-16 14:03:44 +00:00
Renovate Bot
470e9600d4
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20211116090235 2021-11-16 11:17:51 +00:00
renovate[bot]
b45c40e66b
Merge pull request #6303 from LLK/renovate/scratch-l10n-3.x
chore(deps): update dependency scratch-l10n to v3.14.20211116031608
2021-11-16 08:51:46 +00:00
Renovate Bot
bbed2671e2
chore(deps): update dependency scratch-l10n to v3.14.20211116031608 2021-11-16 04:59:38 +00:00
Karishma Chadha
7baa676a5c Update /annual-report route to point to 2020 report. 2021-11-15 17:25:08 -05:00
Bryce Taylor
f78ba0d561
Merge pull request #6302 from BryceLTaylor/Fix-circle-jest-integration
CircleCI use correct integration test command
2021-11-15 17:19:23 -05:00
BryceLTaylor
c0bbf60114 CircleCI use correct integration test command 2021-11-15 17:10:25 -05:00
Sarah Otts
91d0d9be4e Delete commented out line 2021-11-15 17:07:56 -05:00
Sarah Otts
814a31236b Remove commented out code 2021-11-15 17:07:56 -05:00
Karishma Chadha
753b422d25 More layout fixes. 2021-11-15 17:07:56 -05:00
Karishma Chadha
0373dd578e Update copy 2021-11-15 17:07:56 -05:00
Karishma Chadha
0b958cb0f3 Update blurry image of scratch editor. 2021-11-15 17:07:56 -05:00
Karishma Chadha
f864e12da2 Update links to embedded projects. 2021-11-15 17:07:56 -05:00
Karishma Chadha
d09e7628f9 Copy changes for annual report 2021-11-15 17:07:56 -05:00
Karishma Chadha
1d68765c48 More layout, and font-size fixes for annual report. 2021-11-15 17:07:56 -05:00
Karishma Chadha
f427e4a2b0 Update font sizes, pill styling, and country blurb font sizing and layout. 2021-11-15 17:07:56 -05:00
Karishma Chadha
c835c67fe7 Updates to TextAndMediaSnippet layout, spacing, and some font sizing. Fix width of components of other sections e.g. Scratch in India. 2021-11-15 17:07:56 -05:00
Bryce Taylor
04e13b0852
Merge pull request #6298 from BryceLTaylor/remove-tap-integration-tests
Don't try to run non-existent tap integration tests
2021-11-15 15:20:01 -05:00
BryceLTaylor
0555422c4b Don't try to run non-existent tap integration tests 2021-11-15 11:28:29 -05:00
Bryce Taylor
5fdff7be57
Merge pull request #6295 from BryceLTaylor/convert-Tap-to-Jest-Statistics
Convert integration tests for statistics page from Tap to Jest
2021-11-15 10:54:24 -05:00
Bryce Taylor
35dd66cdd7
Merge pull request #6292 from BryceLTaylor/convert-Tap-to-Jest-search
Move Search integration tests from Tap to Jest
2021-11-15 10:53:50 -05:00
Bryce Taylor
0fd07274d0
Merge pull request #6287 from BryceLTaylor/convert-Tap-to-Jest-login-failures
Convert login failure integration tests from tap to jest
2021-11-15 10:53:42 -05:00
BryceLTaylor
bd61b24407 fix statistics test to check if disabled is false 2021-11-15 10:35:11 -05:00
renovate[bot]
12e5496e41
Merge pull request #6296 from LLK/renovate/scratch-gui-0.x
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20211110175742
2021-11-10 19:59:59 +00:00
Renovate Bot
2ced99097c
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20211110175742 2021-11-10 18:06:29 +00:00
BryceLTaylor
995c01bccf Convert integration tests for statistics page from Tap to Jest 2021-11-10 10:54:38 -05:00
renovate[bot]
e9e06c143b
Merge pull request #6294 from LLK/renovate/scratch-gui-0.x
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20211110132448
2021-11-10 15:22:54 +00:00
Renovate Bot
0066a4d0db
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20211110132448 2021-11-10 14:02:01 +00:00
renovate[bot]
107324aa59
Merge pull request #6293 from LLK/renovate/scratch-l10n-3.x
chore(deps): update dependency scratch-l10n to v3.14.20211110031601
2021-11-10 09:46:53 +00:00
Renovate Bot
f196f30017
chore(deps): update dependency scratch-l10n to v3.14.20211110031601 2021-11-10 06:01:26 +00:00
renovate[bot]
9677ec3514
Merge pull request #6291 from LLK/renovate/scratch-gui-0.x
chore(deps): update dependency scratch-gui to v0.1.0-prerelease.20211109193449
2021-11-10 00:29:07 +00:00