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' into vrfs1110

This commit is contained in:
Jonathan Kolyer 2014-03-13 07:49:10 +00:00
parent 61c509422b 90ab928a7c
commit a91092a048
7 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
web/app/assets/javascripts/AAA_Log.js
View File

@ -1,4 +1,4 @@
(function(context, $) {
(function (context, $) {
"use strict";
@ -22,6 +22,11 @@
});
}
if (!console.debug) {
console.log("No console.debug found - defining...");
context.console.debug = function() { console.log(arguments); }
}
context.JK.logger = context.console;
// JW - some code to tone down logging. Uncomment the following, and

1
web/app/assets/javascripts/hoverFan.js
View File

@ -51,6 +51,7 @@
}
var fanHtml = context.JK.fillTemplate(template, {
userId: response.id,
avatar_url: context.JK.resolveAvatarUrl(response.photo_url),
name: response.name,
location: response.location,

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

@ -731,7 +731,7 @@
}
if (notifyDetails !== undefined) {
setNotificationInfo(notifyDetails.message, notifyDetails.descriptor);
setNotificationInfo(notifyDetails.message, notifyDetails.descriptor, $notify);
}
notifyDetails = {};

12
web/app/controllers/users_controller.rb
View File

@ -198,12 +198,12 @@ class UsersController < ApplicationController
def welcome
@slides = [
Slide.new("JamKazam Overview", "web/carousel_musicians.jpg", "http://www.youtube.com/embed/ylYcvTY9CVo?autoplay=1"),
Slide.new("Getting Started", "web/carousel_fans.jpg", "http://www.youtube.com/embed/eaYNM7p6Z5s"),
Slide.new("Playing in a Session", "web/carousel_bands.jpg", "http://www.youtube.com/embed/eaYNM7p6Z5s"),
Slide.new("JamKazam Overview", "web/carousel_musicians.jpg", "http://www.youtube.com/embed/ylYcvTY9CVo?autoplay=1"),
Slide.new("Getting Started", "web/carousel_fans.jpg", "http://www.youtube.com/embed/eaYNM7p6Z5s"),
Slide.new("Playing in a Session", "web/carousel_bands.jpg", "http://www.youtube.com/embed/eaYNM7p6Z5s")
Slide.new("JamKazam Overview", "web/carousel_musicians.jpg", "http://www.youtube.com/embed/ylYcvTY9CVo?autoplay=1"),
Slide.new("Getting Started", "web/carousel_fans.jpg", "http://www.youtube.com/embed/ylYcvTY9CVo?autoplay=1"),
Slide.new("Playing in a Session", "web/carousel_bands.jpg", "http://www.youtube.com/embed/ylYcvTY9CVo?autoplay=1"),
Slide.new("JamKazam Overview", "web/carousel_musicians.jpg", "http://www.youtube.com/embed/ylYcvTY9CVo?autoplay=1"),
Slide.new("Getting Started", "web/carousel_fans.jpg", "http://www.youtube.com/embed/ylYcvTY9CVo?autoplay=1"),
Slide.new("Playing in a Session", "web/carousel_bands.jpg", "http://www.youtube.com/embed/ylYcvTY9CVo?autoplay=1")
]
@promo_buzz = PromoBuzz.active

4
web/app/views/clients/_ftue.html.erb
View File

@ -112,8 +112,8 @@
<p class="unknown" style="display:none;">Unable to determine latency. Please click <a href="#" layout-wizard-link="1">here</a> to try another test which may be able to determine your audio performance.</p>
<p class="neutral loading" style="display:none;">Estimating latency...</p>
<p class="good" style="display:none;">Your audio speed is good. When done with settings, click Save Settings to continue.</p>
<p class="acceptable" style="display:none;">Your audio speed is acceptable, but borderline. Try setting Frame to 2.5 and Buffers to 0 and see if your audio quality is still OK. When done with settings, click Save Settings to continue. You can also view the <a href="https://jamkazam.desk.com/customer/portal/articles/1292412-choosing-an-audio-device" rel="external">Choosing an Audio Device</a> article for information on faster audio devices.</p>
<p class="bad" style="display:none;">We're sorry, but your audio speed is too slow to use JamKazam. Try setting Frame to 2.5 and Buffers to 0 and see if your audio quality is still OK. You can also view the <a href="https://jamkazam.desk.com/customer/portal/articles/1292412-choosing-an-audio-device" rel="external">Choosing an Audio Device</a> article for information on faster audio devices. You can also click <a href="#" layout-wizard-link="1">here</a> to try another test which may be able to measure your audio performance more accurately.</p>
<p class="acceptable" style="display:none;">Your audio speed is acceptable, but borderline. You can view the <a href="https://jamkazam.desk.com/customer/portal/articles/1292412-choosing-an-audio-device" rel="external">Choosing an Audio Device</a> article for information on faster audio devices.</p>
<p class="bad" style="display:none;">We're sorry, but your audio speed is too slow to use JamKazam. You can view the <a href="https://jamkazam.desk.com/customer/portal/articles/1292412-choosing-an-audio-device" rel="external">Choosing an Audio Device</a> article for information on faster audio devices. You can also click <a href="#" layout-wizard-link="1">here</a> to try another test which may be able to measure your audio performance more accurately.</p>
</div>
</div>
</div>

2
web/app/views/corps/media_center.html.erb
View File

@ -46,7 +46,7 @@
<br clear="all"><br/>
<ul class="media_links">
<li>
<span class="press-date">March 12, 2014</span><a href="" target="_blank">JamKazam Lets Musicians Play Together from Different Locations</a> - Six Bands at SXSW to Use JamKazam to Perform in “Virtual Jam Fest”
<span class="press-date">March 12, 2014</span><a href="http://www.businesswire.com/news/home/20140312005285/en#.UyBQfvldVps" target="_blank">JamKazam Lets Musicians Play Together from Different Locations</a> - Six Bands at SXSW to Use JamKazam to Perform in “Virtual Jam Fest”
</li>
</ul>
</td>

2
web/app/views/users/_signupDialog.html.erb
View File

@ -22,8 +22,6 @@
<div class="center">
<small>Already have an account? <a href="#" class='show-signin-dialog'>Sign In</a><br>
<br>
<h2 style="color:white;font-size:x-large">Signups not accepted until Wednesday, March 12th</h2>
<br>
<a href="#" class="signup-cancel">Cancel</a></small>
</div>