Commit graph

4965 commits

Author SHA1 Message Date
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