Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(Reference) develop <-- main [DO NOT MERGE] #7

Open
wants to merge 28 commits into
base: develop
Choose a base branch
from
Open

(Reference) develop <-- main [DO NOT MERGE] #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
7718ff1
all changes
pmalacho-mit Apr 1, 2024
6107528
Merge pull request #6 from scratchfoundation/develop
pmalacho-mit May 13, 2024
7afa1ec
Merge
mayarajan3 May 17, 2024
a9984bc
Changes
pmalacho-mit May 17, 2024
5522710
restoring menu bar
pmalacho-mit May 20, 2024
387ef3a
maya's changes part 2
mayarajan3 May 20, 2024
ee5b819
removing extra tutorial
mayarajan3 May 20, 2024
f7a1058
load bug
mayarajan3 May 20, 2024
df243b2
changing menu back to blue
mayarajan3 May 20, 2024
a37bfce
raw loader fix
mayarajan3 May 21, 2024
2ab1ea6
changing sub menu colors
mayarajan3 May 21, 2024
911319a
bump react versions to overcome pnpm issues
pmalacho-mit May 21, 2024
1f4803e
Merge branch 'parkers-change-maya-attempt-1' into maya-attempt-2
pmalacho-mit May 21, 2024
6ad9192
deleting js files
mayarajan3 May 21, 2024
b7f811f
changing color scheme
mayarajan3 May 21, 2024
65b0fb6
removing base64 function
mayarajan3 May 21, 2024
7701767
Merge pull request #10 from mitmedialab/maya-attempt-2
pmalacho-mit May 21, 2024
cc72b24
Merge pull request #8 from mitmedialab/parkers-change-maya-attempt-1
pmalacho-mit May 22, 2024
60b63a4
adding pnpm lock
pmalacho-mit May 22, 2024
fbe8572
disable failure on commit msg error
pmalacho-mit May 22, 2024
5cb5ebc
language fix
mayarajan3 May 23, 2024
e481396
Merge pull request #12 from mitmedialab/maya-attempt-2
pmalacho-mit Jun 21, 2024
58fdedf
adding comments
pmalacho-mit Jul 24, 2024
811b05a
changes to get music buffers bundling correctly
pmalacho-mit Jul 24, 2024
142be4f
updating modal to work with doodlebot
pmalacho-mit Jul 24, 2024
286cc46
Merge pull request #13 from mitmedialab/scratch-package-refactor-merg…
pmalacho-mit Jul 24, 2024
d359022
Merge branch 'scratch-package-refactor-merge-music-creation'
pmalacho-mit Jul 24, 2024
91c188a
seeing if correcting tsconfig fixes deploys
pmalacho-mit Dec 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
static/extension-bundles/*

# Mac OS
.DS_Store

Expand Down
2 changes: 1 addition & 1 deletion .husky/commit-msg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

npx --no-install commitlint --edit "$1"
npx --no-install commitlint --edit "$1" || true
Loading