Skip to content

Feature/albums#31

Merged
larkinds merged 6 commits intostagingfrom
feature/albums
Feb 26, 2021
Merged

Feature/albums#31
larkinds merged 6 commits intostagingfrom
feature/albums

Conversation

@larkinds
Copy link
Copy Markdown
Owner

@larkinds larkinds commented Feb 26, 2021

Fully functioning albums sidebar with tracks that play/add-to-queue

@larkinds larkinds changed the base branch from master to staging February 26, 2021 02:36
Copy link
Copy Markdown
Collaborator

@jkmartindale jkmartindale left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just wanna see the track labels fixed like with playlists

Since you branched off feature/playlist instead of staging (totally understand how easy it is to accidentally branch off another feature branch), we'll need to wait until #30 gets merged in, and then very carefully resolve merge conflicts coming from this branch's copy of the work in feature/playlist. Should probably be merged in with Squash and Merge.

larkinds and others added 5 commits February 26, 2021 09:57
End of  file line break added

Co-authored-by: James Martindale <11380394+jkmartindale@users.noreply.github.com>
Lovely Nullish Coalescing Operator added

Co-authored-by: James Martindale <11380394+jkmartindale@users.noreply.github.com>
this.description updated in AlbumsAndTracks constructor

Co-authored-by: James Martindale <11380394+jkmartindale@users.noreply.github.com>
Cleaned up comment
@larkinds larkinds merged commit 8b58fd6 into staging Feb 26, 2021
@jkmartindale jkmartindale deleted the feature/albums branch February 26, 2021 16:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants