Commit graph

5090 commits

Author SHA1 Message Date
Georgi Angelov
7c67d95085 Change messaging on welcome step of registration for under 13 2024-08-16 17:39:29 +03:00
Georgi Angelov
0fb18c4650 Split sign up email messaging based on if user is under 13 2024-08-07 15:19:28 +03:00
Christopher Willis-Ford
408403d42a fix: credits update
Some checks failed
CI/CD / build-and-test-and-maybe-deploy (push) Has been cancelled
2024-06-28 07:57:35 -07:00
Christopher Willis-Ford
b9a45c0a5e fix: temporarily revert all routing changes for the new site 2024-06-05 19:44:34 -07:00
Colby Gutierrez-Kraybill
e59ff90b91
Merge pull request #8418 from colbygk/adjust_for_radish
Removing more redirects to make room for different routing of routes related to radish work
2024-06-05 20:23:58 -04:00
Colby Gutierrez-Kraybill
e9b390f922 This time will work for sure! 2024-06-05 20:21:19 -04:00
Colby Gutierrez-Kraybill
19ab0eeefe
Merge pull request #8417 from colbygk/adjust_for_radish
Need to make some redirect room
2024-06-05 20:11:56 -04:00
Colby Gutierrez-Kraybill
6b7ec3cbe9 Need to make some redirect room 2024-06-05 20:07:39 -04:00
Colby Gutierrez-Kraybill
a86698dc3c
Merge pull request #8346 from sashodada/feature/configrable-thumbnails-url
feat: Replace hardcoded thumbnail URI and host with configurable ones
2024-06-03 09:03:47 -04:00
Colby Gutierrez-Kraybill
fb6516e4f8 Fix up parents 2024-05-22 19:13:24 -04:00
Colby Gutierrez-Kraybill
50fdc4747b Updated Radish redirects 2024-05-22 19:09:49 -04:00
Colby Gutierrez-Kraybill
099235e6d9 Provide mechanism to specify a RADISH_URL that differentiates between different destination end points depending on if running from staging or from production or ... 2024-05-20 22:41:44 -04:00
Colby Gutierrez-Kraybill
d8fd6f2b0b no sub-page named about on radish 2024-05-19 16:35:14 -04:00
Colby Gutierrez-Kraybill
0e182475be Testing out upcoming changes 2024-05-19 14:40:04 -04:00
Aleksandar Shumakov
1d35168b5c Replace hardcoded thumbnail URI and host with configurable ones 2024-05-13 10:28:35 +03:00
Christopher Willis-Ford
9c8ef43dc4 refactor: ensure any given file is all CJS or all ESM 2024-03-20 15:13:15 -07:00
Christopher Willis-Ford
7b48c5a638 style: fix react/jsx-pascal-case violation in form.jsx 2024-02-26 14:08:06 -08:00
Christopher Willis-Ford
836813680f style: add missing prop types for StudioAdminPanel 2024-02-26 14:05:43 -08:00
Christopher Willis-Ford
66743248e1 style: resolve unused props in TopLevelComment 2024-02-26 14:05:40 -08:00
Christopher Willis-Ford
93ba2b5e24 fix: move schedule row key prop to fix react/jsx-key problem 2024-02-26 13:48:29 -08:00
Christopher Willis-Ford
170256c20f style: fix no-prototype-builtins violations 2024-02-26 13:35:15 -08:00
Christopher Willis-Ford
34aee46da4 style: don't complain about iframe allowTransparency
See also https://stackoverflow.com/a/5182176
2024-02-26 13:29:17 -08:00
Christopher Willis-Ford
5dcb198737 style: set react/forbid-prop-types to warn
We should really fix these, but it's a lot of work and I'm short on
time...
2024-02-26 13:20:18 -08:00
Christopher Willis-Ford
a96fe522f4 style: fix automatically-fixable lint issues 2024-02-26 10:10:19 -08:00
Christopher Willis-Ford
bb7a57516c fix: react-onclickouside doesn't support functional components
This stopped working with webpack 5
2024-02-14 15:55:07 -08:00
tomlum
d121de84e9 removes far temporarily 2023-08-14 21:36:16 -04:00
tomlum
59fa9cd127 far lint fixes 2023-08-04 18:25:39 -04:00
tomlum
a3ccb87a68 new FAR design and bug fix 2023-08-03 14:08:48 -04:00
Tom Lum
2b47139208
Revert "Revert "Merge pull request #7762 from scratchfoundation/revert-7759-F…" 2023-08-03 13:00:31 -04:00
tomlum
723cc24c9a removes bad-username-splash 2023-08-01 14:49:31 -04:00
tomlum
2557f57272 Revert "Merge pull request #7762 from scratchfoundation/revert-7759-FAR-Revert"
This reverts commit faf84d0cfa, reversing
changes made to 5b190b3acd.
2023-08-01 14:32:02 -04:00
Christopher Willis-Ford
4491d985fc fix: move the 'if Scratch Link is not running' advice into the Troubleshooting section 2023-07-31 11:31:34 -07:00
Christopher Willis-Ford
3a4c0c38bc Merge branch 'develop' into scratch-link-2.0-mac-release 2023-07-27 07:44:40 -07:00
Christopher Willis-Ford
da5ad7c190 chore(lint): fix lint issue in bad-username-splash.jsx 2023-07-27 07:44:12 -07:00
Christopher Willis-Ford
0ebd9a9245 Merge branch 'develop' into scratch-link-2.0-mac-release 2023-07-27 07:29:37 -07:00
Tom Lum
e6153740b7
Revert "revert FAR" 2023-07-26 13:10:49 -04:00
tomlum
3d607cdb3b revert FAR 2023-07-25 11:11:09 -04:00
Tom Lum
4b81f7dd70
Merge pull request #7756 from scratchfoundation/far-style-fixes
far style fixes
2023-07-18 16:06:14 -04:00
tomlum
bfb7c0e06c far style fixes 2023-07-18 16:05:42 -04:00
Christopher Willis-Ford
b4000c9a8f
Merge pull request #7738 from mrsrec/patch-2
LLK -> scratchfoundation
2023-07-17 08:21:39 -07:00
Christopher Willis-Ford
5a26da9bd3
Merge pull request #7739 from cwillisf/scratch-link-2.0-prep
Scratch link 2.0 prep
2023-07-17 07:43:14 -07:00
Christopher Willis-Ford
d5ce8aa542 fix: remove EV3 info from Scratch Link page
Based on feedback from Kevin B
2023-07-17 07:33:54 -07:00
tomlum
d21ebc5c56 indent fix 2023-07-13 10:34:42 -04:00
tomlum
4d73900c77 far lint fixes 2023-07-13 10:11:55 -04:00
Christopher Willis-Ford
5af85a596f fix: update browser compatibility text for Scratch Link 2.0 2023-07-12 15:21:05 -07:00
Christopher Willis-Ford
2935d7dd01 fix: move EV3 troubleshooting into troubleshooting section 2023-07-12 15:21:00 -07:00
tomlum
c276e006ff updates design and fixes redux issues 2023-07-12 17:01:45 -04:00
mrsrec
9e2c5b27c2
Update download.jsx 2023-07-12 12:12:55 -04:00
mrsrec
48a5046310
Update about.jsx 2023-07-12 12:12:18 -04:00
mrsrec
d8251cf606
Update l10n.json 2023-07-12 12:11:36 -04:00
mrsrec
bb9d1bf73a
Update developers.jsx 2023-07-12 12:08:19 -04:00
Christopher Willis-Ford
beb810933a feat: add Scratch Link 1.4 link for EV3 troubleshooting
Plus lots of minor style changes to make it fit well.
2023-07-11 15:32:57 -07:00
Christopher Willis-Ford
48e62c4caf feat: link Scratch Link landing page from extension pages 2023-07-11 15:23:10 -07:00
Christopher Willis-Ford
2c7afbce08 refactor: mark OS_ENUM as @enum{string} to reduce TS warnings 2023-07-11 15:23:10 -07:00
tomlum
73da26aa5d fixes time comment 2023-07-11 12:52:03 -04:00
Tom Lum
132280477b
Merge branch 'develop' into force-account-rename 2023-07-11 12:49:16 -04:00
tomlum
54a23183f9 Merge branch 'master' of github.com:tomlum/scratch-www into force-account-rename 2023-07-11 12:47:27 -04:00
tomlum
3268232a2b deletes comments and old files 2023-07-10 16:08:16 -04:00
tomlum
b64cdbac1f refactors and adds different messages for vad username vs pii username 2023-06-30 15:04:53 -04:00
Christopher Willis-Ford
84fab48560 chore: replace UA with GA4 through GTM 2023-06-30 08:52:55 -07:00
tomlum
8868d00e23 validation and misc lint fixes 2023-06-28 22:49:28 -04: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
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
cori hudson
cc47f9b69c fix: add link to annual report in correct place 2023-06-22 13:47:38 -04:00
Andy O'Neill
fcf696a635 Merge branch 'develop' into beta 2023-06-20 14:49:26 -04:00
cori hudson
1d916d4071
Merge pull request #7655 from corihudson/req-56-fix-annual-report-link
REQ-56: update annual report link
2023-06-20 10:28:46 -04:00
tomlum
2f7e12bd0c adds force account rename page 2023-06-15 21:40:33 -04:00
cori hudson
8ff3932e7f fix(about): update annual report link
now points to the page on scratchfoundation.org
2023-06-15 10:56:50 -04:00
Andy O'Neill
1c396ddbb1 Merge branch 'develop' into feature/color-contrast 2023-06-13 10:41:20 -04:00
cori hudson
c088f71b3a fix(credits page): fix ron and jess's entries on credits page
fixes incorrectly swapped userName and name fields, also realphabetizes people.json
2023-06-13 09:53:13 -04:00
Christopher Willis-Ford
fd4e4c2305 build: fix GTM_ENV_AUTH escaping 2023-06-12 09:11:51 -07:00
Christopher Willis-Ford
7d358a67af build: enable GTM environments feature
- Document all GA/GTM-related variables in `template-config.js`
- Add `gtm_env_auth` variable (from `GTM_ENV_AUTH` environment variable)
  to enable alternative GTM environments

