seth
/
jam-cloud
mirror of https://bitbucket.org/jamkazam/jam-cloud.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop

This commit is contained in:
Brian Smith 2014-10-20 21:33:32 -04:00
parent 447c391324 85fa427f02
commit d17d4ede99
5 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
web/app/assets/images/content/icon_instrument_ukelele24.png → web/app/assets/images/content/icon_instrument_ukulele24.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 787 B

After

Width:  |  Height:  |  Size: 787 B

0
web/app/assets/images/content/icon_instrument_ukelele256.png → web/app/assets/images/content/icon_instrument_ukulele256.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.5 KiB

After

Width:  |  Height:  |  Size: 5.5 KiB

0
web/app/assets/images/content/icon_instrument_ukelele45.png → web/app/assets/images/content/icon_instrument_ukulele45.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

2
web/app/assets/javascripts/feedHelper.js
View File

@ -179,7 +179,7 @@
if(data.displayText) $status.text(data.displayText);
if(data.isEnd) stopSessionPlay();
if(data.isEnd) stopSessionPlay($feedItem);
if(data.isSessionOver) {
$controls.removeClass('inprogress').addClass('ended')

2
web/app/assets/javascripts/utils.js
View File

@ -78,7 +78,7 @@
"trombone": "trombone",
"trumpet": "trumpet",
"tuba": "tuba",
"ukulele": "ukelele",
"ukulele": "ukulele",
"upright bass": "upright_bass",
"viola": "viola",
"violin": "violin",