VRFS-4741 - kill vanilla, bugsnag, olark

This commit is contained in:
Seth Call 2018-04-21 11:33:18 -05:00
parent 563a22ea9c
commit c6054e1e1c
16 changed files with 28 additions and 27 deletions

View File

@ -75,9 +75,7 @@
find knowledge base articles and post questions that have not already been answered. You can find knowledge base articles and post questions that have not already been answered. You can
email us at <a href="mailto:support@jamkazam" style="color:#fc0">support@jamkazam.com</a>. And if you just want to chat, share tips and war stories, email us at <a href="mailto:support@jamkazam" style="color:#fc0">support@jamkazam.com</a>.
and hang out with fellow JamKazam musicians, you can visit our <a href="http://forums.jamkazam.com/" style="color:#fc0">community forum</a>.
</p> </p>
<p> <p>

View File

@ -34,8 +34,7 @@ JamKazam offers a very robust and exciting set of features for playing online an
Getting Help Getting Help
------------ ------------
If you run into trouble and need help, please reach out to us. We will be glad to do everything we can to answer your questions and get you up and running. You can visit our Support Portal at https://jamkazam.desk.com/ to find knowledge base articles and post questions that have not already been answered. You can email us at support@jamkazam.com. And if you just want to chat, share tips and war stories, and hang out with fellow JamKazamers, you can visit our Community Forum at http://forums.jamkazam.com/. If you run into trouble and need help, please reach out to us. We will be glad to do everything we can to answer your questions and get you up and running. You can visit our Support Portal at https://jamkazam.desk.com/ to find knowledge base articles and post questions that have not already been answered. You can email us at support@jamkazam.com.
Again, welcome to JamKazam, and we look forward to seeing and hearing you online soon! Again, welcome to JamKazam, and we look forward to seeing and hearing you online soon!
Best Regards, Best Regards,

View File

@ -4,7 +4,8 @@ module JamRuby
observe JamRuby::Feedback observe JamRuby::Feedback
def after_validation(feedback) def after_validation(feedback)
CorpMailer.feedback(feedback).deliver_now unless feedback.errors.any? # got so much spam coming in :( no email sent now
#CorpMailer.feedback(feedback).deliver_now unless feedback.errors.any?
end end
end end
end end

View File

@ -64,6 +64,12 @@ end
Stripe.api_key = "sk_test_OkjoIF7FmdjunyNsdVqJD02D" Stripe.api_key = "sk_test_OkjoIF7FmdjunyNsdVqJD02D"
Recurly::API.net_http = {
ssl_version: :TLSv1_2,
#...
}
#uncomment the following line to use spork with the debugger #uncomment the following line to use spork with the debugger
#require 'spork/ext/ruby-debug' #require 'spork/ext/ruby-debug'

View File

@ -300,10 +300,10 @@
} }
if (show) { if (show) {
olark('api.box.show'); if(window.olark) olark('api.box.show');
} }
else { else {
olark('api.box.hide'); if(window.olark) olark('api.box.hide');
} }

View File

@ -375,8 +375,6 @@ context = window
rel="external">privacy</a>&nbsp;&nbsp;|&nbsp;&nbsp;<a rel="external">privacy</a>&nbsp;&nbsp;|&nbsp;&nbsp;<a
href="/corp/terms" rel="external">terms of href="/corp/terms" rel="external">terms of
service</a>&nbsp;&nbsp;|&nbsp;&nbsp;<a service</a>&nbsp;&nbsp;|&nbsp;&nbsp;<a
href="http://forums.jamkazam.com/" rel="external">community
forum</a>&nbsp;&nbsp;|&nbsp;&nbsp;<a
href="/corp/help" rel="external">help</a> href="/corp/help" rel="external">help</a>
</div> </div>
</div> </div>

View File