This will let us test new GTM configurations in staging without sending
the data to our production data stream.
2023-06-06 14:31:16 -07:00
Andy O'Neill
0ef4c11eb3
Merge pull request #7629 from mrsrec/patch-1
Fix cookie expiring in session
2023-06-05 17:15:58 -04:00
Andy O'Neill
f2f9e74a39 feat: update cookies page with scratchtheme info 2023-06-05 11:43:31 -04:00
Andy O'Neill
845643a2f9 fix: use correct forum post url for color contrast banner 2023-06-05 09:04:05 -04:00
Andy O'Neill
0097d91317 feature: create banner for color contrast 2023-06-01 13:41:13 -04:00
Andy O'Neill
8e5b603210 fix: update styling for ideas button 2023-06-01 09:30:57 -04:00
mrsrec
c2cddbf633
Fix cookie expiring in session 2023-05-27 22:27:37 -07:00
Andy O'Neill
179e4beaa3 fix: update privacy policy banner color 2023-05-26 09:45:56 -04:00
cori hudson
01a6e83eba fix(privacy banner): make banner aside use sticky position 2023-05-25 10:10:59 -04:00
Andy O'Neill
728461dc2f Merge branch 'develop' into feature/color-contrast 2023-05-24 13:42:07 -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
Tom Lum
4a89f209c0
Merge pull request #7597 from LLK/hotfix/credits-updates
[Develop] Hotfix/credits updates
2023-05-11 16:14:17 -04: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
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
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
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
tomlum
1c2adeb182 unhides community rows 2023-05-05 12:58:14 -04:00
tomlum
bc9680cb6f design changes 2023-05-04 14:01:53 -04:00
cori hudson
d843f623be fix(cookie policy): Add policy notification cookie, localize durations 2023-05-03 16:35:01 -04:00
cori hudson
8220220af1 feat(privacy banner): set expiration of policy cookie to 3 weeks 2023-05-03 16:13:40 -04:00
cori hudson
02cc6866b5 fix(privacy policy): update copy, fix linting errors 2023-05-01 15:20:59 -04:00
cori hudson
f0bc041b69 fix: update about page copy and image 2023-04-28 12:51:28 -04:00
cori hudson
709dffb600 feat(privacy banner): add l10n, better a11y 2023-04-21 15:00:58 -04:00
cori hudson
d7ca6dd6b2 feat(privacy banner): fix margin, move cookie logic to banner 2023-04-21 10:44:11 -04:00
cori hudson
9d7fed3935 feat: wip: show privacy banner on all pages 2023-04-20 17:09:27 -04:00
cori hudson
8d45c766c1 feat: fix styling for privacy banner 2023-04-19 17:00:43 -04:00
cori hudson
d8192e669f feat(splash): add privacy banner (first draft) 2023-04-19 11:51:35 -04:00
cori hudson
d09e067c44 feat(cookie policy): add all analytics cookies and strings 2023-04-12 11:10:09 -04:00
tomlum
53af50f556 fixes routes json 2023-04-07 21:32:40 -04:00
cori hudson
7dff6e3a5b
Merge pull request #7299 from bocoup/issue-7198
CE-292: Confusing tab navigation on explore page for screen readers
2023-04-07 14:39:47 -04:00
cori hudson
3e0d75b73e feat(cookie policy): add cookies to footer, analytics cookies started 2023-04-07 14:26:42 -04:00
cori hudson
14bc572fee
Merge pull request #7309 from bocoup/alt-text-7178
CE-299: add alt-text descriptions to the Ideas page
2023-04-06 14:55:10 -04:00
Chris Cuellar
ae7fca604d
Update src/views/ideas/ttt.json
Co-authored-by: cori hudson <cchudson98@gmail.com>
2023-04-05 15:32:54 -07:00
Chris Cuellar
487cdc7049
Update src/views/ideas/ttt.json
Co-authored-by: cori hudson <cchudson98@gmail.com>
2023-04-05 15:32:45 -07:00
cori hudson
0076113d8a feat(cookie policy): basic table styling; start bringing in cookie info 2023-04-05 17:20:53 -04:00
cori hudson
d238aa8201 feat: replace TED embed with image link
removes sole advertising cookie present on site
2023-04-05 15:25:16 -04:00
cori hudson
682dd7e894 feat(cookie policy): add non-table cookies page strings 2023-04-04 17:02:43 -04:00
Colby Gutierrez-Kraybill
d343b514ba Use handleSessionResponse to perform VPN redirect 2023-03-27 12:18:42 -04:00
Colby Gutierrez-Kraybill
21a795cd0b Add vpn_required to defaults in various pages. 2023-03-27 12:18:42 -04:00
Colby Gutierrez-Kraybill
12438d8360 Add in vpn redirect to require staff to use vpn 2023-03-27 12:18:42 -04:00
Andy O'Neill
051be71f83
Merge pull request #7454 from aoneill01/feature/pass-flag-to-gui
feat: pass isTotallyNormal to gui
2023-03-21 13:58:03 -04:00
tomlum
6ddd6b784a fixes formik 2023-03-20 14:43:55 -04:00
tomlum
ac191c0285 disables lint temporarily 2023-03-20 14:40:23 -04:00
tomlum
3ac6f0e5bf removes shuffle library from presentation 2023-03-17 13:27:49 -04:00
tomlum
4cc420632c hides community rows from homepage 2023-03-17 13:17:19 -04:00
tomlum
b2fc878903 design check 2023-03-16 14:22:19 -04:00
Andy O'Neill
6cab112090 feat: pass isTotallyNormal to gui 2023-03-16 12:48:09 -04:00
Tom Lum
59718ce72e
Merge pull request #7427 from LLK/jobs-link-updates
CE-388 Updates Job Links
2023-03-13 09:57:08 -04:00
tomlum
7e22920c7c updates job links 2023-03-09 13:49:15 -05:00
cori hudson
07406891a9 refactor: finish moving all strings in privacy policy to l10n.json 2023-03-02 17:22:51 -05:00
Tom Lum
6f209dd980
Merge pull request #7394 from LLK/educators-raspberry-pi-link-fix
REQ-17 fixes educators page raspberry pi link
2023-02-27 12:15:49 -05:00
cori hudson
f486121cf1 chore: fix links, update several more sections 2023-02-24 17:29:36 -05:00
tomlum
7bb06d722c fixes raspberry pi link 2023-02-24 14:48:31 -05:00
cori hudson
b3cafadaf0 chore: move usage/legal grounds section to l10n json 2023-02-22 17:18:14 -05:00
Andy O'Neill
5e35844e28 fix: use span for localized messages 2023-02-22 09:28:58 -05:00
cori hudson
9820cf7ec5 chore(privacy policy,): fix nav message, add usage strings to l10n json 2023-02-21 16:36:20 -05:00
cori hudson
76bdc1ab49 refactor(privacy policy): update copy and enable translation of collection section 2023-02-21 16:36:20 -05:00
cori hudson
9e635d2cd8 initial work 2023-02-21 16:36:20 -05:00
Andy O'Neill
51c493a450
Merge pull request #7348 from aoneill01/feature/react-intl-5
feat: upgrade react-intl
2023-02-21 15:46:34 -05:00
Andy O'Neill
d5bbb96a52 feat: upgrade react-intl 2023-02-21 15:36:27 -05:00
cori hudson
02fa1a8b07
Merge pull request #7306 from bocoup/color-contrast-7182-v3
CE-297: Update aqua and gray colors
2023-02-14 10:46:51 -05:00
Chris Cuellar
fec605b705
Update dark gray color to use hsla
Co-authored-by: cori hudson <cchudson98@gmail.com>
2023-02-13 17:26:33 -08:00
Chris Cuellar
3acee460e4
Update aqua to use hsla values
Co-authored-by: cori hudson <cchudson98@gmail.com>
2023-02-13 17:26:13 -08:00
Ben Wheeler
d94ea585a2 Merge pull request #7264 from edelfino11/develop
CE-294 Fix(7137) Make the love and favorite icons colorblind friendly
2023-02-01 23:45:07 -05:00
Ben Wheeler
ccf2e6ecb0 made project stats icons always opaque 2023-01-31 16:54:42 -05:00
Benjamin Wheeler
665723249b
Merge pull request #7264 from edelfino11/develop
CE-294 Fix(7137) Make the love and favorite icons colorblind friendly
2023-01-30 20:39:19 -05:00