Commit graph

12997 commits

Author SHA1 Message Date
Andy O'Neill
728461dc2f Merge branch 'develop' into feature/color-contrast 2023-05-24 13:42:07 -04:00
Andy O'Neill
29a828487a fix: correct integration tests and update scratch-gui 2023-05-24 13:16:01 -04:00
renovate[bot]
c01f750abf
fix(deps): update dependency scratch-gui to v1.8.95 2023-05-24 14:58:31 +00:00
renovate[bot]
67a58293c7
Merge pull request #7614 from scratchfoundation/renovate/scratch-gui-1.x
fix(deps): update dependency scratch-gui to v1.8.94
2023-05-24 10:46:10 +00:00
renovate[bot]
a3a04f7df1
fix(deps): update dependency scratch-gui to v1.8.94 2023-05-24 07:59:18 +00:00
renovate[bot]
678f031ce8
Merge pull request #7613 from scratchfoundation/renovate/scratch-l10n-3.x
fix(deps): update dependency scratch-l10n to v3.15.20230524032205
2023-05-24 05:19:26 +00:00
renovate[bot]
f8488e3d2a
fix(deps): update dependency scratch-l10n to v3.15.20230524032205 2023-05-24 03:59:38 +00:00
renovate[bot]
632ac1521a
Merge pull request #7612 from scratchfoundation/renovate/scratch-gui-1.x
fix(deps): update dependency scratch-gui to v1.8.93
2023-05-24 02:04:12 +00:00
renovate[bot]
95cc634dba
fix(deps): update dependency scratch-gui to v1.8.93 2023-05-23 22:54:26 +00:00
corihudson
25c82c64a0 Merge remote-tracking branch 'origin/develop' into release/2023-05-23 2023-05-23 18:20:06 +00:00
cori hudson
e6a7504534
Merge pull request #7607 from scratchfoundation/renovate/scratch-gui-1.x
fix(deps): update dependency scratch-gui to v1.8.91
2023-05-23 10:43:59 -04:00
renovate[bot]
ff2541945e
fix(deps): update dependency scratch-gui to v1.8.91 2023-05-23 14:30:32 +00:00
cori hudson
18ddb8346a
Merge pull request #7608 from scratchfoundation/renovate/scratch-l10n-3.x
fix(deps): update dependency scratch-l10n to v3.15.20230523032203
2023-05-23 10:28:27 -04:00
renovate[bot]
857be80f18
fix(deps): update dependency scratch-l10n to v3.15.20230523032203 2023-05-23 14:19:01 +00:00
Andy O'Neill
2cd59c0b11
Merge pull request #7606 from scratchfoundation/feature/color-contrast
Feature/color contrast
2023-05-23 09:33:31 -04:00
Andy O'Neill
e705dca7c9
Merge pull request #7588 from aoneill01/feature/color-contrast
feat: use purple accent color for accessibility
2023-05-22 15:39:08 -04:00
Andy O'Neill
c996b1289f feat: use purple accent color for accessibility 2023-05-22 15:32:37 -04:00
cori hudson
8441129f0b
Merge pull request #7591 from corihudson/ce-334-privacy-policy-banner
CE-334: add privacy policy update notification banner
2023-05-15 16:25:57 -04:00
TimothyKeaveny
7639e861ac
Merge pull request #7599 from TimothyKeaveny/update-urls-for-migration
update URLs to point to the new scratchfoundation github account loca…
2023-05-12 20:35:59 +07:00
TimothyKeaveny
f01ab979b7 update URLs to point to the new scratchfoundation github account location 2023-05-12 05:26:41 +07:00
Tom Lum
4a89f209c0
Merge pull request #7597 from LLK/hotfix/credits-updates
[Develop] Hotfix/credits updates
2023-05-11 16:14:17 -04:00
Tom Lum
5d63f07fb3
Merge pull request #7598 from LLK/hotfix/credits-updates
[Master] Hotfix/credits updates
2023-05-11 16:14:14 -04:00
renovate[bot]
92435aff53
Merge pull request #7596 from LLK/renovate/scratch-gui-1.x
fix(deps): update dependency scratch-gui to v1.8.57
2023-05-11 20:12:21 +00:00
tomlum
e5ae916ade lint fix 2023-05-11 16:05:38 -04:00
tomlum
0d7b14c8d7 lint fix 2023-05-11 15:59:59 -04:00
tomlum
9e64420014 adds more 2023-05-11 15:54:35 -04:00
tomlum
f008ab4f9d adds again again 2023-05-11 15:49:53 -04:00
tomlum
b1c5f36ba3 adds more 2023-05-11 15:49:04 -04:00
tomlum
6e5dbad64f adds more 2023-05-11 15:48:23 -04:00
tomlum
aaee1421a3 fixes uername and name 2023-05-11 15:42:59 -04:00
tomlum
c17cf52650 lint fix 2023-05-11 15:21:39 -04:00
tomlum
28ed695c65 adds to credits page 2023-05-11 15:10:26 -04:00
renovate[bot]
64c7a3e7c7
fix(deps): update dependency scratch-gui to v1.8.57 2023-05-11 17:56:07 +00:00
cori hudson
9f35132449
Merge pull request #7412 from corihudson/ce-317-update-privacy-policy
CE-317: Update privacy policy
2023-05-11 10:15:53 -04:00
cori hudson
915a9a749c
Merge pull request #7541 from corihudson/ce-319-cookie-page
CE-319: Add cookie policy page
2023-05-11 10:15:08 -04:00
Ron de las Alas
bf98488b16
Merge pull request #7586 from LLK/release/2023-05-08
[Develop] release/2023-05-08
2023-05-11 10:13:02 -04:00
Ron de las Alas
803e194269
Merge pull request #7587 from LLK/release/2023-05-08
[Master] release/2023-05-08
2023-05-11 10:01:58 -04:00
renovate[bot]
26c4bf390f
Merge pull request #7595 from LLK/renovate/scratch-gui-1.x
fix(deps): update dependency scratch-gui to v1.8.56
2023-05-11 09:05:01 +00:00
renovate[bot]
099185b58d
fix(deps): update dependency scratch-gui to v1.8.56 2023-05-11 04:31:17 +00:00
cori hudson
8ef835cd0e fix(cookie policy): update last updated string to reflect deploy date 2023-05-10 15:55:53 -04:00
cori hudson
e6dbbd4208 fix(privacy policy): update last updated to reflect deploy date 2023-05-10 15:54:51 -04:00
cori hudson
d99598eb94 fix(privacy banner): add date, start and end times to banner 2023-05-10 13:59:26 -04:00
renovate[bot]
5aec4fe094
Merge pull request #7594 from LLK/renovate/scratch-gui-1.x
fix(deps): update dependency scratch-gui to v1.8.54
2023-05-10 13:57:22 +00:00
renovate[bot]
faa97d480c
fix(deps): update dependency scratch-gui to v1.8.54 2023-05-10 09:30:26 +00:00
renovate[bot]
b54e01bf33
Merge pull request #7593 from LLK/renovate/scratch-l10n-3.x
fix(deps): update dependency scratch-l10n to v3.15.20230510032150
2023-05-10 09:29:18 +00:00
renovate[bot]
da3d38906f
fix(deps): update dependency scratch-l10n to v3.15.20230510032150 2023-05-10 04:14:55 +00:00
Alexis Goodfellow
4d4b68d061
Merge pull request #7592 from colbygk/update_for_ipban_redirect
Handle generic ipban redirect if session says so
2023-05-09 14:23:47 -07:00
Colby Gutierrez-Kraybill
5cdafb8bc9 Handle generic ipban redirect if session says so 2023-05-09 17:16:37 -04:00
cori hudson
87d31611de chore(splash): remove unintentional whitespace 2023-05-09 13:50:43 -04:00
delasare
1e9ca4b1d0 Merge remote-tracking branch 'origin/develop' into release/2023-05-08 2023-05-08 14:13:08 +00:00