@ -105,11 +105,11 @@
} }
function afterShow() { function afterShow() {
olark('api.box.show'); if(window.olark) olark('api.box.show');
} }
function afterHide() { function afterHide() {
olark('api.box.hide'); if(window.olark) olark('api.box.hide');
wizard.onAfterHide(); wizard.onAfterHide();
context.jamClient.FTUESetStatus(true); context.jamClient.FTUESetStatus(true);

View File

@ -5,7 +5,7 @@
<!-- footer links --> <!-- footer links -->
<div id="footer-links"> <div id="footer-links">
<%= link_to "about", corp_about_path , :rel=>"external" %>&nbsp;&nbsp;|&nbsp;&nbsp;<%= link_to "news", corp_news_path , :rel=>"external" %>&nbsp;&nbsp;|&nbsp;&nbsp;<%= link_to "media", corp_media_center_path , :rel=>"external" %>&nbsp;&nbsp;|&nbsp;&nbsp;<%= link_to "contact", corp_contact_path , :rel=>"external" %>&nbsp;&nbsp;|&nbsp;&nbsp;<%= link_to "privacy", corp_privacy_path, :rel=>"external" %>&nbsp;&nbsp;|&nbsp;&nbsp;<%= link_to "terms of service", corp_terms_path , :rel=>"external" %>&nbsp;&nbsp;|&nbsp;&nbsp;<%= link_to "community forum", Rails.application.config.vanilla_url, :rel=>"external" %>&nbsp;&nbsp;|&nbsp;&nbsp;<%= link_to "help", corp_help_path , :rel=>"external" %> <%= link_to "about", corp_about_path , :rel=>"external" %>&nbsp;&nbsp;|&nbsp;&nbsp;<%= link_to "news", corp_news_path , :rel=>"external" %>&nbsp;&nbsp;|&nbsp;&nbsp;<%= link_to "media", corp_media_center_path , :rel=>"external" %>&nbsp;&nbsp;|&nbsp;&nbsp;<%= link_to "contact", corp_contact_path , :rel=>"external" %>&nbsp;&nbsp;|&nbsp;&nbsp;<%= link_to "privacy", corp_privacy_path, :rel=>"external" %>&nbsp;&nbsp;|&nbsp;&nbsp;<%= link_to "terms of service", corp_terms_path , :rel=>"external" %>&nbsp;&nbsp;|&nbsp;&nbsp;<%= link_to "help", corp_help_path , :rel=>"external" %>
</div> </div>
<%= render "clients/recordingManager" %> <%= render "clients/recordingManager" %>

View File

@ -39,14 +39,10 @@ script type='text/template' id='template-app-in-read-only-volume'
script type='text/template' id='template-shutdown-prompt' script type='text/template' id='template-shutdown-prompt'
.shutdown-prompt .shutdown-prompt
| You have two options when shutting down JamKazam:
ul ul
li li
span.definition SHUT DOWN span.definition SHUT DOWN
= '- The application will close immediately.' = '- Choosing this option will shutdown the application immediately.'
li
span.definition SYNC THEN SHUT DOWN
= '- Any pending recordings that you and others have made during sessions will be mastered - i.e. uploaded, mixed on our servers, and downloaded back to your computer - so that you have high quality versions of your recordings available. Once all recording synchronization is done, the application will shut down. This usually takes at most a few minutes.'
script type='text/template' id='template-mixer-mode-change' script type='text/template' id='template-mixer-mode-change'

View File

@ -52,7 +52,7 @@
<div id="copyright">Copyright &copy; <%= Time.now.year %> JamKazam, Inc. All Rights Reserved</div> <div id="copyright">Copyright &copy; <%= Time.now.year %> JamKazam, Inc. All Rights Reserved</div>
<!-- footer links --> <!-- footer links -->
<div id="footer-links"><%= link_to "about", corp_about_path %>&nbsp;&nbsp;|&nbsp;&nbsp;<%= link_to "news", corp_news_path %>&nbsp;&nbsp;|&nbsp;&nbsp;<%= link_to "media", corp_media_center_path %>&nbsp;&nbsp;|&nbsp;&nbsp;<%= link_to "contact", corp_contact_path %>&nbsp;&nbsp;|&nbsp;&nbsp;<%= link_to "privacy", corp_privacy_path %>&nbsp;&nbsp;|&nbsp;&nbsp;<%= link_to "terms of service", corp_terms_path %>&nbsp;&nbsp;|&nbsp;&nbsp;<%= link_to "community forum", Rails.application.config.vanilla_url, :rel=>"external" %>&nbsp;&nbsp;|&nbsp;<%= link_to "help", corp_help_path %></div> <div id="footer-links"><%= link_to "about", corp_about_path %>&nbsp;&nbsp;|&nbsp;&nbsp;<%= link_to "news", corp_news_path %>&nbsp;&nbsp;|&nbsp;&nbsp;<%= link_to "media", corp_media_center_path %>&nbsp;&nbsp;|&nbsp;&nbsp;<%= link_to "contact", corp_contact_path %>&nbsp;&nbsp;|&nbsp;&nbsp;<%= link_to "privacy", corp_privacy_path %>&nbsp;&nbsp;|&nbsp;&nbsp;<%= link_to "terms of service", corp_terms_path %>&nbsp;&nbsp;|&nbsp;&nbsp;<%= link_to "help", corp_help_path %></div>
<div id="version"><%= version %></div> <div id="version"><%= version %></div>
</div> </div>

View File

@ -64,12 +64,10 @@
<% if @nativeClient %> <% if @nativeClient %>
<li class="test-network"><%= link_to "Test Network", '#' %></li> <li class="test-network"><%= link_to "Test Network", '#' %></li>
<% end %> <% end %>
<li class="community-forum"><%= link_to "Community Forum", Rails.application.config.vanilla_url, :rel => "external" %></li>
<li class="get-help"><%= link_to "Get Help", 'https://jamkazam.desk.com/', :rel => "external" %></li> <li class="get-help"><%= link_to "Get Help", 'https://jamkazam.desk.com/', :rel => "external" %></li>
<li class="sign-out"><%= link_to "Sign Out", signout_path, method: "delete" %></li> <li class="sign-out"><%= link_to "Sign Out", signout_path, method: "delete" %></li>
<% else %> <% else %>
<li class="download-app"><%= link_to "Download App", downloads_path, :rel => "external" %></li> <li class="download-app"><%= link_to "Download App", downloads_path, :rel => "external" %></li>
<li class="community-forum"><%= link_to "Community Forum", Rails.application.config.vanilla_url, :rel => "external" %></li>
<li class="get-help"><%= link_to "Get Help", 'https://jamkazam.desk.com/', :rel => "external" %></li> <li class="get-help"><%= link_to "Get Help", 'https://jamkazam.desk.com/', :rel => "external" %></li>
<% end %> <% end %>

View File

@ -196,7 +196,7 @@ if defined?(Bundler)
config.allow_force_native_client = true config.allow_force_native_client = true
config.bugsnag_key = "4289fc981c8ce3eb0969003c4f498b01" config.bugsnag_key = "4289fc981c8ce3eb0969003c4f498b01"
config.bugsnag_notify_release_stages = ["production"] # add 'development' if you want to test a bugsnag feature locally config.bugsnag_notify_release_stages = [] # add 'development' if you want to test a bugsnag feature locally
config.recurly_webhook_user = 'monkeytoesspeartoss' config.recurly_webhook_user = 'monkeytoesspeartoss'
config.recurly_webhook_pass = 'frizzyfloppymushface' config.recurly_webhook_pass = 'frizzyfloppymushface'
@ -447,7 +447,7 @@ if defined?(Bundler)
config.lesson_join_time_window_minutes = 5 config.lesson_join_time_window_minutes = 5
config.lesson_wait_time_window_minutes = 10 config.lesson_wait_time_window_minutes = 10
config.end_of_wait_window_forgiveness_minutes = 1 config.end_of_wait_window_forgiveness_minutes = 1
config.olark_enabled = true config.olark_enabled = false
config.jamclass_enabled = false config.jamclass_enabled = false
config.musician_count = '75,000+' config.musician_count = '75,000+'
config.jamblaster_menu = false config.jamblaster_menu = false

View File

@ -7,5 +7,5 @@ Bugsnag.configure do |config|
end end
EventMachine.error_handler { |e| EventMachine.error_handler { |e|
Bugsnag.notify(e) #Bugsnag.notify(e)
} }

View File

@ -2,3 +2,8 @@ Recurly.api_key = Rails.configuration.recurly_private_api_key
Recurly.subdomain = Rails.configuration.recurly_subdomain Recurly.subdomain = Rails.configuration.recurly_subdomain
Recurly.default_currency = 'USD' Recurly.default_currency = 'USD'
Recurly.logger = Rails.logger Recurly.logger = Rails.logger
Recurly::API.net_http = {
ssl_version: :TLSv1_2,
#...
}

View File

@ -282,7 +282,7 @@
<!-- footer links --> <!-- footer links -->
<div id="footer-links"> <div id="footer-links">
<a href="http://www.jamkazam.com/corp/about" rel="external">about</a>&nbsp;&nbsp;|&nbsp;&nbsp;<a href="http://www.jamkazam.com/corp/news" rel="external">news</a>&nbsp;&nbsp;|&nbsp;&nbsp;<a href="http://www.jamkazam.com/corp/media_center" rel="external">media</a>&nbsp;&nbsp;|&nbsp;&nbsp;<a href="http://www.jamkazam.com/corp/contact" rel="external">contact</a>&nbsp;&nbsp;|&nbsp;&nbsp;<a href="http://www.jamkazam.com/corp/privacy" rel="external">privacy</a>&nbsp;&nbsp;|&nbsp;&nbsp;<a href="http://www.jamkazam.com/corp/terms" rel="external">terms of service</a>&nbsp;&nbsp;|&nbsp;&nbsp;<a href="http://forums.jamkazam.com/" rel="external">community forum</a>&nbsp;&nbsp;|&nbsp;&nbsp;<a href="http://www.jamkazam.com/corp/help" rel="external">help</a> <a href="http://www.jamkazam.com/corp/about" rel="external">about</a>&nbsp;&nbsp;|&nbsp;&nbsp;<a href="http://www.jamkazam.com/corp/news" rel="external">news</a>&nbsp;&nbsp;|&nbsp;&nbsp;<a href="http://www.jamkazam.com/corp/media_center" rel="external">media</a>&nbsp;&nbsp;|&nbsp;&nbsp;<a href="http://www.jamkazam.com/corp/contact" rel="external">contact</a>&nbsp;&nbsp;|&nbsp;&nbsp;<a href="http://www.jamkazam.com/corp/privacy" rel="external">privacy</a>&nbsp;&nbsp;|&nbsp;&nbsp;<a href="http://www.jamkazam.com/corp/terms" rel="external">terms of service</a>&nbsp;&nbsp;|&nbsp;&nbsp;<a href="http://www.jamkazam.com/corp/help" rel="external">help</a>
</div> </div>
<div class="clearall"></div> <div class="clearall"></div>

View File

@ -41,7 +41,7 @@ module JamWebsockets
EventMachine.error_handler{|e| EventMachine.error_handler{|e|
puts "unhandled error #{e}" puts "unhandled error #{e}"
@log.error "unhandled error #{e}" @log.error "unhandled error #{e}"
Bugsnag.notify(e) #Bugsnag.notify(e)
} }
EventMachine.run do EventMachine.run do
@ -141,7 +141,7 @@ module JamWebsockets
begin begin
blk.call blk.call
rescue => e rescue => e
Bugsnag.notify(e) #Bugsnag.notify(e)
@log.error("unhandled exception in EM Timer #{e}") @log.error("unhandled exception in EM Timer #{e}")
puts "Error during processing: #{$!}" puts "Error during processing: #{$!}"
puts "Backtrace:\n\t#{e.backtrace.join("\n\t")}" puts "Backtrace:\n\t#{e.backtrace.join("\n\t")}"