Commit graph

655 commits

Author SHA1 Message Date
Christopher Willis-Ford
753a8811c5 build: correct LLK URLs in package.json 2024-02-23 13:57:48 -08:00
Ron de las Alas
ab05a21e0f
Merge pull request from scratchfoundation/rd/move-sjr-website-to-gha
Move SJR Website to GitHub Actions
2023-10-06 15:16:17 -04:00
Ron de las Alas
13992749b8
Update .github/workflows/deploy.yml
Co-authored-by: Christopher Willis-Ford <7019101+cwillisf@users.noreply.github.com>
2023-10-05 16:52:09 -04:00
Ron de las Alas
ae6e49b876 ci: update codeowners file
add gha deploy.yml
2023-10-03 15:54:32 -04:00
Ron de las Alas
42ccab57bd ci: remove circle config 2023-09-28 15:15:30 -04:00
Ron de las Alas
409117ac33
Merge pull request from scratchfoundation/rd/remove-twitter-widgets
refactor: remove twitter timeline widget
2023-07-18 16:08:58 -04:00
Ron de las Alas
bb4049b52e refactor: remove twitter timeline widget 2023-07-18 16:04:38 -04:00
Ron de las Alas
b5c1911532 ci: updated prod bucket name and slack templates [skip ci] 2023-06-29 10:59:41 -04:00
TimothyKeaveny
44b683dce5 Test new CircleCI EV with diff bucket URI format 2023-06-28 01:23:26 +07:00
TimothyKeaveny
a45ed1bba7 Add role-session-name for each aws-s3/sync command 2023-06-28 01:02:06 +07:00
TimothyKeaveny
18084a5cd0 Add string interpolation for EV 2023-06-28 00:53:35 +07:00
TimothyKeaveny
f37303d46d
Merge pull request from scratchfoundation/develop
Update local fork to latest changes from upstream
2023-06-28 00:50:57 +07:00
Ron de las Alas
e73208fae7
Merge pull request from TimothyKeaveny/add-circleci-oidc-iam-role
Move the aws-s3/sync block up a level within the setup_and_deploy job
2023-06-27 13:42:06 -04:00
TimothyKeaveny
a420168835 Move the aws-s3/sync block up a level within the setup_and_deploy job 2023-06-28 00:26:45 +07:00
Ron de las Alas
615ff2ee8f
Merge pull request from TimothyKeaveny/add-circleci-oidc-iam-role
Add circleci OIDC iam role
2023-06-27 13:00:40 -04:00
TimothyKeaveny
7bf2339bf0 Invoke 'aws-s3/configure' command to assume new IAM Role with OIDC 2023-06-27 23:12:45 +07:00
TimothyKeaveny
d4b674c05c
Merge pull request from scratchfoundation/develop
Update local fork with recent changes from upstream
2023-06-27 22:59:50 +07:00
Ron de las Alas
c42f7c93b1
Merge pull request from scratchfoundation/rd/JR-557/add-sjr-website-to-circle
Rd/jr 557/add sjr website to circle
2023-06-23 11:24:02 -04:00
Ron de las Alas
b76e3dc7ef feat: update to use ARN 2023-06-23 11:20:59 -04:00
TimothyKeaveny
2bd0d0436b Switch to using a CircleCI EV for the OIDC IAM Role Arn 2023-06-23 21:22:45 +07:00
TimothyKeaveny
b5db487529 Replace AWS Access Keys with IAM Role with OIDC 2023-06-22 21:04:52 +07:00
Ron de las Alas
036159c5d6
Merge pull request from scratchfoundation/ck/update-gtm
Update gtm_id
2023-05-24 10:03:18 -04:00
Caitlin Kilroy
7da732357d fix: update gtm_id 2023-05-24 09:58:47 -04:00
Ron de las Alas
aa76a5b556 feat: add enviroment conditions 2023-05-24 09:43:04 -04:00
Caitlin Kilroy
6a95459add
Merge pull request from scratchfoundation/ck/jr-558/all-links-https
[JR-558] Make sure all scratchjr.org links use https
2023-05-18 10:28:19 -04:00
Caitlin Kilroy
e997b170f8
Merge pull request from scratchfoundation/ck/jr-428/space-between-texts-and-links
[JR-428] There should be space between text and links on website tips and activities pages
2023-05-18 09:51:50 -04:00
Ron de las Alas
27674f9ba0
Merge pull request from scratchfoundation/rd/JR-557/add-sjr-website-to-circle
Rd/jr 557/add sjr website to circle
2023-05-16 11:29:24 -04:00
Caitlin Kilroy
7ab69e00af fix: add nonbreaking space before links 2023-05-16 10:06:02 -04:00
Caitlin Kilroy
be0feda142 fix: add https to all scratchjr.org links 2023-05-16 09:52:30 -04:00
Ron de las Alas
ff2417f781 ci: add staging condition 2023-05-15 14:38:12 -04:00
Ron de las Alas
e58fda2400 ci: linting 2023-05-15 14:30:04 -04:00
Ron de las Alas
30302d22fd ci: build and list 2023-05-15 14:26:24 -04:00
Ron de las Alas
64284f77aa ci: add checkout command 2023-05-15 14:22:49 -04:00
Ron de las Alas
fa7ce7a776 feat: setup app 2023-05-15 14:10:59 -04:00
Ron de las Alas
020e1b7324
Merge pull request from scratchfoundation/circleci-project-setup
Add .circleci/config.yml
2023-05-15 13:36:58 -04:00
Ron de las Alas
f66dc99f66 Add .circleci/config.yml 2023-05-15 13:35:20 -04:00
Ron de las Alas
7dd5bc98ca
Merge pull request from LLK/rd/JR-418/update-scratchjrorg-content
[update] Outreach and Footer content updates
2022-10-31 09:44:07 -04:00
Ron de las Alas
e41022e8d6 [update] Outreach and Footer content updates 2022-10-31 09:18:37 -04:00
Ron de las Alas
9c15e21237
Merge pull request from LLK/rd/JR-406/update-donation-link
Rd/JR-406/update donation link
2022-10-27 11:53:47 -04:00
Ron de las Alas
be11a5ec05 [chore] removed prettier.rc to avoid problems 2022-10-27 11:49:26 -04:00
Ron de las Alas
643ca22db3 [fix] linting updates 2022-10-27 11:49:26 -04:00
Ron de las Alas
850ea97b47 [fix] install with --legacy-deps 2022-10-27 11:48:23 -04:00
Ron de las Alas
cd8907086e [feature] Add Amazon Appstore badge and link 2022-10-27 10:05:58 -04:00
Ron de las Alas
f9ee77669d [fix] update donation link 2022-10-27 09:27:39 -04:00
chrisgarrity
2f4a7ce095
Merge pull request from chrisgarrity/change-connect-url
Update scratchjr connect link
2022-07-19 14:32:57 -04:00
Chris Garrity
ce6073bc02 Update scratchjr connect link 2022-07-19 13:53:42 -04:00
Ron de las Alas
0ed2103675 Fix spacing in the faq 2022-03-31 10:38:16 -04:00
Ron de las Alas
3e3fa911b8 Fix spacing in two spots on info.jsx 2022-03-31 10:31:04 -04:00
Deep Malhan
94ba5f784f
Merge pull request from LLK/rd/SJR-125/update-scratch-jr-org-content
Rd/sjr 125/update scratch jr org content
2022-03-30 12:43:47 -04:00
Ron de las Alas
6a992821f8 Turn the contributions list into a list 2022-03-28 10:46:01 -04:00