Commit graph

6670 commits

Author SHA1 Message Date
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
Eric Rosenbaum
71c0ee5ef0
Merge pull request #4595 from LLK/dependabot/npm_and_yarn/scratch-gui-0.1.0-prerelease.20201104042153
Bump scratch-gui from 0.1.0-prerelease.20201025103629 to 0.1.0-prerelease.20201104042153
2020-11-04 12:36:07 -05:00
dependabot-preview[bot]
d255d01d1c
Bump scratch-gui
Bumps [scratch-gui](https://github.com/LLK/scratch-gui) from 0.1.0-prerelease.20201025103629 to 0.1.0-prerelease.20201104042153.
- [Release notes](https://github.com/LLK/scratch-gui/releases)
- [Commits](https://github.com/LLK/scratch-gui/compare/0.1.0-prerelease.20201025103629...0.1.0-prerelease.20201104042153)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-11-04 10:56:09 +00:00
Karishma Chadha
126b5f4597
Merge pull request #4588 from LLK/hotfix/annual-report-fix
[Master] Hotfix minor changes to annual report
2020-11-02 15:06:20 -05:00
BryceLTaylor
b98d4ab360 circleci config add space to fix build error 2020-11-02 12:07:37 -05:00
BryceLTaylor
ea60f28dad circleci config fix step naming error 2020-11-02 12:05:14 -05:00
BryceLTaylor
18a26e131a circleci config split setup into different run steps 2020-11-02 12:03:10 -05:00
seotts
fd8324eb0e fix community growth graph 2020-11-02 11:20:04 -05:00
BryceLTaylor
50c70436e2 circleCI config fix cache alias 2020-10-30 17:23:11 -04:00
BryceLTaylor
26de139975 circleCI config install pip 2020-10-30 17:19:48 -04:00
BryceLTaylor
ff74a82544 circleCI config create integration job 2020-10-30 17:19:09 -04:00
BryceLTaylor
4277567a03 circleci config setup npm cache 2020-10-30 17:18:40 -04:00
picklesrus
495edd1820 A few small upates:
- Add images and update styles to match.  
- Add timeMuted prop so it can display how long the user is muted for. 
- Text updates

This still needs localization.
2020-10-30 10:07:43 -04:00
BryceLTaylor
beba1638df add working directory line to circleci config 2020-10-30 09:41:30 -04:00
BryceLTaylor
6ab03f132a circleci config remove npm install 2020-10-29 16:10:03 -04:00
BryceLTaylor
7349ee8d75 circleci config add checkout remove pip stuff 2020-10-29 16:05:28 -04:00
BryceLTaylor
cba5ca9d4c remove brew commands from circleci config 2020-10-29 16:05:28 -04:00
BryceLTaylor
dd9b878b4e add install pyenv to enable pip command in circleci config 2020-10-29 16:05:28 -04:00
BryceLTaylor
c78d4f8b42 indent commands in circleci config 2020-10-29 16:05:28 -04:00
BryceLTaylor
c9cb5faef8 undo previous change in circleci config 2020-10-29 16:05:28 -04:00
BryceLTaylor
f746c444d7 fix commands for setup in circleci config 2020-10-29 16:05:28 -04:00
BryceLTaylor
b76ea5701a add install steps to circleci.config 2020-10-29 16:05:28 -04:00
BryceLTaylor
133256b3ac circleci config change run to mapping in setup job 2020-10-29 16:05:28 -04:00
BryceLTaylor
b2c4f7c5ce setup circleci config 2020-10-29 16:05:28 -04:00
BryceLTaylor
5e42b57a92 Only run on circleci-project-setup branch 2020-10-29 16:05:28 -04:00
Bryce Taylor
8db04f863d Add .circleci/config.yml 2020-10-29 16:05:28 -04:00
Karishma Chadha
3b63aa5e08
Merge pull request #4574 from LLK/hotfix/studio-link
[Develop] Hotfix Studio Link
2020-10-29 10:47:12 -04:00
Karishma Chadha
5eab77c97c
Merge pull request #4568 from LLK/hotfix/annual-report
[Develop] Hotfix Annual Report 2020-10-29
2020-10-29 10:46:31 -04:00
Karishma Chadha
56675449ee
Merge branch 'develop' into hotfix/annual-report 2020-10-29 10:45:34 -04:00
Karishma Chadha
ab698070e2
Merge pull request #4573 from LLK/hotfix/studio-link
Fix BLM studio link
2020-10-29 09:49:14 -04:00
Karishma Chadha
4369899813 Fix BLM studio link 2020-10-29 09:43:10 -04:00
picklesrus
811844f231
Merge pull request #4567 from LLK/hotfix/annual-report
[Master] Hotfix Annual Report 2020-10-29
2020-10-29 06:00:28 -04:00
Karishma Chadha
4f6828bde8 Update board member section 2020-10-28 18:31:10 -04:00
seotts
b3cdc0ebcd fix Mahmoud’s image 2020-10-28 18:17:07 -04:00
seotts
729739c222 fix typo in project title 2020-10-28 18:04:51 -04:00
Karishma Chadha
412de9dbda Fix typos in content 2020-10-28 17:08:36 -04:00
Karishma Chadha
c2f0c1edbe Hopefully the right package-lock.json updates. 2020-10-28 13:30:54 -04:00