Commit graph

7158 commits

Author SHA1 Message Date
Ben Wheeler
ccf0e92e98 removed communityblocks-interviews from routeAlias entries 2020-11-12 13:43:33 -05:00
Radman Siddiki
89c5ea324b Remove Community Blocks Interviews Route 2020-11-12 13:43:33 -05:00
Radman Siddiki
0bd36c9543 Delete consent_for_parent.pdf 2020-11-12 13:43:33 -05:00
Radman Siddiki
4b33de8934 Delete assent_form.pdf 2020-11-12 13:43:33 -05:00
Radman Siddiki
b74d857ad9 Delete communityblocks-interviews.jsx 2020-11-12 13:43:33 -05:00
Radman Siddiki
534d8b9be5 Delete consent_for_over_18.pdf 2020-11-12 13:43:33 -05:00
BryceLTaylor
20eecb51f7 circleci config clean up environment variables 2020-11-12 10:14:49 -05:00
BryceLTaylor
8013a3d5d3 circleci config move environment variables to contexts 2020-11-12 09:57:10 -05:00
picklesrus
87d3d7845b
Merge pull request #4630 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20201112102118
Bump scratch-gui from 0.1.0-prerelease.20201105040602 to 0.1.0-prerelease.20201112102118
2020-11-12 06:58:27 -05:00
dependabot-preview[bot]
94d7e9cc93
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20201105040602 to 0.1.0-prerelease.20201112102118.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20201105040602...0.1.0-prerelease.20201112102118)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-11-12 10:45:47 +00:00
BryceLTaylor
aa8bc7a8c5 Revert "circleci config change staging environment variables to commands"
This reverts commit 686e8a2a95.
2020-11-10 15:06:11 -05:00
BryceLTaylor
6dd6c91aa4 Revert "circleci config move staging environment variables to scripts"
This reverts commit 81aabb20ee.
2020-11-10 15:06:00 -05:00
BryceLTaylor
a704ed7f75 Revert "circleCI config fix environment variable commands"
This reverts commit b4c8c22c7a.
2020-11-10 15:05:52 -05:00
Karishma Chadha
e14b6d52f3 Add spinner while video is still loading 2020-11-10 14:37:18 -05:00
BryceLTaylor
b4c8c22c7a circleCI config fix environment variable commands 2020-11-10 10:53:50 -05:00
BryceLTaylor
81aabb20ee circleci config move staging environment variables to scripts 2020-11-10 10:41:12 -05:00
BryceLTaylor
686e8a2a95 circleci config change staging environment variables to commands 2020-11-10 10:24:49 -05:00
picklesrus
2005b23777
Merge pull request #4616 from picklesrus/mute-behavior
Skeleton of code to show mute modal and comment status.
2020-11-10 10:24:04 -05:00
picklesrus
b8b0f5d10c
Merge pull request #4580 from picklesrus/modal-image-updates
A few small upates to the muting modal
2020-11-10 09:52:41 -05:00
BryceLTaylor
09f0bf9f31 circleci config remove unused api key references 2020-11-10 09:34:12 -05:00
BryceLTaylor
777dcbf690 circleci config remove incorrect keys, put test_project_id in quotes 2020-11-10 09:24:32 -05:00
BryceLTaylor
523c19baaf circleci config fix www_version 2020-11-09 15:02:55 -05:00
BryceLTaylor
4d8b96d558 circleci config fix indentation 2020-11-09 14:52:59 -05:00
BryceLTaylor
4bc3254f95 circleCI config split build to -staging and -production. add env variables. 2020-11-09 14:50:21 -05:00
Ray Schamp
5b80590b8b
Merge pull request #3913 from LLK/dependabot/npm_and_yarn/lodash.defaultsdeep-4.6.1
[Security] Bump lodash.defaultsdeep from 3.10.0 to 4.6.1
2020-11-09 14:13:23 -05:00
dependabot-preview[bot]
3a36d27c08
[Security] Bump lodash.defaultsdeep from 3.10.0 to 4.6.1
Bumps [lodash.defaultsdeep](https://github.com/lodash/lodash) from 3.10.0 to 4.6.1. **This update includes a security fix.**
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/3.10.0...4.6.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-11-09 19:13:07 +00:00
Ray Schamp
efa75e8412
Merge pull request #3914 from LLK/dependabot/npm_and_yarn/lodash.mergewith-4.6.2
[Security] Bump lodash.mergewith from 4.6.1 to 4.6.2
2020-11-09 14:11:07 -05:00
dependabot-preview[bot]
170359db61
[Security] Bump lodash.mergewith from 4.6.1 to 4.6.2
Bumps [lodash.mergewith](https://github.com/lodash/lodash) from 4.6.1 to 4.6.2. **This update includes a security fix.**
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-11-09 19:10:07 +00:00
dependabot-preview[bot]
a3497fda2e
Merge pull request #3915 from LLK/dependabot/npm_and_yarn/react-dom-16.2.1 2020-11-09 19:09:30 +00:00
dependabot-preview[bot]
339524ecb7
Merge pull request #3945 from LLK/dependabot/npm_and_yarn/lodash.merge-4.6.2 2020-11-09 19:08:07 +00:00
BryceLTaylor
534c60bf78 circleCI config fix fastly api key environment variables 2020-11-09 12:00:17 -05:00
Karishma Chadha
f89d1313e0 Break out supporters lists into json file and dynamically create lists of supporters. 2020-11-09 11:37:31 -05:00
BryceLTaylor
190e2bb550 circleCI config remove path line 2020-11-09 11:24:23 -05:00
BryceLTaylor
4b69b92bb9 circleCI config update cache keys 2020-11-09 11:10:27 -05:00
picklesrus
e5f97d1f18 Skeleton of code to show mute modal and comment status.
Still todo:
- l10n
- Time needs formatting
- Compose box needs to be shown/formatted correctly based on mute status
- Blue comment status box need to be sticky
2020-11-09 11:01:42 -05:00
BryceLTaylor
227795b81a circleCI confi fix underscore in save_cache 2020-11-09 10:57:19 -05:00
BryceLTaylor
83253daca4 circleCI config fix underscores 2020-11-09 10:52:27 -05:00
BryceLTaylor
0d1729985b CircleCI config setup environment variables, caching, and workflow 2020-11-09 10:42:54 -05:00
Karishma Chadha
c3accb0111 Add link to annual report from about page 2020-11-09 10:20:11 -05:00
Karishma Chadha
3ed2ed1447
Merge pull request #4599 from LLK/release/2020-11-04
[Develop] Release/2020 11 04
2020-11-05 14:46:50 -05:00
Karishma Chadha
927d629e5d
Merge pull request #4600 from LLK/release/2020-11-04
[Master] Release/2020 11 04
2020-11-05 11:13:49 -05:00
Karishma Chadha
40c139b9f8
Merge pull request #4605 from LLK/revert-4602-revert-4595-dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20201104042153
Revert "Revert "Bump scratch-gui from 0.1.0-prerelease.20201025103629 to 0.1.…"
2020-11-05 09:42:11 -05:00
Benjamin Wheeler
69efc1afea
Merge pull request #4287 from R4356th/patch-11
Replace "Tips Page" with "Ideas Page"
2020-11-05 09:41:48 -05:00
Karishma Chadha
b1464277dd
Revert "Revert "Bump scratch-gui from 0.1.0-prerelease.20201025103629 to 0.1.…" 2020-11-05 09:40:30 -05:00
dependabot-preview[bot]
7602bf2d5a
Merge pull request #4604 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20201105040602 2020-11-05 12:19:01 +00:00
dependabot-preview[bot]
d01af1c16f
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20201104042153 to 0.1.0-prerelease.20201105040602.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20201104042153...0.1.0-prerelease.20201105040602)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-11-05 10:44:05 +00:00
Karishma Chadha
7b95375db0
Merge pull request #4602 from LLK/revert-4595-dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20201104042153
Revert "Bump scratch-gui from 0.1.0-prerelease.20201025103629 to 0.1.…
2020-11-04 16:38:45 -05:00
Karishma Chadha
8d20bea167
Revert "Bump scratch-gui from 0.1.0-prerelease.20201025103629 to 0.1.0-prerelease.20201104042153" 2020-11-04 16:35:11 -05:00
Eric Rosenbaum
c1c3458332
Merge pull request #4598 from LLK/develop
merge from develop to release branch
2020-11-04 12:40:22 -05:00
Karishma Chadha
adb772ce49
Merge pull request #4587 from LLK/hotfix/annual-report-fix
[Develop] Hotfix minor changes to annual report
2020-11-04 12:38:38 -05:00