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

Update README.md #295

Open
wants to merge 2 commits into
base: z_archive/dev
Choose a base branch
from
Open

Update README.md #295

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d92f1c8
Update README.md
muganwas Apr 24, 2022
cd1053b
Merge branch 'z_archive/dev' into documentation/ReadMeUpdate
muganwas Apr 24, 2022
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
17 changes: 16 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ We use [git flow](https://www.atlassian.com/git/tutorials/comparing-workflows/gi
- Create feature/bug branches for every issue; put issue ID brance name, e.g. "bug/163-fix-step-count" for [Issue #163](https://github.com/irllabs/roundaround/issues/163)
- Merge `feature` branches into `stage` as soon as it's ready to minimize merge conflicts and lack of transparency in what the code will look like once it's deployed to `prod`.

### Branchines
### Branches

- `master` - always runs, is deployed to `prod` (http://rounds.studio and http:/rounds.irl.studio)
- `stage` - always runs, features are merged to it; is deployed to `stage` (http://roundaround-stage.web.app) when testing integration of features
Expand Down Expand Up @@ -113,3 +113,18 @@ make sure the site is running locally.

- Make sure you have the jaasauth.pk private key file in the root of the functions folder (not kept in git)
- `firebase deploy --only functions`

## Branches Status

### Main & Stage

The most recent feature to be added https://github.com/irllabs/roundaround/issues/213
Moved pattern presets/sequencer to center of round from the left side as seen in the designs below.
Figma designs https://www.figma.com/file/oRhqOzPSgnMgFPPz0tLWjv/Rounds-SoT?node-id=1733%3A198459

### develop

Feature under development https://github.com/irllabs/roundaround/issues/285
Currently users can:
1 - create new round using a custom instrument/sound
2 - add custom instrument to an existing round