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

Jump to bottom

Official release pt 2 #91 #93

Merged
merged 32 commits into from
Nov 19, 2017
Merged

Official release pt 2 #91 #93

merged 32 commits into from
Nov 19, 2017

Conversation

jbkuczma
Copy link
Owner

merging develop into master #91

wenxuans and others added 30 commits October 23, 2017 14:12
@wenxuans
Update README.md for CSE442 Activity
246331a 
This is for the collaboration phase activity. Feel free to delete.
@jbkuczma
for #74 add backend api routes and update the create_db script
b88a8d8
@Rmiller1673
Getting rid of Youtube search channel bug #72
5803916
@Rmiller1673
Getting rid of Youtube search channel bug #72
64fc2a7
@jbkuczma
Merge pull request #77 from jbkuczma/Youtube_Channel_Bug
98ca625 
Youtube channel bug
@jbkuczma
for #74 post to previous table
ac6595b
@deankostorowski
start of front end for recently played song list
9e77491
@Rmiller1673
Add on for previously played songs
bb15785
@jbkuczma
for #74 show guests the room's previously played songs
f858f0b
@jbkuczma
for #74 delete previously played songs from table on room close
b050635
@jbkuczma
for #74 template changes
ea2e2db
@jbkuczma
for #74 center columns
9b152a4
@jbkuczma
bump version numbers for release
1a3088b
@Rmiller1673
Overlay message when adding a song to the queue
a57ec6a
@Rmiller1673
Overlay message when adding a song to the queue
99a29d0
@Rmiller1673
Overlay message when adding a song to the queue
1963258
@deankostorowski
Merge pull request #81 from jbkuczma/previously_played
95b6b6f 
Add On - show guests previously played songs for a room #74
@jbkuczma
Merge pull request #82 from jbkuczma/Overlay_Resaon_Message
da6b7af 
Overlay resaon message
@jbkuczma
release touchups
cc50946
@deankostorowski
Merge pull request #83 from jbkuczma/collab_release
162186d 
release touchups #76
@wenxuans
Changed API key
99c4409
@wenxuans
Modified style of room page
cc969a1
@wenxuans
Removed console.log from auth.js
e93dce3
@wenxuans
Modified style of rooms page
55f2925
@jbkuczma
Merge branch 'develop' into wendy-collab
6c7dd6a
@jbkuczma
Merge branch 'develop' into wendy-collab
ce70245
@jbkuczma
Merge pull request #84 from wenxuans/wendy-collab
273f4bf 
Updated CSS for search results
@Rmiller1673
Width for search results updated to 100%
65d2f59 
issue #88
@deankostorowski
Merge pull request #89 from jbkuczma/width_for_search_results
345827e 
Width for search results updated to 100%
@jbkuczma
For #91 update to v1.0
0120b4c
@jbkuczma jbkuczma added this to the Official Release milestone Nov 19, 2017
@jbkuczma jbkuczma self-assigned this Nov 19, 2017
deankostorowski
deankostorowski approved these changes Nov 19, 2017
View reviewed changes
Copy link
Collaborator

@deankostorowski deankostorowski left a comment

Choose a reason for hiding this comment

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

☺☺☺

@deankostorowski deankostorowski merged commit b515c13 into master Nov 19, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@deankostorowski deankostorowski deankostorowski approved these changes

@Rmiller1673 Rmiller1673 Awaiting requested review from Rmiller1673

Assignees

@jbkuczma jbkuczma

Labels
None yet
Projects
None yet
Milestone
Official Release
Development

Successfully merging this pull request may close these issues.
4 participants
@jbkuczma @deankostorowski @wenxuans @Rmiller1673