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:
Seth Call 2014-03-11 07:41:18 +00:00
parent 24f8bb257c 45597d90e8
commit 164a4fdbe1
5 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/app/assets/javascripts/invitationDialog.js.erb
View File

@ -194,7 +194,7 @@
var obj = {
method: 'feed',
link: signupUrl,
picture: 'http://jamkazam.com/assets/logo.png',
picture: 'http://www.jamkazam.com/assets/web/logo-512.png',
name: 'Join me on JamKazam',
caption: 'Play live music in real-time sessions with others over the Internet, as if in the same room.',
description: '',

5
web/app/controllers/corps_controller.rb
View File

@ -50,11 +50,6 @@ class CorpsController < ApplicationController
end
# TODO: FIX THIS
def press_releases_launch
end
def privacy
end

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

@ -77,7 +77,7 @@
Finally, musicians can use JamKazam to find other musicians in their area, check out their skills, styles, and listen to their performances, and connect to play together online and/or offline.
</p>
<h2>BENEFITS:</h2>
<h2>BENEFITS:</h2><br/>
<p>
Everyone who plays music knows that it’s far more fun to play with others than to play alone. But many musicians – especially amateur musicians – are not in bands and don’t have established networks of musician friends to play with, simply because of the time and logistical challenges of playing with others, as described earlier. With JamKazam, musicians can easily find other musicians in their area who want to play together online, and who have complementary instruments, skill levels, and musical interests. And they can easily try playing with others without the risk or investment of time to meet in person.
</p>

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="/press-releases/launch">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="" 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>

3
web/config/routes.rb
View File

@ -106,9 +106,6 @@ SampleApp::Application.routes.draw do
match '/audio', to: 'corps#audio', as: 'corp_audio'
match '/videos', to: 'corps#videos', as: 'corp_videos'
# TODO: make this more dynamic and managed via admin
match '/press-releases/launch', to: 'corps#press_releases_launch', as: 'corp_press_releases_launch'
# contact routes
match '/contact', to: 'corps#contact', as: 'corp_contact'