Seth Call
64a93dd42f
support beta
2026-02-28 20:39:34 -06:00
Seth Call
eb52813822
defaut beta to true
2026-02-21 08:56:52 -06:00
Seth Call
8613a03d00
ok fix the API more
2026-02-16 09:05:12 -06:00
Seth Call
8f0b8929ba
ars apis
2026-02-15 22:04:17 -06:00
Seth Call
08e1c5274d
track utm_id
2026-02-04 21:53:19 -06:00
Seth Call
5f347ccfac
handle All
2026-02-04 21:31:23 -06:00
Seth Call
ca2bf19b7a
cleanup query
2026-02-04 20:58:16 -06:00
Seth Call
fad1f9d6d9
Add paid = cpc on jammers cohots
2026-02-04 19:53:00 -06:00
Seth Call
51838fb413
Remove test drive
2026-02-03 19:05:12 -06:00
Seth Call
45cb401112
Controls for user source
2026-02-01 14:15:41 -06:00
Seth Call
9078515984
user source update
2026-01-31 12:20:37 -06:00
Seth Call
52ae83e2f4
Addtocart instead
2026-01-31 12:15:26 -06:00
Seth Call
b454cf9ead
AddToCart
2026-01-28 20:04:40 -06:00
Seth Call
65f5624ff9
add array support for facebook ad source
2026-01-24 00:02:44 -06:00
Seth Call
e82450dfe9
Support more utm tracking
2026-01-23 23:17:35 -06:00
Seth Call
f1992eaa78
build this
2026-01-22 22:36:22 -06:00
Seth Call
bdeecc76c6
fix reporting
2026-01-22 21:21:17 -06:00
Seth Call
8c8024c12b
event test code
2026-01-19 13:48:26 -06:00
Seth Call
c183af3d6b
remove rails logger ref
2026-01-19 13:21:26 -06:00
Seth Call
ab424c21d2
use puts
2026-01-19 12:49:37 -06:00
Seth Call
753f35b24d
click signup redirects to the right place in jam-ui
2026-01-19 12:34:30 -06:00
Seth Call
624853c868
Store UTM cookies
2026-01-16 22:15:36 -06:00
Seth Call
71d8571eb9
JKLayout adding Meta Tracking
2026-01-16 16:44:46 -06:00
Seth Call
fae16c7483
better logging on CAPI
2026-01-15 08:00:34 -06:00
Seth Call
253a6c566b
Bettor logging
2026-01-15 07:59:27 -06:00
Seth Call
ed561be4b5
meta_tracking included
2026-01-14 19:56:42 -06:00
Seth Call
eb69640667
fix utm source
2026-01-14 14:54:56 -06:00
Seth Call
9b0a9d1f32
cleanup around app-config
2026-01-14 14:42:22 -06:00
Seth Call
e1cc5483a2
facebook pixel id and access token
2026-01-14 12:17:39 -06:00
Seth Call
73d2a7a020
more changes for event rework
2026-01-14 10:30:33 -06:00
Seth Call
eb298d6859
fix
2026-01-14 09:20:57 -06:00
Seth Call
93c4154648
add capi transmitter and missing event type
2026-01-14 08:58:37 -06:00
Seth Call
fbd871d204
reviewing
2026-01-14 08:52:19 -06:00
Seth Call
0d82f6ee16
allow video tokens to last a long time
2026-01-08 06:03:58 -06:00
Seth Call
1279b16ec0
Update manifest maker
2025-10-26 14:33:00 -05:00
Seth Call
e3cff0a825
Uncomment TrialReminders
2025-10-18 17:40:46 -05:00
Nuwan Chaturanga
6a6e4cde09
Merged in fix_plg_email_delivery_timeing_issue (pull request #70 )
...
fix PLG email timing
Approved-by: Seth Call
2025-10-17 13:16:50 +00:00
Seth Call
1dd15fb0aa
Add tests for all PLG emails
2025-10-17 08:15:46 -05:00
Seth Call
9282369e54
VRFS-5690 - tag jamtrack and jammers separetly on admin report - fix jammers view
2025-10-13 15:23:01 -05:00
Seth Call
828191d683
VRFS-5690 - tag jamtrack and jammers separetly on admin report - fix jammers view
2025-10-13 15:16:41 -05:00
Seth Call
c0031cfe3d
VRFS-5690 - tag jamtrack and jammers separetly on admin report
2025-10-13 14:33:45 -05:00
Seth Call
9b17546082
omit trial send reminders for now
2025-10-13 12:02:44 -05:00
Seth Call
eed3d51f4b
VRFS-5691 - fix both the jamtrack flow and the inability to sign out - take 2
2025-10-13 11:44:17 -05:00
Seth Call
4eac68b645
VRFS-5691 - fix both the jamtrack flow and the inability to sign out
2025-10-12 11:55:50 -05:00
Nuwan
fe6157e8cf
ensure not to send email 2 and 3 tighltly behind email 1 in this sequence
2025-09-30 13:14:39 +05:30
Nuwan
675bf2b69c
fix PLG email timing
...
do not send emails if the date has passed
2025-09-22 00:07:16 +05:30
Nuwan
4ffc0d9b3b
Merge branch 'develop' of ssh://altssh.bitbucket.org:443/jamkazam/jam-cloud into develop
2025-08-20 20:36:18 +05:30
Nuwan
7b665325f7
unsubscribe/change email confirmation fixes
2025-08-20 20:34:52 +05:30
Nuwan
eab17b3340
uncomment the lines
...
uncomment the lines which were disabled for debug purposes in the
prev. commit
2025-08-20 20:34:52 +05:30
Nuwan
4fafe30141
add more changes which were missed in prev. commit
2025-08-20 20:34:52 +05:30
Nuwan
7f85c91601
trail end reminderd
...
send emails when the trail perieod expired.
2025-08-20 20:34:52 +05:30
Nuwan
d424026f17
fix payment method page element loading
...
this resolves the race condition issue when loading recurly payment element
and hence sometimes it wasn't showing
2025-08-20 20:31:44 +05:30
Nuwan Chaturanga
a4f8935b3a
Merged in fix_403_errors_in_public_pages (pull request #69 )
...
unsubscribe/change email confirmation fixes
Approved-by: Seth Call
2025-08-19 16:19:12 +00:00
Nuwan Chaturanga
4f837ae67f
Merged in 5662-trial_end_reminder_emails (pull request #68 )
...
trail end reminderd
Approved-by: Seth Call
2025-08-19 16:07:57 +00:00
Nuwan
0053775c7e
uncomment the lines
...
uncomment the lines which were disabled for debug purposes in the
prev. commit
2025-08-19 21:04:28 +05:30
Nuwan
9d6c71829f
unsubscribe/change email confirmation fixes
2025-08-19 20:39:39 +05:30
Nuwan
d00a0c08f7
add more changes which were missed in prev. commit
2025-08-19 02:13:16 +05:30
Nuwan
7e2c917ca0
trail end reminderd
...
send emails when the trail perieod expired.
2025-08-19 00:07:09 +05:30
Nuwan Chaturanga
a84a55f178
Merged in 5661-PLG-play-with-others (pull request #67 )
...
PLG email for 2+ session
Approved-by: Seth Call
2025-08-16 23:50:48 +00:00
Nuwan
25ecab2c65
fix billing details + card data processing
...
remove saving billing address details to database in the first place
before sending to recurly. Now the backend handles address data saving
after success response from recurly.
2025-08-15 18:31:03 +05:30
Nuwan
b2f344fd30
PLG email for 2+ session
...
email reminders for the users to have 2+ session
VRFS-5661
2025-08-14 22:06:18 +05:30
Nuwan
3bba9ec619
fix error in user_observer
2025-08-13 14:37:31 +05:30
Nuwan
86e03e0ba7
change email confirm page
2025-08-13 14:26:58 +05:30
Nuwan
67fd15c75c
wip after changing email show confirmation page within new website
2025-08-13 13:51:54 +05:30
Nuwan
b7a41c6465
unsubscribe page
...
add page in new website to be shown to the users
when they follow unsubscribe link (in email footer)
2025-08-06 20:30:12 +05:30
Nuwan
a8d5b8e735
update in the front end showing user payment details persistance
2025-07-29 22:37:54 +05:30
Nuwan
f977b7298e
fix error when showing if user has stored card
...
fix the issue of showing this information incorrectly on payment method
page. also this comment disables front end validation of card details
2025-07-28 18:47:02 +05:30
Seth Call
9a41e8a236
Fix cutoff_date not being passed in and requirees of TestGearSetup
2025-07-25 20:06:47 -05:00
Nuwan Chaturanga
3d113e3877
Merged in 5646-test_session_reminder (pull request #66 )
...
PLG feature for Test Session reminder emails
* PLG feature for Test Session reminder emails
Implement the Test Session reminder emails VRFS-5646
* cutoff date for test gear reminder email
add cutoff date config to limit the selection after a certain date
add batch_size:100 to loops
Approved-by: Seth Call
2025-07-25 23:13:21 +00:00
Nuwan Chaturanga
c7e80a0694
Merged in 5645-payment_method_page (pull request #65 )
...
5645 payment method page
* wip payment method in new site
* payment method page
new page to add user's payment method (credit card / paypal) alone
with billing address details
* Update recurly/braintree tokens
Approved-by: Seth Call
2025-07-24 03:25:55 +00:00
Nuwan
9058c8af1d
load jamserver.js
...
instead of jamserver.js instead of jamserver_copy.js when loading
react.js front end. jamserver_copy for some reason desn not load
all of the javascripts needed to get for example subscription messages
to be captured in the front end.
2025-07-18 19:38:14 +05:30
Seth Call
08008a6dc3
Fix the determination about profile_completed_at
2025-06-23 19:56:36 -05:00
Seth Call
8645328cce
Oops. missed images for obs plugin site
2025-06-15 15:18:37 -05:00
Seth Call
38388d2afb
Unblock pkg uploading in admin web
2025-06-15 13:13:05 -05:00
Seth Call
e4d5fccdf5
Merged in seth/obs-download (pull request #63 )
...
Seth/obs download
* wip
* Merge branch 'develop' into seth/obs-download
* Working. Waiting on final UI approval
* Merge branch 'develop' into seth/obs-download
2025-06-15 00:44:11 +00:00
Seth Call
5f3a327d35
Enable send reminders code, because saving profile_completed_at now
2025-06-14 17:37:34 -05:00
Seth Call
51ed748013
DB updates after actually updating prod
2025-06-14 10:02:18 -05:00
Seth Call
dcdf9e55a3
Fix develop
2025-06-14 01:14:35 -05:00
Seth Call
7c9e449c4b
Hookup gear reminder emails
2025-06-14 00:33:03 -05:00
Seth Call
e7923dca9b
Updated both background jobs to not break HourlyJob
2025-06-14 00:22:02 -05:00
Nuwan Chaturanga
55372bf83d
Merged in 5631-signup-survey (pull request #61 )
...
signup survey email sending
* signup survey email sending
Send new user survey email 24 hours after signup to all new users
* add config parameters
add config.signup_survey_url, config.signup_survey_cutoff_date
2025-06-13 12:02:21 +00:00
Seth Call
0f556bfad4
Only allow stopping a recording if you are the owner
2025-06-11 22:00:42 -05:00
Nuwan
817719d539
show pointer cursor on download app links
2025-05-29 16:15:43 +05:30
Nuwan
cd229a0b42
fix legacy app client download links
2025-05-29 15:52:31 +05:30
Nuwan
b6e2fe7494
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2025-05-27 06:54:49 +05:30
Nuwan
ad1d8ea373
client downloads - fix download link for legacy clients
2025-05-27 06:54:27 +05:30
Nuwan Chaturanga
2d5d93787f
Merged in 5539-gear_setup_reminders (pull request #59 )
...
gear setup reminder emails
* gear setup reminder emails
email reminders to setup audio gear
Approved-by: Seth Call
2025-05-23 12:53:49 +00:00
Nuwan
676cbaa656
include subscription_utils script
2025-05-23 16:19:18 +05:30
Nuwan
d4e0e41186
fix duplicate sessions in browse sessions page
2025-05-22 19:17:21 +05:30
Nuwan
49d3e2a4ac
list sessions according to the fetch status
2025-05-21 13:56:49 +05:30
Nuwan
97d23a6bcb
do not show upcoming events in event listing
2025-05-21 12:07:16 +05:30
Nuwan
0f7b9b2884
fix null value error in session list
2025-05-20 18:27:43 +05:30
Nuwan
0d25814e6e
list current sessions
2025-05-20 14:24:28 +05:30
Nuwan
1e0faa7309
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2025-05-19 00:41:21 +05:30
Nuwan
10e6fedb5c
revert to list all sesions
2025-05-19 00:40:53 +05:30
Nuwan
d6dc79b478
fix data reference error
2025-05-19 00:40:40 +05:30
Nuwan
1071dec044
revert to list all sesions
2025-05-18 20:23:11 +05:30
Nuwan
403a830157
list friends, public and inactive sessions in browse session page
2025-05-18 19:54:12 +05:30
Nuwan Chaturanga
c3bd62c0cc
Merged in 5534-profile-reminder-emails (pull request #58 )
...
5534 profile reminder emails
* Profile prompts & reminders
3 email reminders to for new users who have not completed their
jamkazam profile
* PR change requests. moved email sernding job to hourly job tasks. and add database table index
Approved-by: Seth Call
2025-05-13 12:02:46 +00:00
Nuwan Chaturanga
71716b2240
Merged in 5534-profile-reminder-emails (pull request #54 )
...
Profile prompts & reminders
* Profile prompts & reminders
3 email reminders to for new users who have not completed their
jamkazam profile
* PR change requests. moved email sernding job to hourly job tasks. and add database table index
Approved-by: Seth Call
2025-04-05 20:18:38 +00:00
Seth Call
3a6d86e23c
Fix real session check
2025-04-01 20:15:23 -05:00
Seth Call
d1b9c8b19a
Fix issue with actually saving the jamtrack right
2025-03-30 10:15:33 -05:00
Seth Call
615158baf2
only search on email when it's clear user is putting in an email
2025-03-30 08:49:28 -05:00
Seth Call
a392d59df4
limit users autocomplete to 40
2025-03-29 11:35:27 -05:00
Seth Call
8bfb339fd5
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2025-03-28 23:27:35 -05:00
Seth Call
15f9beecf6
Fix jamtrack right field
2025-03-28 23:27:27 -05:00
Nuwan
fcc49c52a1
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2025-03-27 12:25:57 +05:30
Seth Call
e9d2ed7617
Ooops, missed brace
2025-03-27 12:25:28 +05:30
Seth Call
685a566c85
Stop double-counting page vies
2025-03-27 12:25:28 +05:30
Seth Call
4c95ad58ac
Remove extra pageView hit
2025-03-27 12:25:28 +05:30
Seth Call
8519b56c5a
Remove public URL from router basename
2025-03-27 12:25:28 +05:30
Seth Call
62d66fac75
Add GA to landing pages and fix build constant
2025-03-27 12:25:28 +05:30
Seth Call
f4b1ab59e0
Cleaned up BrowserRouter, and added GA
2025-03-27 12:25:28 +05:30
Seth Call
0b60c8d0cc
Load iframe later
2025-03-27 12:25:28 +05:30
Seth Call
d4fcb0c19f
fix signup path
2025-03-27 12:25:28 +05:30
Seth Call
98b70724a4
sitemap location fix
2025-03-27 12:25:28 +05:30
Seth Call
8f9f7d90fa
Convert large pngs to webp, and create sitemap.xml
2025-03-27 12:25:28 +05:30
Seth Call
81627fc37f
Add some useful filters
2025-03-27 12:25:28 +05:30
Seth Call
49888b9b5b
Update indexs and speed up partner page
2025-03-27 12:25:28 +05:30
Seth Call
b2c2129d42
Better reporting for quarterly payments
2025-03-27 12:25:28 +05:30
Seth Call
35a5f9f17c
Add more partner fields to affiliate_traffic_total
2025-03-27 12:25:28 +05:30
Seth Call
b942265652
Update Referral Admin-web page to be more useful
2025-03-27 12:25:28 +05:30
Seth Call
b657511310
Revert "Update Referrals page to list more partner info"
...
This reverts commit a2c607b449 .
2025-03-27 12:25:28 +05:30
Seth Call
a687356d72
Update Referrals page to list more partner info
2025-03-27 12:25:28 +05:30
Seth Call
f4c71f9778
Why can't I figure this PUBLIC_URL process env out
2025-03-27 12:25:28 +05:30
Seth Call
1120d8be31
add public url
2025-03-27 12:25:28 +05:30
Seth Call
5fba0f8d97
Fix base url
2025-03-27 12:25:28 +05:30
Seth Call
ab1575365d
Re-attempt build with correct URL
2025-03-27 12:25:28 +05:30
Nuwan
3369b39341
fix error on paypal redirect after checkout
2025-03-26 16:53:35 +05:30
Seth Call
f5b090a20b
Ooops, missed brace
2025-03-25 07:14:10 -05:00
Seth Call
cc664889f8
Stop double-counting page vies
2025-03-25 07:03:51 -05:00
Seth Call
cfe0129a6d
Remove extra pageView hit
2025-03-24 23:06:45 -05:00
Seth Call
a525082f26
Remove public URL from router basename
2025-03-24 22:46:49 -05:00
Seth Call
7f5b6152f0
Add GA to landing pages and fix build constant
2025-03-24 22:01:49 -05:00
Seth Call
0df9beb786
Cleaned up BrowserRouter, and added GA
2025-03-24 21:36:28 -05:00
Seth Call
85c0c5812f
Load iframe later
2025-03-23 22:27:27 -05:00
Seth Call
4ede79ba51
fix signup path
2025-03-23 22:12:27 -05:00
Seth Call
155ee69863
sitemap location fix
2025-03-23 21:59:18 -05:00
Seth Call
8d49ea0368
Convert large pngs to webp, and create sitemap.xml
2025-03-23 21:36:36 -05:00
Seth Call
93dc5ccd35
Add some useful filters
2025-03-23 15:38:02 -05:00
Seth Call
7b6a571550
Update indexs and speed up partner page
2025-03-23 15:05:41 -05:00
Seth Call
0db6bac749
Better reporting for quarterly payments
2025-03-23 13:54:53 -05:00
Seth Call
c23305634f
Add more partner fields to affiliate_traffic_total
2025-03-22 09:41:49 -05:00
Nuwan
481f8099af
incorporate paypal checking out
...
change paypal checkout and confirm screens load inside new website
and not redirecting users to old site.
2025-03-22 20:08:51 +05:30
Seth Call
23ce65d0bd
Update Referral Admin-web page to be more useful
2025-03-21 19:05:07 -05:00
Seth Call
ce1c4673b2
Revert "Update Referrals page to list more partner info"
...
This reverts commit a2c607b449 .
2025-03-21 19:03:49 -05:00
Seth Call
a2c607b449
Update Referrals page to list more partner info
2025-03-21 18:45:29 -05:00
Seth Call
e4f6444d35
Why can't I figure this PUBLIC_URL process env out
2025-03-19 19:34:42 -06:00
Seth Call
dbdc5e5296
add public url
2025-03-19 19:22:48 -06:00
Seth Call
3b45014af0
Fix base url
2025-03-19 19:07:19 -06:00
Seth Call
55c532b44f
Re-attempt build with correct URL
2025-03-19 18:53:54 -06:00
Nuwan
c73e78d6e6
fix checkout total not showing correctly
2025-03-13 12:17:00 +05:30
Nuwan
488aa4c03d
fix showing 0.00 for cart total
2025-03-12 11:06:01 +05:30
Seth Call
2cc56f7ad7
Fix fee in cents
2025-03-10 23:24:59 -05:00
Seth Call
e6046f74b6
Merged in feature/affiliate-testing (pull request #56 )
...
Update signups aggressively as they occur (realtime), and fix some affiliate and jamtrack flows
2025-03-10 20:38:02 +00:00
Seth Call
aa9555aa1e
Update signups aggressively as they occur (realtime), and fix some affiliate and jamtrack flows
2025-03-10 15:36:25 -05:00
Seth Call
39dfbadbd8
Add affiliate code to backing track pages
2025-03-05 07:46:17 -06:00
Seth Call
b7732c11f8
Try force full page redirect of marketing site
2025-03-04 21:46:52 -06:00
Seth Call
7faac7b61b
Back to profile
2025-03-04 21:35:08 -06:00
Seth Call
98cae96d5d
logout go to marketing site
2025-03-04 21:30:56 -06:00
Seth Call
0f30107481
Revert back the REACT_APP_BASE_URL
2025-03-04 21:05:49 -06:00
Seth Call
42c77a8049
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2025-03-04 21:02:36 -06:00
Seth Call
69f4bc837a
Profile default on logout
2025-03-04 21:02:01 -06:00
Nuwan
89411738cb
save affiliate_visitor cookie when there is affiliate param when accessing pages
2025-03-04 23:40:08 +05:30
Seth Call
9d7fea284a
Redirect to profile
2025-03-04 08:26:54 -06:00
Seth Call
198adfe395
Make /profile be the default location
2025-03-04 07:36:39 -06:00
Seth Call
383d9deeb3
Fix welcome email links
2025-03-04 07:04:13 -06:00
Seth Call
7945c52cbb
Fix links for knowledge-base, help-desk, and forum
2025-03-03 22:55:30 -06:00
Seth Call
9e84bcc0df
Fix move of domains
2025-03-03 20:10:02 -06:00
Seth Call
6007abd6a8
Fix broken download links to bad /downloads
2025-03-03 19:58:14 -06:00
Seth Call
be5a127b4c
Fix bad REACT_ vars in backing-track pages
2025-03-03 19:48:25 -06:00
Nuwan
93a824501b
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2025-03-03 22:32:39 +05:30
Seth Call
3309c7f69a
Guard production pushes behind manual step
2025-03-03 22:31:38 +05:30
Seth Call
b04bb0c55b
Merged in VRFS-5512-jamtrack-landing-pages-2 (pull request #55 )
...
Getting in the artist pages
* Add in artist pages
* Update bitbucket yml to push on both develop
2025-03-03 22:31:38 +05:30
Nuwan
8cafb23b3e
change authenticate routes
...
authentication related routes are scoped in /auth/... namespace with was
earlier /authntication/...
2025-03-03 22:27:43 +05:30
Seth Call
2c76628926
Guard production pushes behind manual step
2025-03-03 07:25:01 -06:00
Seth Call
b678bfd70d
Merged in VRFS-5512-jamtrack-landing-pages-2 (pull request #55 )
...
Getting in the artist pages
* Add in artist pages
* Update bitbucket yml to push on both develop
2025-03-03 13:18:54 +00:00
Seth Call
9d63882e69
Merged in seth/VRFS-5512-jamtrack-landing-pages (pull request #53 )
...
jamtrack landing pages
2025-02-28 03:03:22 +00:00
Seth Call
d4546c6975
MR is ready for review
2025-02-27 07:55:08 -06:00
Seth Call
a9b9e592bb
resolved
2025-02-27 07:47:12 -06:00
Nuwan
dcb842035f
fix removing all shopping cart items when removing one item
2025-02-22 02:11:58 +05:30
Nuwan
9c0e643b23
prevent user avatar refresh
...
prevent referesing the user avatar on every page navigation
2025-02-22 01:47:26 +05:30
Nuwan
94747d9fe0
fix autocomplete artist search for affiliate links
2025-02-21 18:45:52 +05:30
Nuwan
81cf0dadb0
change affiliate links format
2025-02-20 19:19:27 +05:30
Nuwan
254d1ecac7
fix reset password email link
2025-02-14 19:44:20 +05:30
Nuwan
754be7877e
remove showing audioUrl
2025-02-14 19:07:06 +05:30
Nuwan
8a8f1d14f9
fix fingerprint loading issue in jamtrack page
2025-02-14 17:00:42 +05:30
Nuwan
bd2d9410b5
fix jamtrack autocomplete component
...
add debouncing technique to fetch data when fetching the data
move the FingerprintJS initialization to the appDataContext so it is not
instantiate eveytime
2025-02-13 17:52:14 +05:30
Nuwan
1e623e77de
affiliate links fix artist_name_slug
2025-02-12 15:07:57 +05:30
Nuwan
a0b255a5d5
change to affiliate link format
...
affiliate links points to the landing page and they have now
name_slug and original_artist_slug embeded
2025-02-12 07:53:10 +05:30
Nuwan
342960e57b
refactor jamtracks loading
...
reduce the nertwork calls it had when loading jamtracks on
jamtacks listing which increases the loading time.
2025-02-12 06:14:12 +05:30
Nuwan
36a184638f
remove unwanted web/venv/ directory which was added mistakenly
2025-02-09 22:57:29 +05:30
Nuwan
1ce4d4f4e6
rename the migration files to comply with the order and naming
2025-02-09 21:07:54 +05:30
Seth Call
810ae15769
Merged in mc/sluggarize-fixes (pull request #52 )
...
Update sluggarization and sluggarize existing jamtracks
* wip
* sluggarize script
* comment out copy/pastable sql
* add readme
2025-02-09 05:09:54 +00:00
Seth Call
f26733fa46
Merged in seth/jamtrack-lambda-importer (pull request #51 )
...
Lambda & local importer for jamtracks
* # This is a combination of 9 commits.
# This is the 1st commit message:
inital attempt before upgrading Rails in lambda
# The commit message #2 will be skipped:
# unzip works
# The commit message #3 will be skipped:
# wip
# The commit message #4 will be skipped:
# Add in gemspec
# The commit message #5 will be skipped:
# wip
# The commit message #6 will be skipped:
# imported one locally
# The commit message #7 will be skipped:
# Add in jmep
# The commit message #8 will be skipped:
# add in some baked in env vars
# The commit message #9 will be skipped:
# ran a local container build finally
* inital attempt before upgrading Rails in lambda
* Minor tweak for docker usage case of lambda running in AWS/lambda
2025-02-08 17:20:26 +00:00
Nuwan
55f6839521
chage menu items order under account submenu
2025-02-08 18:51:08 +05:30
Nuwan
4a3630f786
user_pref change
...
recording_pref chage from enum to normal integer values in user.rb
2025-02-06 09:17:10 +05:30
Nuwan
71458e3983
add tooltips to the recording options in preferences page
2025-02-03 12:35:26 +05:30
Nuwan
5ff152233b
account preferences page
...
new page to change user's recording preferences
2025-02-03 12:25:21 +05:30
Nuwan
3677181e09
add jamtrack and artist landing pages
2025-01-30 11:57:01 +05:30
Nuwan
46111f041d
fix joinSession custom URL param name
2025-01-29 14:38:16 +05:30
Nuwan
1dd160e19f
customURL - show modal popup instead of redirecting to a new page
2025-01-29 12:55:14 +05:30
Nuwan
f07a96165d
change email layout
...
change to the new layout of the emails
reset password and after reset password
2025-01-24 08:10:27 +05:30
Nuwan
3e9d2e371e
change mailer layouts
...
change the layout of the updating_email and updated_email templates
2025-01-22 09:53:15 +05:30
Nuwan
3d14ddbe74
affiliate links page changes
2025-01-18 22:42:30 +05:30
Nuwan
28487f271e
add fields to capture venmo details
...
* add new field: venmo_user_id
* add new field: phone_last_4
changed the forms to replace paypal with venmo
2025-01-18 19:14:28 +05:30
Nuwan
51f1a7e58e
jamtracks: force to new site
...
force the user to the new (beta) website jamtracks page
if they click the jamtracks tile on home page or they
load the url of that page directly in browser
2025-01-18 07:24:13 +05:30
Nuwan
a027ed7096
change favicon
2025-01-17 22:42:53 +05:30
Nuwan
70dd62606b
remove debug recaptcha
2025-01-16 14:27:28 +05:30
Nuwan
21301017ca
debug recaptcha
2025-01-16 13:48:30 +05:30
Nuwan
1772f5a46f
fixes & improvements in signup and downloads pages
2025-01-16 13:17:25 +05:30
Nuwan
4804877452
fix the size of the play/pause buttons in JamTracks listings
2025-01-09 13:35:26 +05:30
Nuwan
1d0a01c7ee
signup & download pages
...
signup and download pages behave the same way to the legacy site
2025-01-09 08:21:26 +05:30
Nuwan
04a45394a0
wip new signup and download pages
2025-01-02 08:38:37 +05:30
Nuwan
2c6f1ef0de
discard - FULL from jamtrack name in listings
2024-12-29 23:45:21 +05:30
Nuwan
2786c74175
my jamtracks page - increase the content size to be 75% in desktop window
2024-12-29 22:01:31 +05:30
Nuwan
8835455795
UI improments in JamTrack player
2024-12-29 18:47:55 +05:30
Nuwan
2d7a6db541
debug js uninitialized val in audio player
2024-12-28 00:24:35 +05:30
Nuwan
9b427b7a24
fix audio player js ref error
2024-12-28 00:11:13 +05:30
Nuwan
315f532719
fix audio player js ref error
2024-12-27 23:29:50 +05:30
Nuwan
04a7445f68
fix js variable reference error on loading the audio player component
2024-12-27 13:21:38 +05:30
Nuwan
6368897b21
fix ref error in audio player
2024-12-27 02:12:27 +05:30
Nuwan
d7eef09946
custom audio player
...
change the defaut html audio player to a custom player
2024-12-27 01:47:08 +05:30
Nuwan
f8462dbb84
fix jamTrack query params: page
2024-12-25 20:16:38 +05:30
Nuwan
8ddb4ce80d
changes in locale file
2024-12-25 19:18:33 +05:30
Nuwan
6b66764082
improvements to JamTracks pages
2024-12-25 18:56:16 +05:30
Nuwan
5673d9b21e
jamtracks related misc fixes
2024-12-25 00:04:11 +05:30
Nuwan
c163d6b0ba
UI layout fixes in checkout and shopping cart pages
2024-12-23 15:35:16 +05:30
Nuwan
61eddbb2bc
prevent calling /shopping_carts api multiple times in jamtracks listing
2024-12-22 21:59:28 +05:30
Nuwan
48547d2cb1
JamTracks related ui fixes
2024-12-22 02:11:08 +05:30
Nuwan
c3563a9197
wip jamtrack page creating and playing custom jamtracks
2024-12-17 16:22:31 +05:30
Nuwan
08fafbf2de
work on JamTrack player
2024-12-10 11:23:02 +05:30
Nuwan
cbaf1ea4f9
fix links in the jamtrack help resources section
2024-12-07 09:36:58 +05:30
Nuwan
d9004980e6
fix presentation styles of jamtracks in jamtracks list page
2024-12-07 09:19:23 +05:30
Nuwan
5d87d1a358
handle purchasing a JamTrack
...
handle adding to cart of redeemable vs paid jamtracks
2024-12-05 20:01:56 +05:30
Nuwan
3245024925
more JamTrack page fixes
2024-12-03 19:35:38 +05:30
Nuwan
d3a9a7c1e5
jamtracks related UI fixes
2024-12-03 19:03:21 +05:30
Nuwan
f389250aa8
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2024-12-02 09:52:09 +05:30
Nuwan
d5dcc71e35
fix error showing user affiliate agreement status and date
2024-12-02 09:46:01 +05:30
Seth Call
67241e7be7
Fix URLs in welcome email
2024-12-01 22:00:24 -06:00
Seth Call
5ab863bc33
Fix extra styles added to beta footer
2024-12-01 17:15:45 -06:00
Seth Call
89c4df9650
Align footer images better
2024-12-01 16:54:31 -06:00
Seth Call
e6ac929303
Switch to pngs from svg for new beta email footer
2024-12-01 15:53:06 -06:00
Seth Call
fb3cf004b9
once more with the asset paths
2024-12-01 14:14:45 -06:00
Seth Call
531bf25376
Fix svg paths
2024-12-01 13:38:29 -06:00
Seth Call
27b66783c1
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2024-12-01 10:01:21 -06:00
Seth Call
2402cf6992
Fix social urls
2024-12-01 10:01:14 -06:00
Nuwan
387a9b141d
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2024-12-01 06:07:16 +05:30
Nuwan
625a9dc0e4
fix app launching using custom URL scheme
2024-12-01 06:06:50 +05:30
Seth Call
a09f922463
Force build
2024-11-30 13:21:49 -06:00
Seth Call
9b6f6f74e9
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2024-11-30 13:17:28 -06:00
Nuwan
db9ad36627
debug console print custom mix audio url
2024-11-29 08:41:24 +05:30
Nuwan
ea0131cb4e
add help links in JamTracks page
2024-11-28 23:25:51 +05:30
Nuwan
c5439f7a18
change the order of the affiliates menu items
2024-11-26 19:14:01 +05:30
Nuwan
78debaa8ab
fix errors in JamTracks page and shopping cart page
2024-11-26 18:55:09 +05:30
Nuwan
8bbdedd082
fix affiliate link: use the correct id
2024-11-25 13:39:24 +05:30
Nuwan
3c4e59faa9
fix useHistory reference error
2024-11-23 18:59:44 +05:30
Nuwan
b532308e28
custom url scheme: add ability to suppoer different type of custom actions. ex: createSession, joinSession
2024-11-23 18:42:12 +05:30
Nuwan
63289a29af
change paramater names in joinSession custom Url
2024-11-22 22:56:25 +05:30
Nuwan
5d60c3db81
remove leading ? in the custom url query string
2024-11-22 22:13:18 +05:30
Nuwan
8f58fe4017
fixes in affiliate section - more textual and style fixes
2024-11-21 20:01:43 +05:30
Nuwan
82007bb41c
minor textual and style updates to affiliate pages
2024-11-21 13:15:01 +05:30
Nuwan
358f42bba2
affliate page tweeks wip
2024-11-21 08:04:08 +05:30
Nuwan
ab5b6a5fb5
enable forgot password form
...
make available the forgot password link so forgot password flow
is handled within the app. previously it redirected to the legacy site
2024-11-19 12:59:14 +05:30
Nuwan
b04b8cfee2
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2024-11-19 12:53:04 +05:30
Nuwan
45e6122439
more tweaks to email template
2024-11-19 01:24:39 +05:30
Nuwan
d0115a8cd9
new mailer template update
2024-11-19 01:24:39 +05:30
Nuwan
ec7a79c8bb
forgot password feature
2024-11-19 01:24:36 +05:30
Nuwan
df9cbf3ba7
forgot password feature wip
2024-11-19 01:24:06 +05:30
Nuwan
33d0de6f0c
wip forgot password
2024-11-19 01:24:06 +05:30
Nuwan
8b350ca3b6
wip forgot password
2024-11-19 01:24:06 +05:30
Nuwan
abade1915e
more tweaks to email template
2024-11-17 21:58:41 +05:30
Nuwan
eba86ccdd5
new mailer template update
2024-11-17 21:19:29 +05:30
Nuwan
a388d5e1d0
open jamkazam:// custom url in same window
2024-11-14 19:15:01 +05:30
Nuwan
98dbb358bd
change the format of custom Url scheme
2024-11-14 18:41:07 +05:30
Nuwan
93961806eb
skip showing latency badge if user is currentUser
2024-11-13 21:35:27 +05:30
Nuwan
6366bc5c6e
fix type in showing instruments in session history
2024-11-13 21:13:21 +05:30
Nuwan
ae138b79c0
session history latency not showing
...
includes fix for showing unknown latency badge for all sessions
and reformat the session time
2024-11-13 20:48:41 +05:30
Nuwan
ed9887f9e9
add timezone to format session history date
2024-11-13 19:55:34 +05:30
Nuwan
3dc4af65e0
format session history date
2024-11-13 16:16:10 +05:30
Nuwan
ab5947d94a
error fix in sessions listing page
...
prevent errors that caused by null created_at values
when rendering session details
2024-11-13 07:31:13 +05:30
Seth Call
8979d732f2
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2024-11-11 18:40:42 -06:00
Nuwan
b9eff8dac0
debug session history participat letancy
2024-11-11 00:42:34 +05:30
Nuwan
c42dfdbb30
session history pagination
2024-11-10 21:10:08 +05:30
Nuwan
94ac48c8b5
fix images on beta email template
2024-11-08 16:40:20 +05:30
Nuwan
ac469c2741
remove mailcatcher gem from Gemfile.alt
2024-11-08 13:03:47 +05:30
Nuwan
d7a4e46355
add murali, bob & jorge to the jamkazam users that get the new_musicians_match email
2024-11-07 20:50:40 +05:30
Nuwan
051477d19f
new user match email - jamkazam team only
...
add a config to restrict new_musicians_match email to be sent only
to jamkazam team users
2024-11-07 20:45:51 +05:30
Seth Call
47fd0cb68d
Clean up load_history in terms of list all unique participants for a session
2024-11-07 07:35:51 -06:00
Nuwan
371f68a616
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2024-11-06 18:00:34 +05:30
Nuwan
69a37495b5
new user confirm email
...
update user confirm email contents and change to the new layout
2024-11-06 17:58:40 +05:30
Seth Call
78ae753d87
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2024-11-05 20:04:35 -06:00
Seth Call
4944c5983d
Use current user to scope history
2024-11-05 20:04:28 -06:00
Nuwan
182deaa177
fix missing file error
2024-11-06 01:04:36 +05:30
Nuwan
1281caccf2
change welcome_message email to the new email layout and update content
2024-11-06 00:59:23 +05:30
Nuwan
604b6f6b59
localize matched new users email
2024-11-04 17:27:23 +05:30
Nuwan
996fbe51d0
new email template chages
...
this email template is used for the emails with the new design
which is used in the beta site.
2024-11-01 20:18:05 +05:30
Nuwan
d4b412e223
change svg of other instrument icon
2024-10-30 08:36:52 +05:30
Nuwan
2d408eb3a7
show generic icon image for instruments which we do not have an icon
2024-10-29 22:32:20 +05:30
Nuwan
c8a8ecc40d
fix minor css issue in instrument list
2024-10-29 09:22:55 +05:30
Nuwan
b51207dd3e
UI style fixes in find friends page
2024-10-29 09:04:58 +05:30
Nuwan
f2f6b978f8
hide 'from_location' checkbox
...
hide this checkbox in find friends feature. Just remove the UI
element without changing any logic
2024-10-28 21:29:24 +05:30
Nuwan
b8b1146320
change format of custom URL schema according to the new way of handling it in the back end
2024-10-23 11:55:47 +05:30
Nuwan
541bca6b28
message modal - scroll to bottom
...
on the initial loading of messages, scroll to the bottom of the
message modal.
2024-10-23 08:22:06 +05:30
Nuwan
c1a2e76186
fix profile avatar not showing
...
use src parameter when passing photo_url to the JKProfileAvatar
2024-10-23 08:00:50 +05:30
Nuwan
79ba0ebc70
use var instead of const
...
In layout.js. use var instead of const/let. because consts or let keywords are
not been supported in legacy client
2024-10-22 22:11:39 +05:30
Nuwan
8718ac4588
improvement to friend connect button
2024-10-22 21:57:56 +05:30
Nuwan
0dd8e90a7f
edit profile button - make it a component with tooltip
2024-10-22 21:00:10 +05:30
Nuwan
3b0c2d1a42
fix musician filter
...
change instruments parameter names that are been passed to
the lambda function to be matched with the expected parameters in
labda function
2024-10-22 08:28:56 +05:30
Nuwan
ccfb48459d
improvements in friend connect/disconect function
2024-10-22 04:43:40 +05:30
Nuwan
6d1ad051fe
fix alignment issues inside message modal contents
2024-10-19 16:03:02 +05:30
Nuwan
652b33ec51
prevent message modal scrolling on message arrive
2024-10-18 23:29:27 +05:30
Nuwan
ca615eb9d9
misc fixes related to friends page
2024-10-18 22:48:11 +05:30
Nuwan
8e3272c7d5
fix data loading related to pagination in /friends page
2024-10-18 12:06:13 +05:30
Seth Call
5831e7d709
Make the previously-slow query target feed query configurable. Default to on
2024-10-14 11:18:50 -05:00
Nuwan
3c3ea6cbba
custom URL scheme: use window.document.href instead of window.open
2024-10-11 11:55:12 +05:30
Nuwan
3db0a30fef
styling change on join session button
2024-10-08 02:27:36 +05:30
Nuwan
7ed94b5dc0
useUserProfile hook - ability to turn on/off cache
2024-10-08 01:01:46 +05:30
Nuwan
b83dfb2114
fix syntax error in browse sessions mobile view
2024-10-07 13:34:47 +05:30
Nuwan
29d64b7d0f
debug browse session mobile view
2024-10-07 13:26:46 +05:30
Nuwan
36bd2788b2
another fix for managing profile edit page user genres
2024-10-07 11:24:37 +05:30
Nuwan
119a180a82
display only genres with type = profile in edit profile
2024-10-07 10:48:09 +05:30
Nuwan
91c85d5e59
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2024-10-07 08:49:45 +05:30
Nuwan
5d171ec016
prevent duplicated genres are being sent when updating user profile
2024-10-07 08:49:32 +05:30
Seth Call
4732138cbd
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2024-10-05 15:54:26 -05:00
Seth Call
d07cff3721
Fix recurly bug where updated 2x from a RJS token 'ruins' the account until the user re-deploys
2024-10-05 15:54:20 -05:00
Nuwan
2afd8500bd
change browse session no records alert
2024-10-05 02:58:48 +05:30
Nuwan
0377f73b9f
show notification on friend request accept
2024-10-03 19:00:27 +05:30
Nuwan
47b1e843ed
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2024-10-03 04:38:41 +05:30
Nuwan
77359f7fc2
friends page state
...
use a separate redux slice for friends page
add musician slice to prevent mess up with the other user objects
fetched globally. people redux slice would serve
as global store having user records that can be referenced
elsewhere
2024-10-03 04:34:03 +05:30
Seth Call
d603dd2911
bump paypayl recurly gem
2024-10-01 20:45:32 -05:00
Seth Call
eea46feb5d
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2024-09-29 11:24:51 -05:00
Seth Call
7dbd061a86
Fix latency url
2024-09-29 11:24:39 -05:00
Nuwan
db6a94ded1
forgot password: redirect to current site forgot password page
2024-09-23 20:16:03 +05:30
Nuwan
15af2d7469
fix for genres and instruments loading in profile edit page
2024-09-22 10:15:18 +05:30
Nuwan
9a0b4f4ddb
profile edit: fix genres select edge case on when the user does not already have selected any genres
2024-09-21 09:38:26 +05:30
Nuwan
c779277b4d
change help desk page url
2024-09-20 20:24:12 +05:30
Nuwan
a0dc7fa92d
force user to login when accessed from email message link
2024-09-19 18:18:24 +05:30
Nuwan
0993c9a6b6
fix for genres and instrument loading in profile page
2024-09-19 13:50:34 +05:30
Nuwan
b876e1e253
open help pages on new tab
2024-09-19 04:56:21 +05:30
Nuwan
3300b5a37a
edit profile page: fixing genres and instrument loading issue
2024-09-18 03:12:51 +05:30
Nuwan
3695b2f5d4
help links: redirect to relevent external urls
2024-09-14 12:05:47 +05:30
Nuwan
d976cdf866
remove redundent association keys
...
In the api_users_controller#profile_show remove :genres, :instruments
keys from the association includes
2024-09-13 08:02:34 +05:30
Nuwan
fa35930c75
fix for user instruements and genres are not been loaded on edit profile page load
2024-09-10 19:28:44 +05:30
Nuwan
cd1930a2bc
fix for user instruements and genres are not been loaded on edit profile page load
2024-09-10 18:10:18 +05:30
Nuwan
b5a18f6501
trying to figure out why user instruements and genres are not being loaded on edit profile page load
2024-09-10 15:46:27 +05:30
Nuwan
fd1c0714d3
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2024-09-09 15:27:21 +05:30
Nuwan
4f6bf663dd
fix for instruments and genres initial loading in profile edit form
2024-09-09 15:26:56 +05:30
Seth Call
0c2102b308
clean it up again
2024-09-08 14:46:16 -05:00
Seth Call
ba59e7b20b
Newer build
2024-09-08 14:19:44 -05:00
Seth Call
3f1a3402d8
Merged in feature/all-clients-are-modern (pull request #49 )
...
Move all clients to the 'modern' track.
* Force old client website to upgrade to new client
* Also add
* wording fix
2024-09-08 18:18:02 +00:00
Nuwan
c60959126c
Flip positions of Instruments and Genres UI cards on Profile pag
2024-09-08 07:22:01 +05:30
Nuwan
c404cc0bb1
add filestack-js in package.json
2024-09-07 23:35:51 +05:30
Nuwan
ef79d3a8c0
now notifications in header drawer scrollable
2024-09-06 23:15:48 +05:30
Nuwan
499cd7e16b
header notifications
...
show number of unread notifiacation count on header
allow user to scroll through the notification in header notificaton
drawer
2024-09-03 00:11:36 +05:30
Nuwan
727147ffee
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2024-08-29 17:10:01 +05:30
Nuwan
3175f77b7f
implement profile photo upload
2024-08-29 17:08:19 +05:30
Seth Call
6833c68e40
Merge branch 'develop' into feature/legacy-download
2024-08-28 06:23:41 -05:00
Nuwan
9668b59e23
integration with filestack for profile avatar image uploading - wip
2024-08-27 00:50:01 +05:30
Nuwan
8aa463c054
in header show notification number badge
2024-08-23 16:03:23 +05:30
Nuwan
136a3c399d
edit profile page ui changes
2024-08-21 00:49:58 +05:30
Nuwan
e973a5f55c
add control to prevent unsaved changes
...
in profile edit if user tries to navigate away from the site
show native confirmation message asking user's consent
2024-08-19 19:53:04 +05:30
Nuwan
5a00f45d5c
profile edit page ui improvements
2024-08-18 16:41:48 +05:30
Nuwan
39be8f2955
adujest the width of instrument selection section
2024-08-16 21:49:44 +05:30
Nuwan
bca4f17c8f
profile edit - make the profile photo bigger and fix alignments
2024-08-16 12:05:55 +05:30
Nuwan
f9aee04dd5
add missing api call to rest.js
2024-08-15 13:58:36 +05:30
Nuwan
3945e97319
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2024-08-15 13:55:43 +05:30
Nuwan
be1cca46b1
my jam tracks loading fixes
2024-08-14 08:44:46 +05:30
Nuwan
898154a775
fix my jam track filtering
2024-08-14 08:44:46 +05:30
Nuwan
94308e9c1d
fix my jam track filtering
2024-08-14 08:44:46 +05:30
Nuwan
828939ff68
fix my jam track filtering
2024-08-14 08:44:46 +05:30
Nuwan
7d7dc7a620
fix not loading next page results in my jam tracks
2024-08-14 08:44:46 +05:30
Nuwan
3b451427fc
jamtrack player, cusmtom mixes and download mixes
2024-08-14 08:44:43 +05:30
Nuwan
f904bdfc1c
wip jamtrack player
2024-08-14 08:44:08 +05:30
Nuwan
faecb69db9
jamtrack player WIP
2024-08-14 08:43:29 +05:30
Nuwan
2cc14be759
WIP: jamtracks, shopping cart and checkout pages
2024-08-14 08:43:18 +05:30
Nuwan
6e29efd307
jamtracks pages
...
includes jamtrack listing, my jamtracks, jamtrack details pages
2024-08-14 08:40:38 +05:30
Nuwan
fb537806ca
my jam tracks loading fixes
2024-08-13 23:43:34 +05:30
Nuwan
22d4553f6f
fix my jam track filtering
2024-08-13 01:19:24 +05:30
Nuwan
a0e4c5fc33
fix my jam track filtering
2024-08-13 00:46:27 +05:30
Nuwan
44f78edc63
fix my jam track filtering
2024-08-13 00:11:26 +05:30
Nuwan
4a09e56d8b
fix not loading next page results in my jam tracks
2024-08-12 14:15:37 +05:30
Nuwan
7cf5648b78
jamtrack player, cusmtom mixes and download mixes
2024-08-12 11:48:04 +05:30
Seth Call
e55ad12b61
missed files
2024-08-11 22:10:47 -05:00
Seth Call
c907d9c3ba
Be sure to use the same product names as in the database
2024-08-11 20:12:33 -05:00
Seth Call
c44db20385
Create /downloads-legacy, and update /downloads for the 3 clients
2024-08-11 19:39:56 -05:00
Nuwan
7af01a6c61
wip jamtrack player
2024-07-31 11:27:56 +05:30
Nuwan
5b750cc3d9
jamtrack player WIP
2024-07-19 21:03:28 +05:30
Nuwan
106ea91361
make login compulsory to access the other pages
2024-07-17 18:14:18 +05:30
Nuwan
041ebccaf1
active admin CRUD for app feature
2024-07-17 15:27:50 +05:30
Nuwan
86d77df2c9
app features on/off
...
add ability to control the visibility of beta site menu items.
the visibility state is stored in the back end api and the front
end menu items are been shown accordingly.
2024-07-16 17:26:48 +05:30
Nuwan
a3c511d2b0
WIP: jamtracks, shopping cart and checkout pages
2024-07-13 15:17:13 +05:30
Nuwan
adafcb8569
work in progress on jamtracks shopping
2024-06-21 18:16:29 +05:30
Nuwan
48335a9d9c
add spaces between artists list items
2024-06-10 23:02:41 +05:30
Nuwan
5fd4015ee2
fix track preview alignment issue
2024-06-10 22:57:57 +05:30
Nuwan
e2b4c901dc
Jamtrack shopping page
2024-06-10 21:28:34 +05:30
Nuwan
176ba1febe
JamTracks
...
includes JamTrack filter page
2024-06-10 13:45:15 +05:30
Nuwan
24aab60556
add cypress tests for affiliates pages
2024-05-23 17:22:41 +05:30
Nuwan
8868ff718f
add tests for affiliate earnings
2024-05-23 00:55:03 +05:30
Nuwan
bbe83a008f
affiliate earnings page
2024-05-17 14:15:19 +05:30
Nuwan
e878c64c3c
affiliate signups and links pages
2024-05-17 10:03:36 +05:30
Nuwan
8f63547f34
affiliate program and payee pages
2024-05-09 18:42:55 +05:30
Nuwan
97e0a8d36a
session history page:
...
list all the sessions in decending order they were created
2024-05-05 18:38:29 +05:30
Nuwan
7176fecd7b
sessions history page wip
2024-05-03 10:31:57 +05:30
Nuwan
37ed2dddd4
beta site sessions history page wip
2024-05-03 08:25:51 +05:30
Nuwan
cb0cb654c8
limit CORS only to /api/*
2024-04-26 16:35:45 +05:30
Nuwan
40fbc7b430
fix error when unmounting paymemnt page
2024-04-25 20:48:06 +05:30
Nuwan
81c1c17a2f
add more tests for payment history page, responsive mobile view
2024-04-24 20:44:00 +05:30
Nuwan
c2ffbff216
account payments page and cypress tests
2024-04-24 08:28:02 +05:30
Nuwan
4dd95af2fa
tweaks to subscription page
2024-04-20 17:27:30 +05:30
Nuwan
20eb17b044
initial release of my friends page
2024-04-20 16:44:24 +05:30
Nuwan
703309aa65
add more tests for subscription page
2024-04-17 11:33:52 +05:30
Nuwan
3ae52098c6
fix for subscription display error
2024-04-16 18:30:37 +05:30
Nuwan
bd45275107
prevent duplicate entries in friends page
2024-04-12 19:39:55 +05:30
Nuwan
edb6bd0b90
fix friends page related cypress tests
2024-04-11 00:21:53 +05:30
Nuwan
cdd12d621d
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2024-04-10 13:46:51 +05:30
Nuwan
cb1a8f54c5
fix default plan selection in account subscription
2024-04-10 13:39:37 +05:30
Nuwan
05d8db9cfa
add cypress tests for subscription page
2024-04-10 13:39:00 +05:30
Nuwan
af1140fa05
fix default plan selection in account subscription
2024-04-05 19:36:44 +05:30
Nuwan
7b0d6c153e
fix null value error
2024-04-05 11:11:13 +05:30
Nuwan
dbb5c4a520
account subscription
...
let user to change subscription
2024-04-05 10:52:06 +05:30
Nuwan
ee95d07dfc
fix style of join session button
2024-03-21 19:22:44 +05:30
Nuwan
884203844b
Join session link
...
add link under the join button in browse sessions page
2024-03-21 08:13:56 +05:30
Nuwan
a420767446
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2024-03-21 00:31:47 +05:30
Nuwan
4ff3d2d83c
enter.svg - change css color attribute
2024-03-21 00:31:35 +05:30
Nuwan Chaturanga
d80627b5d4
Merged in develop-promise (pull request #46 )
...
Develop promise
Approved-by: Seth Call
2024-03-20 14:00:10 +00:00
Seth Call
73c566fa9e
Merged develop into develop-promise
2024-03-20 13:59:21 +00:00
Nuwan
e305898a74
resize the join button icon in browser sessions page
2024-03-20 09:12:26 +05:30
Nuwan
2a31e81c65
remove whitespace
2024-03-18 08:52:18 +05:30
Nuwan
6ad9aed71f
use var instead of let/const
...
let and const keywords in javascript can not use because the code based
is also been used in the production client.
2024-03-18 08:44:40 +05:30
Nuwan
2459b3d447
websocket-gateway copy updates to init
2024-03-16 22:53:15 +05:30
Nuwan
0476e5ebb6
set default for accept_desktop_notifications
2024-03-16 22:47:15 +05:30
Nuwan
e5dc8b57ec
fix syntax typo in websocket-gateway router.rb
2024-03-16 16:38:33 +05:30
Nuwan
52c8b48d81
merge websocket-gateway changes
...
from promised branch get the changes on router file and apply
on develop branch
2024-03-16 14:34:03 +05:30
Nuwan
4144d6d123
extract changes to artifacts from promised based branch
2024-03-16 14:18:31 +05:30
Nuwan
1c0a6b2138
change default value setting
...
change users migration not to lock the table by directly setting
the default value of the accept_desktop_notifications colums
when running the migration
2024-03-16 10:52:32 +05:30
Nuwan
17b0ea6111
fix errors while selecting country, region and city
2024-03-11 22:23:12 +05:30
Nuwan
95008f49e6
debug error on profile edit (in server)
2024-03-11 16:38:22 +05:30
Nuwan
9164a1058d
debug error on profile edit (in server)
2024-03-11 07:57:30 +05:30
Nuwan
23830144d8
debug error on profile edit (in server)
2024-03-11 07:50:49 +05:30
Nuwan
eb488e374b
profile page update synchronously.
...
making this chage to fetch all the data that need to be present
for the page on initial loading
2024-03-11 07:27:00 +05:30
Nuwan
8f84e5d12d
disable filestack code in image upload for now
2024-02-28 22:19:29 +05:30
Nuwan
238fc8a382
fix error on creating database index: wrong table
2024-02-28 21:58:03 +05:30
Nuwan
9dc101d3f6
fix instrument proficiency chage
...
update the state correctly of the instrument list when
proficiency is changed
2024-02-28 19:48:52 +05:30
Nuwan
1a11cc331c
add e2e test cases for account/identity and profile edit pages
2024-02-23 16:22:55 +05:30
Nuwan
8cf7048b7f
fixes related to beta site profile edit and lobby page
2024-02-19 19:00:53 +05:30
Nuwan
4c161025e8
profile image upload wip
2024-02-16 18:25:05 +05:30
Nuwan
6546cc08bc
add language translation keys to session pages
2024-02-14 17:31:30 +05:30
Nuwan
fd9632a26c
add translations
2024-02-14 11:37:01 +05:30
Nuwan
861722e5d4
includes fixes in profile edit form and lobby page
2024-02-12 19:11:11 +05:30
Nuwan
30aa9eeed2
merge conflicts fix
2024-02-05 19:10:40 +05:30
Nuwan
1de7a1f2f2
fix merge conflicts
2024-02-05 19:07:10 +05:30
Nuwan
963cc238e8
remove duplicate method call in rest.js
2024-02-05 19:03:42 +05:30
Nuwan
dd4239f1f3
account identity update
...
allow users to update their JamKazam email and password securly.
2024-02-05 18:26:01 +05:30
Nuwan
fe6c372d3d
wip: profile edit
2024-02-05 18:26:01 +05:30
Nuwan
df90496d30
change session enter button icon
2024-02-05 18:24:08 +05:30
Nuwan
b85a2b236c
fix instrument icon size in mobile view
2024-02-05 18:23:51 +05:30
Nuwan
0406a64531
fix: validate latency badge props
2024-02-05 18:22:39 +05:30
Nuwan
3fed41899a
fix /filter api - prevent error on exception conditions
2024-02-05 18:22:39 +05:30
Nuwan
6e131f6b5d
fix query string construction when fetching user latencies
2024-02-05 18:22:39 +05:30
Nuwan
c29d3459e6
fix lobby users query
2024-02-05 18:21:18 +05:30
Nuwan
c16be14207
fix errors due to null values
2024-02-04 23:39:54 +05:30
Nuwan
aeb2e50692
account identity update
...
allow users to update their JamKazam email and password securly.
2024-02-03 18:29:57 +05:30
Nuwan
d2c525f498
more updates to lobby page
...
includes showing chat notifications. also ui improvements
2024-01-22 11:28:16 +05:30
Nuwan
b563f22a32
wip: profile edit
2024-01-14 13:32:15 +05:30
Nuwan
4accb2296f
merge conflict resolved
2024-01-02 02:28:36 +05:30
Nuwan
23e0a7096c
change session enter button icon
2024-01-02 02:23:48 +05:30
Nuwan
3bf694d816
fix instrument icon size in mobile view
2024-01-02 02:23:48 +05:30
Nuwan
b4200a1b87
fix: validate latency badge props
2024-01-02 02:23:48 +05:30
Nuwan
286841c3d0
fix /filter api - prevent error on exception conditions
2024-01-02 02:23:48 +05:30
Nuwan
9b59ef6121
fix query string construction when fetching user latencies
2024-01-02 02:23:48 +05:30
Nuwan
5a8c85e765
session lobby with global chat feature
2024-01-02 02:23:21 +05:30
Nuwan
c07bf115e6
change session enter button icon
2023-12-27 20:44:15 +05:30
Nuwan
06e085fd13
fix instrument icon size in mobile view
2023-12-27 18:15:50 +05:30
Nuwan
9b72852a54
wip session lobby
2023-12-22 15:27:26 +05:30
Nuwan
0f25b00571
wip session lobby
2023-12-20 21:32:01 +05:30
Nuwan
8e792d1658
fix: validate latency badge props
2023-12-14 20:02:39 +05:30
Nuwan
84481a4fec
fix /filter api - prevent error on exception conditions
2023-12-14 11:34:42 +05:30
Nuwan
cff277d437
session lobby wip
2023-12-14 04:19:25 +05:30
Nuwan
b0672a9cb3
fix query string construction when fetching user latencies
2023-12-06 04:51:17 +05:30
Nuwan
4fed7cbb1a
wip session lobby
2023-12-06 04:23:17 +05:30
Nuwan
684fff910c
wip session lobby
2023-12-05 15:04:19 +05:30
Nuwan
64c42b5de3
update cypress e2e tests
2023-12-05 12:07:19 +05:30
Nuwan
38f9d4869b
fix UI related alignment issues in browse sessions page
2023-12-03 15:56:11 +05:30
Nuwan
317fdb2171
Instrument icon convered as a react component
2023-12-01 01:25:43 +05:30
Nuwan
6d5edf93bf
tweek styles in use selection
2023-11-30 23:34:56 +05:30
Nuwan
335d7667b5
fix latency badge and avatar image
2023-11-30 09:59:11 +05:30
Nuwan
0a871c738a
add condition to display latency badge only
2023-11-29 09:37:53 +05:30
Nuwan
1d355a3a96
hide latency numbers in latency badge in sessions page
2023-11-29 09:13:07 +05:30
Nuwan
c1a4481bf2
latency badge - fix data
2023-11-29 08:59:04 +05:30
Nuwan
5315d88903
fix api response of latency data
2023-11-29 08:36:37 +05:30
Nuwan
e5afb83f81
fix rest api getLatencyToUsers parameter
2023-11-29 08:04:14 +05:30
Nuwan
812cedb0e1
fix for latency badge in browse sessions page
2023-11-29 01:23:50 +05:30
Nuwan
a07ff74dc0
fix musician avatar image src in large browser views
2023-11-28 17:26:08 +05:30
Nuwan
27a3b3c09b
tweek ui and styles in browse sessions page
2023-11-28 16:48:55 +05:30
Nuwan
21d6801185
fix styles in browse sessions
2023-11-26 00:22:44 +05:30
Nuwan
66a7f81317
show instrument icons in profile details side panel
2023-11-25 23:10:50 +05:30
Nuwan
6fed528e84
fix styles in browse session page
2023-11-25 11:16:16 +05:30
Nuwan
2b96b4d8ef
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2023-11-24 20:03:55 +05:30
Nuwan
d8685a00bd
fix errornious src value to profile avatar image
2023-11-24 20:03:31 +05:30
Nuwan
d0d2a41e96
change firends autocomplete default avatar
2023-11-24 20:03:31 +05:30
Nuwan
2edfccda87
browse sessions page ui improvements
2023-11-24 20:03:11 +05:30
Nuwan
3062238465
fix errornious src value to profile avatar image
2023-11-17 22:35:40 +05:30
Nuwan
67fbf932ee
change firends autocomplete default avatar
2023-11-17 18:53:41 +05:30
Nuwan
5598b2ef17
fix responsive view of new session window in small and medium size windows
2023-11-15 19:43:36 +05:30
Nuwan
60ef40a51b
fix styles in mobile view of create new session screen
2023-11-15 18:23:38 +05:30
Nuwan
fcd9dd15f4
show native app unavailable modal
...
show this modal if the native JamKazam app is not available on user's computer.
occurs on submission of new session form and on clicking join session in
browse session page.
2023-11-09 16:19:15 +05:30
Nuwan
b7615c3fcd
hide preview session button
2023-11-05 19:49:34 +05:30
Nuwan
10e67e4cbb
fix merge conflicts
2023-11-03 09:22:09 +05:30
Nuwan
fef31f097f
merge new beta site features to develop branch
2023-11-02 17:51:42 +05:30
Nuwan
c108bdd058
fixes to cypress test of friends list
2023-11-02 17:00:45 +05:30
Seth Call
f42383f0b4
build bump
2023-11-02 08:41:35 +05:30
Seth Call
2102f8807a
Rollback pg
2023-11-02 08:41:35 +05:30
Seth Call
c8a111f5f5
Beta download page
2023-11-02 08:41:35 +05:30
Seth Call
e491461f64
notes
2023-11-02 08:41:35 +05:30
Nuwan
9b94ea6351
limits musicians in weekly email
...
this limits the number of users in weekly email to be 20
2023-11-02 08:41:35 +05:30
Nuwan
7149392fe2
Limits weekly email entries
...
this limits number of musician to be listed in weekly email to be 20
2023-11-02 08:41:35 +05:30
Nuwan
20c8df7121
show last active time in words
...
in user recommendation email show the last active time using
action_view time_ago_in_words helper
2023-11-02 08:41:35 +05:30
Nuwan
1ca3f5f245
improvements to sending weekly emails
...
- optimize user filtering sql
- dealing with default values
- eliminate null value errors in mailer templates
2023-11-02 08:41:35 +05:30
Nuwan
1e988931a4
sending weekly email to users about new users joined in
2023-11-02 08:41:29 +05:30
Nuwan
f75d2c8c46
send weekly email to users about new musicians
2023-11-02 08:39:16 +05:30
Nuwan
fad3b73d67
wip new user recommendation email
2023-11-02 08:33:48 +05:30
Nuwan
46202a2373
sip on user match mailer
2023-11-02 08:33:48 +05:30
Nuwan
bbab6cdb9f
user recom email wip
2023-11-02 08:33:48 +05:30
Nuwan
6a57530a8b
beta site current session listing with e2e tests
2023-11-01 18:58:08 +05:30
Nuwan
b3922ec025
wip browse music sessions
2023-10-26 17:25:02 +05:30
Nuwan
dd03c215c4
new session opening jamkazam app
...
submit the form to open jamkazam app in to
new session window with the selected privacy level.
also contains e2e tests
2023-10-19 17:09:02 +05:30
Nuwan
20c02f0f2a
wip on session create in beta site
2023-10-17 08:30:23 +05:30
Nuwan
02f3201cb2
wip new session form
2023-10-14 06:56:39 +05:30
Nuwan
65bc188af1
wip beta create session
2023-10-03 00:40:53 +05:30
Nuwan
484482e5bd
modificaions to the leve side navigation and new sessions page
2023-09-29 22:45:26 +05:30
Nuwan
036d982ab7
package lock updated
2023-09-28 16:52:45 +05:30
Seth Call
fb7e4a287e
build bump
2023-09-08 06:48:18 -05:00
Seth Call
0a32c1fac9
Rollback pg
2023-09-01 17:53:20 -05:00
Seth Call
c5767efbaa
Beta download page
2023-09-01 17:18:41 -05:00
Seth Call
3981c47f9f
notes
2023-02-17 12:32:34 -06:00
Seth Call
84e3609602
Merged in feature/user_recommendations_email (pull request #41 )
...
WIP: Feature/user recommendations email
2023-02-14 15:56:01 +00:00
Nuwan
199086d06b
add prop-types validations and cypress e2e tests
2023-02-14 01:59:55 +05:30
Nuwan
fa082230b8
create new session page for beta site
2023-02-12 12:06:16 +05:30
Nuwan
b589ad8553
working on new session screen
2023-02-09 09:35:29 +05:30
Nuwan
981b83cea2
wip jam-ui new session window
2023-02-07 10:05:03 +05:30
Nuwan
e25b88d062
wip jam-ui session
2023-02-03 00:24:26 +05:30
Nuwan
550a458c8d
limits musicians in weekly email
...
this limits the number of users in weekly email to be 20
2023-01-27 17:36:07 +05:30
Nuwan
100e14cad0
Limits weekly email entries
...
this limits number of musician to be listed in weekly email to be 20
2023-01-27 17:11:06 +05:30
Nuwan
529d3fc891
show last active time in words
...
in user recommendation email show the last active time using
action_view time_ago_in_words helper
2023-01-26 00:30:17 +05:30
Nuwan
6ea439b435
improvements to sending weekly emails
...
- optimize user filtering sql
- dealing with default values
- eliminate null value errors in mailer templates
2023-01-25 22:50:07 +05:30
Nuwan
2b80e277c9
sending weekly email to users about new users joined in
2023-01-24 09:53:04 +05:30
Nuwan
96a93c7daf
send weekly email to users about new musicians
2023-01-20 04:50:27 +05:30
Nuwan
6ff25ad1b7
wip new user recommendation email
2023-01-13 11:10:50 +05:30
Nuwan
4405e08c0a
sip on user match mailer
2023-01-04 21:41:57 +05:30
Nuwan
db7525ad64
user recom email wip
2023-01-02 16:39:05 +05:30
Nuwan
50ed5116f7
fix for pagination
2022-10-27 12:16:02 +05:30
Nuwan
17207fc0b8
fix for offset var
2022-10-27 11:53:47 +05:30
Nuwan
2de5f3a3c2
improve cypress integration test for filter musicians
2022-10-27 11:29:20 +05:30
Nuwan
e943a3235e
use offset for pagination instead of page number
2022-10-26 22:44:20 +05:30
Nuwan
957c5dc3e9
clean up musician filter codes
2022-10-26 12:46:27 +05:30
Nuwan
5c0ed0d773
remove currentPage and NextPage variables and just use page variable for pagination
2022-10-26 12:15:11 +05:30
Nuwan
6fd7a6531b
fix for pagination. just show what ever data received from api without checking unique
2022-10-26 10:45:09 +05:30
Nuwan
a9c0315697
fixes for pagination people filter component
2022-10-25 23:27:58 +05:30
Nuwan
0cac99e407
friends list pagination fix
2022-10-25 21:42:30 +05:30
Nuwan
f8eca9d538
fixes to musicians list filter prefetcing records
2022-10-25 18:45:48 +05:30
Nuwan
6e78f61f9c
improve prefetching
...
Only fetch the 'next set of records that aren't yet shown' once the
initial request is done. When you click 'Load', it should be only making one request at that point -- which would be the next page after the current set being shown
2022-10-23 16:19:57 +05:30
Nuwan Chaturanga
78b9cd0156
Merged in improve/musician_filter_api (pull request #39 )
...
Improve/musician filter api
Approved-by: Seth Call
2022-10-20 15:03:49 +00:00
Nuwan
295d613165
reduce number of sql queries in musicians filter
...
default last active option is set to 30 days
make it 5ms when neo4j returns 0 for audio latency
2022-10-20 17:53:23 +05:30
Nuwan
1080ac4a47
add pg_data directory to gitignore
2022-10-18 22:12:12 +05:30
Nuwan
c2f7fe7c32
change to api musician filter to minimize the database queries
2022-10-18 22:11:09 +05:30
Nuwan
5bd67d431c
change to api musician filter to minimize the database queries
2022-10-18 22:07:15 +05:30
Nuwan
ee54464cfc
jam-ui: fix pagination in musician listing
2022-03-18 19:27:48 +05:30
Nuwan
245b39f67d
enable test for active_within_days and joined_within_days filter options
2022-02-17 20:17:20 +05:30
Nuwan
3606b4f281
enable joined_within_days and active_within_days to musician filter option
2022-02-17 19:37:23 +05:30
Nuwan
0fcd8bc873
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2022-02-15 12:21:36 +05:30
Nuwan
84e984a549
.gitignore
2022-02-15 12:21:11 +05:30
Nuwan Chaturanga
e30aacc91d
Merged in jam-ui-search-fixes (pull request #38 )
...
more filter parameters to neo4j
Approved-by: Seth Call
2022-02-10 03:29:44 +00:00
Nuwan
22e207c9cc
fix errors related to filter tests
2022-02-09 13:20:37 +05:30
Nuwan
bffab7564d
enable commented out lines (added for debugging)
2022-02-08 21:06:22 +05:30
Nuwan
3f5cceb031
more filter parameters to neo4j
...
* pass genres and instrument parameters to neo4j
* remove filtering based on these params using rails and pg data
* pass pagination offset to neo4j
2022-02-08 20:55:00 +05:30
Nuwan
a4d8bc70b0
fix js errors when loading jamserver.js
2022-01-18 20:20:45 +05:30
Nuwan
87278e6adb
fetch musicians - from_location parameter
...
when fetching musicians records for the first time if there is no
results been received then fetch again by turning on from_location
filter option
2022-01-13 18:24:01 +05:30
Nuwan
7f4947a590
ui related improvements and fixes
2022-01-11 16:19:39 +05:30
Nuwan
c0b9b66b9d
disable load more button when data are been loaded
2021-12-24 10:57:48 +05:30
Nuwan
d19756b537
reverse filter debug
2021-12-23 16:24:10 +05:30
Nuwan
d35778f5e2
fix pagination errors
2021-12-23 15:58:53 +05:30
Nuwan
edab0fe9fc
fix error in sorting musicians
2021-12-22 18:56:13 +05:30
Nuwan
ef823df8eb
change header dropdown behaviour
2021-12-21 19:53:34 +05:30
Nuwan
15bd48ce3b
sort filtered musicians by latency order from neo4j
2021-12-18 22:34:34 +05:30
Nuwan
505f2d5592
paginate by more button
...
add "load more" button on bottom of musician listing that renders the records prefetched
2021-12-18 20:11:28 +05:30
Nuwan
961183bd47
minor fix
2021-12-13 20:18:13 +05:30
Nuwan
8d99f362a2
adding missing files
2021-12-13 19:56:45 +05:30
Nuwan
6c179d3220
refactor musican filter
...
restureture react components so that fiter component is now
a parent to the liast component. This way it is much easy to
have the commiunication between these two components
2021-12-13 19:46:07 +05:30
Nuwan
caef794231
fix for latency data not showing. found a problem in react component structrue of JKPeople and JKPeopleSearch
2021-12-11 10:24:05 +05:30
Nuwan
178d4fcb3f
remove cypress test artifacts
2021-12-08 23:03:23 +05:30
Nuwan
1717fc1a15
fix null error in JKProfilePerformanceSamples component
2021-12-08 22:59:54 +05:30
Nuwan
9e718cccdc
diable musicians sort by score
...
'scores' as a table is useless & dead. therefore this sort is no longer
valuable
2021-12-07 21:35:19 +05:30
Nuwan
5bbc5999d7
change of logging to bugsnag /search_users
2021-12-07 19:35:32 +05:30
Nuwan
4eb009d76d
benchmark neo4j /search_users
2021-12-07 19:21:05 +05:30
Nuwan
cb344665cb
after login redirect the user to the page he requeted
2021-12-06 19:00:48 +05:30
Victor Barba Martin
c6c1e96e85
setup staging variables
2021-12-03 16:25:42 +01:00
Victor Barba
80fb8b2fce
bitbucket-pipelines.yml edited online with Bitbucket
2021-12-01 20:22:22 +00:00
Nuwan
7a86300755
change latency values of FAIR category
2021-11-30 19:28:09 +05:30
Nuwan
97b1b03946
checking issue in staging attempt 2
2021-11-24 17:32:18 +05:30
Nuwan
a63b5cd61f
checking issue in staging
2021-11-24 17:08:45 +05:30
Nuwan
362d0a7ba9
fix error
2021-11-24 16:28:32 +05:30
Nuwan
08a69da490
new pages
2021-11-24 12:39:55 +05:30
Nuwan
480de3e89f
fix cypress tests
2021-11-24 10:03:47 +05:30
Nuwan
2110c4b1ce
UI changes as per the requests by David
2021-11-24 09:51:28 +05:30
Nuwan
e769eb0531
force https in production
2021-11-13 12:05:27 +05:30
Nuwan
4ef2dcdc04
fix issues related to user login and logout
2021-11-11 16:54:00 +05:30
Nuwan
2438e45a1b
merge confict fix
2021-11-11 08:02:36 +05:30
Nuwan
2ec02ee436
change user auth to have a login page for the users to sign in to the site
2021-11-11 07:55:17 +05:30
Nuwan
4dcb1c4dd8
add link to footer
2021-11-11 07:55:17 +05:30
Nuwan
e88cf16702
setup i18n with locale switcher in header
2021-11-11 07:55:17 +05:30
Seth Call
56b49d4790
Initial Bitbucket Deployments configuration
2021-11-11 02:15:06 +00:00
Nuwan Chaturanga
f5def534fe
Merged in VRFS-5281-admin_latency_recommendation (pull request #36 )
...
VRFS-5281 admin latency recommendation
2021-11-04 19:49:07 +00:00
Nuwan
d4a517ab7c
admin page for getting latency recommendation
2021-11-04 19:26:13 +05:30
Nuwan
5cc9868f4d
admin page for getting latencies between users
2021-11-02 18:49:29 +05:30
Nuwan
690219e60e
wip admin latency api
2021-10-29 15:07:40 +05:30
Nuwan
4f98bb7644
add bitbucket build vars to react env
2021-10-27 16:47:07 +05:30
Nuwan
dc7469d400
Merge branch 'show_ci_build_number' into develop
2021-10-27 16:12:26 +05:30
Nuwan
9fe595e523
show ci/cd build meta data in layout
2021-10-27 16:05:51 +05:30
Victor Barba Martin
0f67c4f041
add deploy to staging
2021-10-26 17:10:47 +02:00
Victor Barba Martin
5535a44393
add deploy to staging
2021-10-26 16:48:45 +02:00
Nuwan
cf21f61985
add env.staging file
2021-10-26 17:05:31 +05:30
Victor Barba Martin
b4a94f596b
add deploy to staging
2021-10-26 09:58:39 +02:00
Nuwan
8c5bba305c
add link to footer
2021-10-25 01:22:08 +05:30
Nuwan
e577d71d5d
setup i18n with locale switcher in header
2021-10-25 00:50:23 +05:30
Seth Call
72092edf2b
build bump
2021-10-22 14:36:29 -05:00
Nuwan
8e725686f9
add rack-cors gem to Gemfile
2021-10-22 22:32:06 +05:30
Nuwan
e36385b41d
go to bottom of the chat window on first load
2021-10-22 20:08:08 +05:30
Nuwan
f95ed1ac0c
refactor code related to send friend request functionality
2021-10-22 14:13:30 +05:30
Victor Barba
4d4cbde465
bitbucket-pipelines.yml edited online with Bitbucket
2021-10-21 18:38:16 +00:00
Seth Call
6c35c02bdf
Merged in VRFS-5232-new_react_frontend (pull request #34 )
...
New UI mvp1
2021-10-21 16:36:59 +00:00
Nuwan
20faef891c
Merge branch 'VRFS-5232-new_react_frontend' of bitbucket.org:jamkazam/jam-cloud into VRFS-5232-new_react_frontend
2021-10-21 21:51:25 +05:30
Nuwan
d9e91d2a2f
fixes in redux stores. also dismiss warnning messages raised when building
2021-10-21 21:45:19 +05:30
Victor Barba Martin
b2beb8db74
add pipeline for ui deploy
2021-10-19 22:21:05 +02:00
Victor Barba Martin
9721833ab8
add pipeline for ui deploy
2021-10-19 22:16:35 +02:00
Victor Barba Martin
e26b713943
Merge branch 'VRFS-5232-new_react_frontend' of https://bitbucket.org/jamkazam/jam-cloud into VRFS-5232-new_react_frontend
2021-10-19 22:12:07 +02:00
Victor Barba Martin
35726ec8d5
add pipeline for ui deploy
2021-10-19 21:42:38 +02:00
Nuwan
053bc5f78a
Merge branch 'VRFS-5232-new_react_frontend' of bitbucket.org:jamkazam/jam-cloud into VRFS-5232-new_react_frontend
2021-10-19 22:08:46 +05:30
Victor Barba Martin
0a85d4a1f5
add pipeline for ui deploy
2021-10-19 18:15:39 +02:00
Nuwan
1faf1ab722
add test for search filter
2021-10-19 19:19:44 +05:30
Victor Barba Martin
a9a42ae62a
add pipeline for ui deploy
2021-10-19 15:07:07 +02:00
Victor Barba Martin
05651ca74c
add pipeline for ui deploy
2021-10-19 15:06:04 +02:00
Nuwan
8350d8793a
remove unwanted ui elements
2021-10-18 18:55:54 +05:30
Nuwan
b8e058396e
signout functionality
2021-10-18 17:55:31 +05:30
Nuwan
97f26e5e13
setup playwright e2e tests
2021-10-15 17:36:58 +05:30
Nuwan Chathuranga
918788f643
auth e2e test
2021-10-13 22:51:30 +05:30
Nuwan Chathuranga
697ac3e74d
add notifications page
2021-10-13 22:51:30 +05:30
Nuwan Chathuranga
803e9d4014
add infinite scroll to people list
2021-10-13 22:51:30 +05:30
Nuwan Chathuranga
2f4107ce68
rename conflict files
2021-10-13 22:51:30 +05:30
Nuwan Chathuranga
8e1e281d21
ability to reply for text message notifications
2021-10-13 22:51:30 +05:30
Nuwan Chathuranga
b2fe71e482
show notifications in header as a drawer dropdown
2021-10-13 22:51:30 +05:30
Nuwan Chathuranga
6dae6ba53c
write README for setting up app in dev
2021-10-13 22:51:30 +05:30
Nuwan Chathuranga
791f536c8b
use redux for people state
...
reate redux store to manage state related to
fetching musicians and showing them on friends page
2021-10-13 22:51:30 +05:30
Nuwan Chathuranga
cb35148876
fix responsive issues in people list page
2021-10-13 22:51:30 +05:30
Nuwan Chathuranga
6e4432feb1
remove only guard in friends-list.spec
2021-10-13 22:51:30 +05:30
Nuwan Chathuranga
0af1efe8b2
add integration test cases for chat messages
2021-10-13 22:51:30 +05:30
Nuwan Chathuranga
89b3273125
showing incoming text mesages in chat window
2021-10-13 22:51:30 +05:30
Nuwan Chathuranga
7c60153c21
adding redux toolkit for state management
2021-10-13 22:51:30 +05:30
Nuwan Chathuranga
4c69f76e42
import jk js scripts in to reactjs app for interacting with websocket messages
2021-10-13 22:51:30 +05:30
Nuwan Chathuranga
13175f64f1
integrating websocket api
...
reduce javascripts in application.js bundle and
other related scripts/markup in templates of
legacy app and keep what is nedded for intracting
with websocket api. The stripped version of the javascript
endpoint /client_scripts can be referenced by the react app.
2021-10-13 22:51:30 +05:30
Nuwan Chathuranga
b67af9d847
nav and latenvy changes
...
includes ui improvements to nagigation, showing latency details
of user and other ui related improments
2021-10-13 22:51:30 +05:30
Nuwan Chathuranga
6c88cd1215
wip - react components related to musician listing and filtering
2021-10-13 22:51:30 +05:30
Nuwan Chathuranga
eb4c327eff
wip new react ui
2021-10-13 22:51:29 +05:30
Nuwan Chathuranga
4ee649c7f1
added updated files
2021-10-13 22:51:29 +05:30
Nuwan Chathuranga
35a9c945db
rename "jam-ui" directory to "ui"
2021-10-13 22:51:28 +05:30
Nuwan Chathuranga
fa8cd2fa7c
Initial changes to falcon package
...
* include changes to the templates to match new ui design.
* musician listing and filtering (initial phase)
* showing current logged in user in header
2021-10-13 22:51:27 +05:30
Nuwan Chathuranga
ea4fc496a1
initial falcon react package
2021-10-13 22:51:27 +05:30
Nuwan Chathuranga
bab8d14798
wip - filter musician records
2021-10-13 22:51:27 +05:30
Nuwan Chathuranga
f57218f429
enable CORS on web - allowing to connect by client app
2021-10-13 22:51:27 +05:30
Seth Call
ec8a481b42
Secret room token
2021-09-29 09:44:09 -05:00
Seth Call
b9941da0a5
fix options
2021-09-21 15:36:41 -05:00
Seth Call
ea8baaaa82
push
2021-09-21 15:18:52 -05:00
Seth Call
dbe1cc9644
update to N/A
2021-08-30 16:00:25 -05:00
Seth Call
a1ab88f641
Add session video beta button
2021-08-24 08:54:16 -05:00
Seth Call
24b4a80853
Fix latency + scheduled sessions
2021-08-18 13:30:42 -05:00
Seth Call
b160b4fffb
Fix scheduled
2021-08-18 07:46:04 -05:00
Nuwan Chaturanga
4b8861b9c5
Merged in VRFS-5251-admin_user_latency_info (pull request #32 )
...
show user latency json data in admin
Approved-by: Seth Call
2021-06-24 13:02:30 +00:00
Nuwan Chaturanga
091117bfe3
Merged in VRFS-5196_find_sessions_screen_latency_info (pull request #33 )
...
VRFS-5196 find sessions screen latency info
Approved-by: Seth Call
2021-06-24 13:01:40 +00:00
Nuwan Chathuranga
5da62ebd40
change latency badge text
...
show HIGH instead of POOR and UNACCEPTABLE
2021-06-23 14:54:56 +05:30
Nuwan Chathuranga
6fd1c2ce3b
show user latency json data in admin
2021-06-23 12:51:44 +05:30
Nuwan Chathuranga
d8fa7efdae
show latency badge in find session screen
2021-06-19 22:17:28 +05:30
Nuwan
6483c40f82
latency badge showing in find sessions screen wip
2021-06-19 22:17:28 +05:30
Nuwan Chathuranga
18c735b098
WIP latency badge in find sessions
2021-06-19 22:17:28 +05:30
Nuwan Chathuranga
98898dd60e
wip
2021-06-19 22:17:27 +05:30
Nuwan Chathuranga
85d5044622
wip find session latency
2021-06-19 22:17:27 +05:30
Nuwan Chathuranga
20376500b5
wip - find sessions latency badge
2021-06-19 22:17:27 +05:30
Nuwan Chathuranga
65cfa7c0fc
wip
2021-06-19 22:17:27 +05:30
Nuwan Chathuranga
8ab287ed73
wip find session latency
2021-06-19 22:17:27 +05:30
Nuwan Chathuranga
4b1fb8b1ed
wip - find sessions latency badge
2021-06-19 22:17:27 +05:30
Nuwan Chaturanga
fc624115b5
Merged in VRFS-5222-asset_upload_api (pull request #29 )
...
VRFS-5222 asset upload api
* migration file
* asset upload api wip
* /api/user_assets
this api endpoint is used to upload and query user_assets.
for uploads send following parameters..
- asset_type
- filename
- recording_id (optional)
- session_id (optional)
- ext_id (optional)
the api provides json response with signed url to aws s3
the same api endpoint is used to query uploaded user assets.
Following query parameters are supported.
- id
- ext_id
- recording_id + asset_type
- session_id + asset_type
* delete unused asset_uploader
* for user_asset uploads use aws_bucket
* db migration to add index on user_id of user_assets table
Approved-by: Seth Call
2021-06-17 02:20:55 +00:00
Seth Call
06e0852ee5
Merged in VRFS-5181_latency_in_musician_hover_bubble (pull request #31 )
...
Hover fixes
2021-06-16 20:57:04 +00:00
Nuwan Chathuranga
fb1d18ce6b
fix error showing latency badge
...
this fixes the issue of not showing the correct
latency badge on when hover over more than one user
2021-06-17 00:47:53 +05:30
Nuwan Chathuranga
724b76709a
Merge branch 'VRFS-5181_latency_in_musician_hover_bubble' of bitbucket.org:jamkazam/jam-cloud into VRFS-5181_latency_in_musician_hover_bubble
2021-06-17 00:18:50 +05:30
Nuwan
714853dc68
merge fix
2021-06-17 00:13:52 +05:30
Nuwan
b15a62cd4e
wip musiian latency badge fix
2021-06-17 00:08:57 +05:30
Nuwan
ebc9c2692c
musiian latency badge error fixing
2021-06-17 00:08:57 +05:30
Nuwan Chathuranga
280b8bc4ae
discard decimal palces in latency values in musician hover bubble
2021-06-17 00:08:57 +05:30
Nuwan Chathuranga
1906e9a110
Merge branch 'VRFS-5181_latency_in_musician_hover_bubble' of bitbucket.org:jamkazam/jam-cloud into VRFS-5181_latency_in_musician_hover_bubble
2021-06-16 22:45:25 +05:30
Nuwan
7627b39925
musiian latency badge error fixing
2021-06-16 22:30:54 +05:30
Nuwan Chathuranga
4b21aa68e0
discard decimal palces in latency values in musician hover bubble
2021-06-15 23:49:04 +05:30
Seth Call
29e23548f0
revert
2021-06-15 11:15:58 -05:00
Seth Call
de6e20c21c
forec no email
2021-06-15 11:10:58 -05:00
Nuwan Chathuranga
1d0e33fdc1
discard decimal palces in latency values in musician hover bubble
2021-06-15 17:26:10 +05:30
Nuwan Chaturanga
a0b7581c80
Merged in VRFS-5181_latency_in_musician_hover_bubble (pull request #30 )
...
VRFS-5181 latency in musician hover bubble
Approved-by: Seth Call
2021-06-11 14:56:43 +00:00
Nuwan Chathuranga
a3a34d4afe
show latency scores alone with latency badge
...
in musician hover bubble show internet and audio latency
scores next to latency badge
2021-06-09 23:28:59 +05:30
Nuwan
e7d89ecf30
fix for latency badge not showing
...
This fixes latency badge only working on one musician hover bubble.
2021-06-08 20:09:55 +05:30
Seth Call
1c71ead045
bring back fpm for now
2021-06-04 14:20:35 -05:00
Nuwan Chaturanga
4a296825e3
Merged in VRFS-5181_latency_in_musician_hover_bubble (pull request #28 )
...
VRFS-5181 show latency score badge on musician hover
Approved-by: Seth Call
2021-06-03 18:53:02 +00:00
Nuwan Chathuranga
87a01bcd66
remove "unknown" parameters in get_latencies api call to latency server
2021-06-04 00:21:30 +05:30
Nuwan Chathuranga
047ae3ebb2
specify latency server url correctly
2021-06-04 00:16:07 +05:30
Nuwan
1ee14dd01a
fix small spelling mistake
2021-06-01 21:39:09 +05:30
Nuwan
c7547405f8
Musician hover latency badge
...
show latency score badge on hover over musician.
fetches data from new resolve latency data API
2021-06-01 20:15:13 +05:30
Nuwan
11d8af22bb
fixes to musicion hover latency badge spec
2021-05-30 22:10:34 +05:30
Nuwan
4f9ffa6a80
testing hover latency badge
2021-05-30 07:14:54 +05:30
Nuwan Chathuranga
683e93e75e
testing latency badge
2021-05-29 18:43:48 +05:30
Nuwan
307444431a
wip sepcs for musician latency badge
2021-05-29 14:38:34 +05:30
Nuwan Chathuranga
10908623a4
wip musician latency badge
2021-05-27 15:58:34 +05:30
Nuwan
5144309ff4
show latency badge
...
on musician hover bubble show latency score badge by querying
resolve latency api
2021-05-27 04:59:34 +05:30
Nuwan Chathuranga
bcbd36a221
showing latency badge wip
2021-05-26 00:54:53 +05:30
Nuwan Chaturanga
18a0681f9f
Merged in modern_os_gemfile_amendment_1 (pull request #27 )
...
Modern os gemfile amendment 1
Approved-by: Seth Call
2021-05-24 12:34:18 +00:00
Nuwan Chathuranga
8f09bdce5b
musician latency badge wip
2021-05-23 18:27:53 +05:30
Nuwan Chathuranga
a027a75b1d
for modern O/S setup use Gemfile.alt instead of default Gemfile
...
configure bundler to use Gemfile.alt when bundling gems specifically
in newer OSs like apple m1. for thiw one can use BUNDLER_GEMFILE env variable
or add gemfile config entry to ./bundle/config
2021-05-22 15:24:00 +05:30
Nuwan Chathuranga
eb6750d92d
Gemfile changes for moden computers
...
use MODEN_OS env variable to selectively install
a version of pg gem that runs under newer O/S (ex: apple M1 Big sur)
2021-05-22 15:24:00 +05:30
Nuwan Chaturanga
04d42c1ad8
Merged in VRFS-5180_neo4j_serverless_setup-a1 (pull request #25 )
...
fix default install path
2021-05-21 20:29:02 +00:00
Nuwan
34f8413861
fix default install path
2021-05-20 07:05:38 +05:30
Seth Call
128e9c6bb4
hotfix for bad installer
2021-05-18 17:42:18 -05:00
Nuwan Chaturanga
fa9a976895
Merged in VRFS-5180_neo4j_serverless_setup (pull request #24 )
...
handler to install serverless framework and neo4j to facilitate serveing latency data requests
Approved-by: Seth Call
2021-05-13 13:43:04 +00:00
Nuwan
06ec910cfe
handler to install serverless framework and neo4j to facilitate serveing latency data requests
2021-05-13 15:39:24 +05:30
Nuwan Chaturanga
96f40aed76
Merged in VRFS-5179_resolve_latency_rest_api (pull request #23 )
...
add api endpoint to fetch latency data
Approved-by: Seth Call
2021-05-12 14:53:48 +00:00
Nuwan
34bf811453
add response.body to bugsnag call of failed latency requests
2021-05-12 20:03:28 +05:30
Nuwan
2567292580
change bugsnag severity for failed latency requests
2021-05-12 19:56:21 +05:30
Nuwan
9dac3fdb56
on error in get_latencies send details to bugsnag
2021-05-12 19:51:29 +05:30
Nuwan
93b848c2d8
remove unused code bits
2021-05-12 19:09:21 +05:30
Nuwan
2421a4bc03
add api endpoint to fetch latency data
...
this api method fetches latency data for the current user from the
latency graph database service
2021-05-12 16:07:23 +05:30
Seth Call
65125e04ca
Fix for ARS subscription
2021-04-29 14:13:32 -05:00
Seth Call
6862bb0f65
force ars_id even when new ARS
2021-04-27 15:07:56 -05:00
Seth Call
1f913071bc
emit something even if no referred
2021-04-27 14:19:34 -05:00
Seth Call
e2a60eda07
emit something even if no referred
2021-04-27 14:19:13 -05:00
Nuwan Chaturanga
a89bc7f5d2
Merged in VRFS-5123_video_button_remember_token_fix (pull request #22 )
...
skip api_signed_in_user for auth in api_music_sessions_controller
Approved-by: Seth Call
2021-04-27 18:28:39 +00:00
Nuwan
f1f64aedb1
skip api_signed_in_user for auth in api_music_sessions_controller
2021-04-27 23:52:31 +05:30
Seth Call
849169e3c7
Remove duplicate definitions in select for ad campaign
2021-04-27 12:44:15 -05:00
Seth Call
bf83538a2d
Add RAILS_RELATIVE_URL_ROOT
2021-04-27 12:37:33 -05:00
Nuwan Chaturanga
9f924fee3c
Merged in VRFS-5166-ad_campaigns_report_fixes_3 (pull request #21 )
...
ad_campaigns.rb fixes
Approved-by: Seth Call
2021-04-27 16:57:18 +00:00
Nuwan
eb3064f8aa
ad_campaigns.rb fixes
2021-04-27 22:21:34 +05:30
Nuwan Chaturanga
f9e3e644f1
Merged in VRFS-5147-user_view_edit_improvements (pull request #17 )
...
changes to user show and edit pages ref: VRFS-5147
* changes to user show and edit pages ref: VRFS-5147
Approved-by: Seth Call
2021-04-26 12:19:08 +00:00
Nuwan Chaturanga
316cbdab83
Merged in VRFS-5146-school_user_form (pull request #16 )
...
new admin form to quickly add school user
* new admin form to quickly add school user
* add required: true to all form fields in quick add school user
2021-04-23 17:10:01 +00:00
Nuwan Chaturanga
3a248df971
Merged in VRFS-5144-deleted_user_improvements (pull request #15 )
...
exclude deleted users from search
Approved-by: Seth Call
2021-04-22 21:55:17 +00:00
Nuwan
37c5cab83f
exclude deleted users from search
...
exclude deleted musicians and fans from search results
2021-04-22 17:14:35 +05:30
Nuwan Chaturanga
c2fe4ffb98
Merged in VRFS-5128_report_for_ad_campaigns (pull request #14 )
...
VRFS-5128 report for ad campaigns
* Ad campaign report
add new admin report for monitor and analyze the results
from a variety of paid campaigns
* reload report after updating values using best_in_place
* add users first_subscribed_plan_code
use this new column in ad campaigns report to filter by
subscription plan
* set first_subscribed_plan_code in recurly subscription creation
* set correct value for first_subscribed_plan_code
2021-04-21 21:27:55 +00:00
Nuwan Chaturanga
253d82a32c
Merged in VRFS-5099_clean_up_dump_paths (pull request #12 )
...
VRFS-5099 clean up dump paths
Approved-by: Seth Call
2021-04-16 21:24:10 +00:00
Nuwan
098e828d0f
refactor crash_dump
2021-04-16 05:16:22 +05:30
Nuwan Chaturanga
da8133bd8f
Merged in VRFS-5123_change_video_button_url (pull request #13 )
...
change video_btn url generation
Approved-by: Seth Call
2021-04-15 10:51:50 +00:00
Nuwan
e3fb76cb54
change video_btn url generation
...
directly call the video conferencing server url API
and bind that value to the button click handler
2021-04-15 14:02:18 +05:30
Nuwan
ba9a91eb1f
crash_dump fix test error in content_type
2021-04-13 01:19:03 +05:30
Seth Call
714dab3e8d
default conf host
2021-04-12 13:51:32 -05:00
Nuwan
eae35db92d
refactor crash_dump in users api
2021-04-13 00:20:46 +05:30
Seth Call
95483b759f
fix bundler
2021-04-11 14:01:49 -05:00
Nuwan Chaturanga
dccd971d2e
Merged in VRFS-5004-revamp_notification (pull request #11 )
...
VRFS-5004 revamp notification
2021-04-11 18:50:51 +00:00
Seth Call
940470dbc3
done
2021-04-11 13:33:59 -05:00
Nuwan Chaturanga
f42fc31c03
Merged in VRFS-5005-open_video_conf_page (pull request #10 )
...
VRFS-5005 open video conf page
Approved-by: Seth Call
2021-04-11 16:44:01 +00:00
Nuwan
b574b5e0c6
Support optional video server
2021-04-11 11:42:01 -05:00
Seth Call
43aae66fb2
add in wp changes
2021-04-10 20:49:49 -05:00
Nuwan
9711a9a666
change to notification toast and sidebar
...
* show 3 notification toasts instead of one
* open notification tray automatically for for priority notifications
2021-04-10 08:15:51 +05:30
Seth Call
c6d1e0b466
add exception
2021-04-03 09:40:41 -05:00
Seth Call
2000dc0663
more debugging
2021-04-02 17:05:48 -05:00
Seth Call
09233022ac
debug print
2021-04-02 13:26:01 -05:00
Seth Call
2b229f0409
still confused
2021-04-02 11:55:05 -05:00
Seth Call
4d797c48a1
remoove ver qualifier
2021-04-02 11:23:03 -05:00
Seth Call
421e335315
check
2021-04-01 23:15:10 -05:00
Nuwan
4db1c3b686
for testing enable video capability of the client
2021-03-29 14:44:02 +05:30
Seth Call
6f27f40962
Fix the notification highlighter tests
2021-03-28 23:29:42 -05:00
Seth Call
cf4f5c89e0
session_video_spec
2021-03-28 17:34:32 -05:00
Seth Call
dcbf52a88b
ignore extra args when test env
2021-03-24 20:18:18 -05:00
Seth Call
1f862baccf
make tests go a little faster
2021-03-24 20:12:38 -05:00
Nuwan
f6074d75d8
more fixes to spec
2021-03-24 19:23:33 +05:30
Nuwan
5db2cdeca4
fixing test driver related errors in notification_highlighter_spec
2021-03-24 18:47:16 +05:30
Seth Call
49ab06180d
skip_repatcha pass through to method
2021-03-19 15:27:51 -05:00
Seth Call
bb0de9570d
skip recaptcha
2021-03-19 11:57:52 -05:00
Nuwan Chaturanga
b1484f0a71
Merged in VRFS-5011-fix_landing_signup_error (pull request #9 )
...
VRFS-5011 fix landing signup error
Approved-by: Seth Call
2021-03-19 15:29:18 +00:00
Nuwan
69d4a01298
Update landing page to match spec
2021-03-19 10:22:31 -05:00
Seth Call
fc7a685423
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2021-03-17 20:51:38 -05:00
Seth Call
7a5c731b25
Fix bug with affiliate links and also move paypal.me text
2021-03-17 20:51:32 -05:00
Nuwan Chaturanga
b9b62f1661
Merged in VRFS-5012_fix_nil_error_in_admin_affiliate_cohorts (pull request #8 )
...
fix error cause by nil partner_user in admin affiliate_cohorts
Approved-by: Seth Call
2021-03-17 22:18:03 +00:00
Nuwan
c5e7b37420
fix error cause by nil partner_user in admin affiliate_cohorts
2021-03-17 15:05:33 +05:30
Seth Call
8b94c17d0e
Remove bugsnag hit
2021-03-16 15:23:56 -05:00
Seth Call
86a7994d02
don't count refunds
2021-03-16 13:34:50 -05:00
Seth Call
30a3fce222
fix affiliate rate cut
2021-03-16 10:09:55 -05:00
Nuwan Chaturanga
d8f7582790
Merged in VRFS-4993_signup_and_download_page_changes (pull request #6 )
...
VRFS-4993 signup and download page changes
Approved-by: Seth Call
2021-03-16 14:00:51 +00:00
Seth Call
ad7a02746b
advance time better
2021-03-16 08:35:47 -05:00
Nuwan
c00d75b032
fixing merge conflicts
2021-03-16 18:40:46 +05:30
Nuwan
6e51f57bff
new landing pages for signup and download pages
2021-03-16 17:10:58 +05:30
Nuwan
c2a3cd3cc1
remove musician radio buttons in signup form
2021-03-16 17:10:58 +05:30
Nuwan
29a4491a38
add download_spec to bin/test
2021-03-16 17:10:58 +05:30
Nuwan
9ab8cb276c
change layout/template of signup and downloads
...
change to new layout for user signup and download pages.
2021-03-16 17:10:58 +05:30
Seth Call
9a0c70517b
add rake_util
2021-03-15 08:59:46 -05:00
Nuwan
c99d8e2dd3
remove musician radio buttons in signup form
2021-03-15 11:50:17 +05:30
Seth Call
4dbf9fa17c
Bug fixes for affiliate syncing
2021-03-14 16:23:43 -05:00
Seth Call
f58be87187
turn crash emails off by default
2021-03-14 09:29:29 -05:00
Seth Call
0aac1329e2
Add wordpress plugin and fix one link
2021-03-13 17:40:31 -06:00
Nuwan
8f7f7b4b68
add download_spec to bin/test
2021-03-13 12:03:32 +05:30
Nuwan
9315a3f01a
change layout/template of signup and downloads
...
change to new layout for user signup and download pages.
2021-03-13 11:46:20 +05:30
Seth Call
deadc2fd68
Update test xml and mocks to match real API
2021-03-11 20:26:15 -06:00
Nuwan Chaturanga
95dea2c6f3
Merged in change_to_affiliate_program (pull request #5 )
...
Update affiliate program to 2021 spec.
Includes modifications to showing affiliate signups and earnings in client and affiliate cohorts in admin
2021-03-12 01:37:55 +00:00
Seth Call
cf47777115
Update Affliate Code and Reports to 2021 spec
...
Add support to account for subscriptions
Change rate to 30%. JamTracks 25cents
Reports updated for end users and admin
2021-03-11 19:36:14 -06:00
Seth Call
c07e799fdb
turn off personal feed again
2021-02-22 09:04:02 -06:00
Seth Call
201bc94947
build bump
2021-02-22 08:29:39 -06:00
Seth Call
cecd09b726
Merge in develop
2021-02-21 15:09:10 -06:00
Seth Call
03fab14ef3
Add more test cases and logic changes
2021-02-21 15:07:31 -06:00
Seth Call
ad2f29fe01
add executable
2021-02-14 12:10:55 -06:00
Seth Call
13b230a247
run working tests with bin/test
2021-02-14 12:10:46 -06:00
Seth Call
2058631c50
Merged VRFS-4950-add_rails_db_migrations into develop
2021-02-13 20:39:50 -06:00
Nuwan
48dfb68f89
change database migrations to be natural rails db migrations.
2021-02-13 20:17:18 -06:00
Seth Call
d52755876f
remove extra bullet
2021-02-13 15:26:18 -06:00
Seth Call
6f39421c74
new welcome email
2021-02-13 15:04:28 -06:00
Nuwan
e8d74a119c
fix session overlapped duration with other users
...
change calculation of MusicSessionUserHistory.duration_minutes to
exactly get the number of minutes overlapped with other user sessions.
previously it returned the entire music session time if a other user
joined in and left without staying compleyely within the session.
this commit also fixs an edge case of the query in
MusicSessionUserHistory.overlapping_connections
2021-02-11 20:17:36 +05:30
Seth Call
1e00b9b44e
force false because only used by client path
2021-02-09 10:49:12 -06:00
Seth Call
6d14054310
http for natve client
2021-02-09 09:19:48 -06:00
Seth Call
7f6198299a
use HTTP to sign
2021-02-08 22:58:53 -06:00
Seth Call
005e54f80b
Add back in correct true check for email
2021-02-08 11:38:57 -06:00
Seth Call
dc7c7a0c33
Slightly bigger
2021-02-08 10:52:01 -06:00
Seth Call
7d56d644ba
fix hover
2021-02-07 22:08:51 -06:00
Seth Call
e1d0fe2760
Fix notify bug; bette crash dump subject
2021-02-03 10:57:44 -06:00
Seth Call
877ea031d1
Pin sass/sass-rails
2021-02-02 08:29:30 -06:00
Seth Call
a452b2216c
monthly cohorts
2021-02-01 23:20:11 -06:00
Seth Call
6bd6958df1
Always close rating dialog on submit
2021-02-01 18:59:47 -06:00
Seth Call
f98f34d5fe
Pin more gems, fix CSS bugs, and fix many tests
2021-02-01 17:24:08 -06:00
Seth Call
36c25b7b49
fix websocket-gateway
2021-02-01 01:53:22 -06:00
Seth Call
839081f076
pinning more gems
2021-02-01 01:48:19 -06:00
Seth Call
1c2e96b359
more pinning
2021-02-01 01:42:02 -06:00
Seth Call
a520def1c5
older bundler
2021-02-01 01:40:01 -06:00
Seth Call
aa9abd6019
Updating Gemfile/locks for 2.4.1
2021-02-01 00:10:01 -06:00
Seth Call
e97b19564c
more changes
2021-01-31 21:25:09 -06:00
Seth Call
e01d623e28
Send email control, and db gemfile
2021-01-31 14:14:29 -06:00
Seth Call
a329167f05
shorten
2021-01-31 12:57:47 -06:00
Seth Call
ef9f2d3441
generalize descirption for crash upload
2021-01-31 10:06:41 -06:00
Seth Call
f43d6728f8
Add Nuwan to dev_users bootstrap
2021-01-31 09:29:01 -06:00
Seth Call
d156d7f606
Allow longer signing and fix importer
2021-01-31 09:27:37 -06:00
Seth Call
823720f217
make websocket-gateway happy
2021-01-18 17:16:14 -06:00
Seth Call
416f615768
name
2021-01-18 10:55:52 -06:00
Seth Call
209cb891c7
crash dump tweaok
2021-01-17 12:16:09 -06:00
Seth Call
ebf8e39b5c
bump
2021-01-17 08:12:11 -06:00
Seth Call
1262b9fd60
ARS vs P2P, subscription fixes, no block on max time
2021-01-16 19:37:34 -06:00
Seth Call
ba22761222
bump
2021-01-13 08:19:51 -06:00
Seth Call
ad1e784adb
update existing users
2021-01-11 17:51:06 -06:00
Seth Call
1eaaf8d4bf
try new sync
2021-01-11 12:15:15 -06:00
Seth Call
ee1dc427ce
build
2021-01-10 23:44:49 -06:00
Seth Call
3e953b1b4c
music session ratingsl
2021-01-09 16:15:56 -06:00
Seth Call
270f28be9e
check if builds
2021-01-09 13:25:39 -06:00
Seth Call
67e7e8e8ed
revert back again
2021-01-07 22:39:09 -06:00
Seth Call
a9f1a2a422
fix typos
2021-01-06 09:14:30 -06:00
Seth Call
a6f798c99a
force student
2021-01-05 23:59:10 -06:00
Seth Call
a0c08cf601
fix change plan to silver
2021-01-05 23:46:26 -06:00
Seth Call
88892c7e9f
use plan code not derised code
2021-01-05 23:38:12 -06:00
Seth Call
900ca24c40
change asio defaults
2021-01-05 22:40:54 -06:00
Seth Call
38213a68fd
try
2021-01-05 21:45:35 -06:00
Seth Call
3bc73afb88
stonk
2021-01-05 09:22:45 -06:00
Seth Call
0841409e50
let trials in
2021-01-05 08:55:37 -06:00
Seth Call
185d3e0b16
protect against uclient
2021-01-04 23:41:49 -06:00
Seth Call
9dff16d26f
apply
2021-01-04 18:38:15 -06:00
Seth Call
fa38b05cb9
fixes
2021-01-04 07:40:49 -06:00
Seth Call
339d63f374
try with bug snag
2021-01-01 15:33:34 -06:00
Seth Call
57c3217768
remove trial buffer
2021-01-01 12:42:05 -06:00
Seth Call
0fe8ac3330
use desired plan code while in trial
2021-01-01 10:32:13 -06:00
Seth Call
7ac66f9f0f
ebui
2021-01-01 10:03:48 -06:00
Seth Call
95a4eb4ec8
better help desk check
2021-01-01 10:00:38 -06:00
Seth Call
a09e33a083
push
2021-01-01 09:02:49 -06:00
Seth Call
8b3cb159ae
clean up
2020-12-30 16:27:35 -06:00
Seth Call
4de066e505
done
2020-12-29 19:02:08 -06:00
Seth Call
48fc8152a4
indexes
2020-12-28 22:21:18 -06:00
Seth Call
9c7014f853
optimize slow rsvp query
2020-12-27 23:44:17 -06:00
Seth Call
965d224a0e
update stats to once a minute
2020-12-27 22:35:07 -06:00
Seth Call
2d805516ff
websocket optimization
2020-12-27 17:58:31 -06:00
Seth Call
8393506f52
connection policy
2020-12-18 17:22:12 -06:00
Seth Call
e451e765f5
better paypal
2020-12-15 13:56:16 -06:00
Seth Call
4554d88c89
fixpaypal
2020-12-14 18:38:22 -06:00
Seth Call
df4e8fc61b
push
2020-12-13 14:49:44 -06:00
Seth Call
8f49337072
paypal
2020-12-13 12:22:57 -06:00
Seth Call
cdd9b9df4f
trying fix
2020-12-11 16:53:05 -06:00
Seth Call
84ef9d188b
done
2020-12-08 09:59:29 -06:00
Seth Call
4df1fe9ce1
push
2020-12-07 23:25:32 -06:00
Seth Call
e3ec5b0434
metron mifxe
2020-12-07 22:39:26 -06:00
Seth Call
3c21550c3b
open stuff
2020-12-07 22:27:50 -06:00
Seth Call
fdb6a35541
fix
2020-12-07 21:04:10 -06:00
Seth Call
10d932a88e
ability to send welcome email
2020-12-07 15:22:15 -06:00
Seth Call
48a144744a
fix
2020-12-07 10:19:39 -06:00
Seth Call
96a55d9894
15 minutels and only if > 1 person
2020-12-06 12:25:39 -06:00
Seth Call
c572b0ac27
done
2020-12-05 14:45:44 -06:00
Seth Call
ca933f6445
fix https avatars
2020-12-05 14:15:43 -06:00
Seth Call
adf5c7afe0
debug and admin override UI
2020-12-05 13:53:04 -06:00
Seth Call
01bf30b4ce
admin override
2020-12-05 12:16:38 -06:00
Seth Call
14a3851458
fix record
2020-12-04 08:28:09 -06:00
Seth Call
c9577b2bb2
fix hardcoded gold
2020-12-03 16:53:39 -06:00
Seth Call
7a490c4baf
fix redericet
2020-12-03 15:33:08 -06:00
Seth Call
9ebadb709f
fix scan
2020-12-03 12:23:31 -06:00
Seth Call
efbd49ee76
fix scan
2020-12-03 12:22:24 -06:00
Seth Call
d42d23705b
doh
2020-12-03 11:47:50 -06:00
Seth Call
2aa8cc351a
http
2020-12-03 10:48:10 -06:00
Seth Call
7ed6f576ca
fix for http
2020-12-03 10:34:59 -06:00
Seth Call
5b7ba2f99d
refinements for payment and ASIO link problem
2020-12-02 09:30:58 -06:00
Seth Call
9a49ab5baa
fix pro_audio
2020-11-29 23:24:48 -06:00
Seth Call
67d0a3858c
fix pro_audio
2020-11-29 23:24:14 -06:00
Seth Call
0ce953280a
remove certain js files
2020-11-29 22:55:16 -06:00
Seth Call
73c48fb534
pass through subscription
2020-11-29 22:28:47 -06:00
Seth Call
6c865de3e0
other fields
2020-11-29 21:22:00 -06:00
Seth Call
642a82f36a
add subdomain
2020-11-29 20:15:31 -06:00
Seth Call
cf00671123
code-complete minus a few features
2020-11-29 18:24:28 -06:00
Seth Call
64fdf3028a
remove testi
2020-11-21 16:14:47 -06:00
Seth Call
ce301fd145
session limits done
2020-11-21 16:14:37 -06:00
Seth Call
9da0b37aeb
merged
2020-11-07 19:00:02 -06:00
Seth Call
695d95ecac
wait until after transaction for track changes
2020-11-03 13:50:35 -06:00
Seth Call
3b5b3608b1
get a little chattier
2020-11-03 13:24:00 -06:00
Seth Call
d68e8fc4f5
Remove brackets
2020-10-25 12:13:03 -05:00
Seth Call
42a958774c
Policies updated
2020-10-24 23:10:27 -05:00
Seth Call
510465c9a3
add conditional redirect
2020-10-24 15:11:17 -05:00
Seth Call
a367f0a376
remove s
2020-10-19 10:31:25 -05:00
Seth Call
7b664d8968
remove print
2020-10-18 15:44:59 -05:00
Seth Call
a26715b932
admin build
2020-10-18 15:39:23 -05:00
Seth Call
5073c4757d
check
2020-10-18 13:57:32 -05:00
Seth Call
0dee648c04
no global chat for fgetching
2020-10-17 15:59:54 -05:00
Seth Call
8911c8ed65
done
2020-10-17 12:30:42 -05:00
Seth Call
c8b49e9c36
Merge branch 'develop' into feature/k1
2020-10-16 19:17:41 -05:00
Seth Call
bc7c59068e
more UI finessing
2020-10-14 09:35:20 -05:00
Seth Call
ec449479fa
create sessioen updates
2020-10-13 21:31:47 -05:00
Seth Call
168515f1bf
wip
2020-10-13 21:05:08 -05:00
Seth Call
2ec522a366
pause
2020-10-09 17:22:20 -05:00
Seth Call
9476141a6c
Merge branch 'develop' into feature/subscriptions
2020-09-27 20:31:21 -05:00
Seth Call
d41ceaffc6
better help
2020-09-27 13:51:31 -05:00
Seth Call
01bd2c79e4
fix broken mute in jamtracks and suppress non-opener VU meddling
2020-09-27 13:08:34 -05:00
Seth Call
3b0ac0c465
fixed welocme email
2020-09-27 12:27:50 -05:00
Seth Call
8ca8c37763
Merge branch 'develop' into feature/mixer-change
2020-09-27 11:25:03 -05:00
Seth Call
9b9460be71
mixer change and help instructions
2020-09-27 11:24:22 -05:00
Seth Call
39c00d23d6
stop hiding on listed
2020-09-19 16:34:17 -05:00
Seth Call
2ebe700a9c
configurable event page logo
2020-09-19 11:52:31 -05:00
Seth Call
bdd44985fa
wip
2020-09-19 10:57:18 -05:00
Seth Call
41f8480190
wip
2020-09-14 19:51:54 -05:00
Seth Call
2ba44ff145
pause
2020-09-14 19:51:01 -05:00
Seth Call
46c18610e6
relax io check
2020-09-01 19:24:25 -05:00
Seth Call
0d0b36d59c
still got it
2020-09-01 13:56:13 -05:00
Seth Call
16c5ee9c78
ftue changes
2020-09-01 13:33:04 -05:00
Seth Call
cc69aa098e
typo
2020-08-22 16:19:15 -05:00
Seth Call
b1ae94db1a
fix beta feature
2020-08-22 15:35:42 -05:00
Seth Call
c595d8158e
better session ratings and prep for AKS test
2020-08-22 09:30:20 -05:00
Seth Call
16da5e8918
restrict out empty IP
2020-08-13 13:42:59 -05:00
Seth Call
f790ee996a
fix for privacey
2020-07-14 18:39:47 -05:00
Seth Call
da8c11e83f
fix privacy of the feed
2020-07-14 18:35:14 -05:00
Seth Call
a15ba945fd
do it
2020-06-05 17:56:17 -05:00
Seth Call
ce69b1204c
ars get or create
2020-06-02 23:14:39 -05:00
Seth Call
3357243f7d
gcp host
2020-06-02 22:39:25 -05:00
Seth Call
20804ff389
switch to AMZ SES, add bad audio
2020-05-26 23:19:50 -05:00
Seth Call
d569338f8f
img
2020-05-26 19:02:51 -05:00
Seth Call
8b8dd600d6
press release page
2020-05-26 18:36:53 -05:00
Seth Call
0233d45874
fix double bass, reduce emails
2020-05-11 20:45:32 -05:00
Seth Call
634dd07769
fix message route
2020-05-09 12:04:44 -05:00
Seth Call
cd05d269bd
invited user spam faker
2020-05-09 09:17:00 -05:00
Seth Call
9446de49d4
gofundme link
2020-05-09 08:22:19 -05:00
Seth Call
1ccb6c8a6e
ars stuff
2020-05-07 23:40:57 -05:00
Seth Call
466b4e5092
Audio Settings
2020-05-06 22:27:43 -05:00
Seth Call
51a16da559
Merge branch 'develop' into feature/ars
2020-05-06 22:12:47 -05:00
Seth Call
7dcce46dc1
let in friends
2020-05-06 22:12:16 -05:00
Seth Call
a81c659851
wip
2020-05-06 22:04:17 -05:00
Seth Call
842dc7dda1
Merge branch 'develop' into feature/ars
2020-05-06 21:55:21 -05:00
Seth Call
27c966b128
remove bogus listen link text
2020-05-06 21:45:32 -05:00
Seth Call
15b7cd8ece
fix hover, limit 20, better keyword search, and video tutorial link
2020-05-06 21:18:22 -05:00
Seth Call
cfc786ca9f
build
2020-05-06 18:25:10 -05:00
Seth Call
6982376dc4
wip
2020-05-06 18:24:29 -05:00
Seth Call
20d7be5c8f
comment out problematic query for www
2020-05-06 16:10:57 -05:00
Seth Call
9ef0b24be2
remove bade line
2020-05-06 16:02:18 -05:00
Seth Call
0df6a04cd0
move genre to it's own spot
2020-05-06 14:53:47 -05:00
Seth Call
4d9e8d2847
done
2020-05-06 14:42:52 -05:00
Seth Call
77232d9e0a
Merge branch 'develop' into feature/find
2020-05-01 14:12:19 -05:00
Seth Call
981e7d2636
fix who sent to
2020-05-01 14:12:08 -05:00
Seth Call
b8f9f18363
merged
2020-05-01 14:06:27 -05:00
Seth Call
dd4de62f8d
cleanup notifies
2020-05-01 13:59:48 -05:00
Seth Call
484454caae
wip
2020-04-30 12:05:59 -05:00
Seth Call
18e321dc55
Merge branch 'develop' into feature/find
2020-04-29 16:11:30 -05:00
Seth Call
715f550acf
ugly
2020-04-29 16:08:41 -05:00
Seth Call
10543665ee
wip
2020-04-29 15:51:50 -05:00
Seth Call
702a39ef3c
fix link
2020-04-22 11:50:25 -05:00
Seth Call
072ed30ed6
expand chat window link
2020-04-22 11:40:54 -05:00
Seth Call
28f4d70360
remove count
2020-04-21 15:58:20 -05:00
Seth Call
2756f763ba
speed up feeds
2020-04-21 11:21:23 -05:00
Seth Call
7266464d57
smaller feed
2020-04-21 09:47:28 -05:00
Seth Call
3e34a28588
feed fix
2020-04-21 09:04:30 -05:00
Seth Call
3e74386345
autostraip
2020-04-19 23:44:07 -05:00
Seth Call
72bbff8cfc
get image in
2020-04-19 18:44:38 -05:00
Seth Call
46c6f4c286
remove listig
2020-04-19 18:40:48 -05:00
Seth Call
fffcad9eee
bump
2020-04-19 17:53:30 -05:00
Seth Call
37546df1d3
powered by
2020-04-19 16:40:08 -05:00
Seth Call
d72aeb489c
attempt one
2020-04-19 13:35:19 -05:00
Seth Call
2ea0e4760b
add events to precompile
2020-04-19 09:39:42 -05:00
Seth Call
745ed8c914
live chat
2020-04-18 20:51:43 -05:00
Seth Call
8d29fd74e1
another pass at mobile
2020-04-18 20:34:29 -05:00
Seth Call
ec7651c8a7
looking OK without whitelabel support
2020-04-18 15:12:45 -05:00
Seth Call
a088d73b22
image assets
2020-04-16 22:18:27 -05:00
Seth Call
f9ae6206e6
fix
2020-04-16 12:29:01 -05:00
Seth Call
b9681fd418
livestream beta commit
2020-04-16 11:26:18 -05:00
Seth Call
9691d815cd
Fixed password reset and trim of signup
2020-04-05 23:59:55 -05:00
Seth Call
4758357bc8
simplified signup
2020-04-04 20:27:22 -05:00
Seth Call
e7df37c157
fix title too
2020-04-04 19:37:24 -05:00
Seth Call
ddb5ba42fa
deal with invites to existing users
2020-04-04 19:31:00 -05:00
Seth Call
0294761079
invite actually working
2020-04-04 17:51:36 -05:00
Seth Call
f4e4b4dd16
fix find Session
2020-04-02 23:35:00 -05:00
Seth Call
c0bb24fb57
fix links
2020-04-02 09:45:01 -05:00
Seth Call
5a658c2d5f
remove jamblaster link, cleanup some links, debug latency-tester, turn down test to 4
2020-03-29 22:34:03 -05:00
Seth Call
1aba7ff35a
Fix more links
2020-03-27 23:03:54 -05:00
Seth Call
70485aaaa3
clean up links
2020-03-27 22:14:26 -05:00
Seth Call
196f5fd009
disable listen in
2020-03-26 15:12:49 -05:00
Seth Call
22d52a73e8
looks good
2020-03-26 12:29:24 -05:00
Seth Call
988fa276b1
beter logging to debug this damn thing
2020-03-26 10:24:54 -05:00
Seth Call
ff21cc8746
test
2020-03-25 07:35:28 -05:00
Seth Call
fbc472b054
Remove desk URLs from welcome email, FTUE, and most web pages
2020-03-21 20:16:18 -05:00
Seth Call
b6184bd355
remove nocaptcha from client interface
2019-01-20 08:13:29 -06:00
Seth Call
52ccb2c611
log beforeunload too
2019-01-19 22:14:07 -06:00
Seth Call
2de825f064
Additional logs
2019-01-19 22:08:11 -06:00
Seth Call
0f0995a567
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2019-01-19 19:59:50 -06:00
Seth Call
b6d2e6e150
add some more dbug to see original of crose
2019-01-19 19:59:41 -06:00
Peter Walker
46e44ad49a
track details in rating attempt
2018-08-12 11:49:48 -05:00
Seth Call
8a9eb794b7
allow teachers/students to always get in
2018-07-29 13:26:09 -05:00
Seth Call
753cc8e4d9
backend_details attempt #2
2018-07-29 12:39:40 -05:00
Seth Call
bc4e5607ee
configs
2018-07-29 11:09:03 -05:00
Seth Call
98bde49131
put in backend details
2018-07-22 14:19:21 -05:00
Seth Call
cb0375bc32
Add first name
2018-06-14 21:39:52 -05:00
Seth Call
cf652ba63a
tweak url
2018-06-14 21:23:29 -05:00
Seth Call
ffa93a8427
fix
2018-06-03 14:11:29 -05:00
Seth Call
65c8981f61
fix timing of email
2018-05-27 09:46:06 -05:00
Seth Call
db27ff7d38
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2018-05-26 12:20:16 -05:00
Seth Call
57764a3aba
emails ready to go for amazonv2
2018-05-26 12:19:59 -05:00
Peter Walker
2b153ce09c
reject crashuploads that don't have client version field
2018-05-25 08:12:50 -05:00
Seth Call
b0ccb5202e
VRFS-4748 - 3 differet email reminders
2018-05-20 21:57:53 -05:00
Seth Call
88c23d3f8a
some first traunch of improveents for amazon prom
2018-05-05 12:05:52 -05:00
Seth Call
b65d04c384
add in the AMZ cards
2018-05-01 20:38:57 -05:00
Seth Call
fd38e1ab4e
fix shutdown prompt
2018-04-22 16:29:22 -05:00
Seth Call
c6054e1e1c
VRFS-4741 - kill vanilla, bugsnag, olark
2018-04-21 11:33:18 -05:00
Seth Call
563a22ea9c
fix bad Url in user.rb
2018-03-29 06:55:11 -05:00
Seth Call
c9fbb8e5dc
fix crash dump urls
2018-03-28 21:30:07 -05:00
Seth Call
dc8cde7618
fix email bug
2018-03-21 18:59:53 -05:00
Seth Call
bc406ed5e4
fix backend updates
2018-03-19 20:25:09 -05:00
Seth Call
897c94cce5
VRFS-4733 - touch up lesson coupon redeem page
2018-03-19 07:04:27 -05:00
Seth Call
35a1fd07fa
VRFS-4730 and VRFS-4732 - notifications of user activity
2018-03-18 16:41:40 -05:00
Seth Call
eac7a77ff7
fix teacher distributions page
2018-03-13 06:57:07 -05:00
Seth Call
d5783eb99d
fix for bad onboarding time set
2018-03-12 21:53:24 -05:00
Seth Call
efe1ee5d7d
VRFS-4721 - Links in lesson chat should not require you to log in when external browser shows
2018-03-10 07:56:56 -06:00
Seth Call
6e8e509108
remove name from onboarder email
2018-03-10 07:13:59 -06:00
Seth Call
d9c375df83
send out email on onboarder assignment: VRFS-4717
2018-03-09 18:27:27 -06:00
Seth Call
c6486b82bf
Allow whitespace on signin. Fix bug in session messaging
2018-03-08 07:23:39 -06:00
Seth Call
6a4e099a18
send emails for each message in lesson chat
2018-03-05 21:07:30 -06:00
Seth Call
16d8e0fffe
Merged in VRFS-3936 (pull request #2 )
...
VRFS-3936 jamtracks json send contents string, not a file proper; tweaking mobile.rake
2018-03-05 04:24:48 +00:00
Seth Call
f00949b414
only show WASAPI
2018-03-04 18:12:18 -06:00
Seth Call
3c071f1cc3
don't whack wasapi
2018-03-04 18:03:56 -06:00
Seth Call
f00814fad8
jamtracks gifted fix in admin
2018-03-04 09:30:52 -06:00
Seth Call
8cb9db9971
show non-WASAPI in chat. fix survey
2018-03-03 15:39:55 -06:00
Seth Call
698e643996
onboarding survey
2018-02-25 21:44:02 -06:00
Seth Call
89f69cfdca
send survey db stuff
2018-02-25 20:54:02 -06:00
Seth Call
715e790bf6
clean up presentation
2018-02-25 18:01:19 -06:00
Seth Call
afecb2e369
randomize order
2018-02-25 17:55:00 -06:00
Seth Call
48360fbaec
intclude mark lost feature
2018-02-25 16:49:04 -06:00
Seth Call
fce2c68f4f
engagement emails
2018-02-25 16:28:12 -06:00
Seth Call
13f22abaa8
Best_inPlace no git
2018-02-22 16:33:34 -06:00
Seth Call
314d69e82d
onboarding settings done
2018-02-17 10:12:38 -06:00
Seth Call
19a9e9aa8b
timezone feature
2018-02-14 22:16:32 -06:00
Seth Call
91da29088f
teacher search and cancel powers for slow teacher responsens
2018-01-27 16:18:04 -06:00
Seth Call
badea60021
VRFS-4663 email pingpong done; not admin view
2018-01-23 21:48:23 -06:00
Seth Call
778e89e01f
fix activeadmin filter
2018-01-23 20:59:45 -06:00
Seth Call
70781c85f3
make form batch proc
2018-01-23 06:59:15 -06:00
Seth Call
42205d4d87
first attempt at onboarder interface
2018-01-22 21:50:45 -06:00
Seth Call
dacfc1abd3
add updated at to students
2018-01-16 22:07:02 -06:00
Seth Call
e27d645485
allow marking session ready/not ready on students page
2018-01-16 22:01:07 -06:00
Seth Call
46f15568bf
nav change in top-right to JamClass (kill band setup). Also fix right-navs
2018-01-16 21:29:43 -06:00
Seth Call
8727f4224d
chage label
2018-01-16 19:59:42 -06:00
Seth Call
8c27f82cf4
allow filter lessons by posa card type
2018-01-16 19:59:22 -06:00
Seth Call
98620efdde
files button always present
2018-01-16 14:27:20 -06:00
Seth Call
e8ec5820a0
searches
2018-01-14 21:50:44 -06:00
Seth Call
210f112845
searchers on admin
2018-01-14 21:50:26 -06:00
Seth Call
d0bbf92dd1
booking prices in
2018-01-14 10:12:15 -06:00
Seth Call
2324a5d309
clarify billed state
2018-01-12 15:09:00 -06:00
Seth Call
b17eee5936
fix bug with admin
2018-01-11 06:00:32 -06:00
Seth Call
bd12388d9a
VRFS-4624 remove birth dates
2018-01-09 20:57:03 -06:00
Seth Call
30f1906cc7
allow mark not checked
2018-01-09 20:18:29 -06:00
Seth Call
c30dbea2be
two free
2017-12-26 14:38:32 -06:00
Seth Call
a510b3bf84
json 1.8.6
2017-12-22 17:54:31 -06:00
Seth Call
55cd878e28
put in locks
2017-12-17 20:30:54 -06:00
Seth Call
4f5bedd22c
use Gemfile.lock
2017-12-17 20:26:20 -06:00
Seth Call
f3f888156b
amazon-promo splash page
2017-12-16 17:33:45 -06:00
Seth Call
138353c212
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2017-11-06 10:40:15 -06:00
Seth Call
a94c74a43f
fix crash dump
2017-11-06 10:40:05 -06:00
Seth Call
2e80a14854
README.md edited online with Bitbucket
2017-11-06 14:01:15 +00:00
Seth Call
14f3c89512
crash dump change
2017-10-31 17:00:18 -05:00
Peter Walker
237dc0e6aa
add extra fields to crash reports
2017-10-26 08:22:06 -05:00
Peter Walker
d4f1c44fc1
add extra fields to crash reports
2017-10-25 22:54:22 -05:00
Seth Call
d60871382f
fix typo
2017-10-19 13:31:38 -05:00
Seth Call
628295e8ed
fix cleanup
2017-10-19 09:42:08 -05:00
Seth Call
251873face
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2017-10-19 07:38:24 -05:00
Seth Call
560bd05da6
remix
2017-10-19 07:38:20 -05:00
Seth Call
aaee08d4f3
fix popup in JB config and also fix musician instruments
2017-10-19 07:30:09 -05:00
Peter Walker
74b64698ee
fields for crash support
2017-10-18 23:58:55 -05:00
Seth Call
c097c037f5
done
2017-10-18 21:28:11 -05:00
Seth Call
a447b0ecfc
fix list of recordable things
2017-10-18 21:11:26 -05:00
Seth Call
0e428c9922
youtube chat association and more bug fixes
2017-10-17 21:36:53 -05:00
Seth Call
7e2268e9ce
fix scheduled rsvp old query
2017-10-16 17:30:35 -05:00
Seth Call
77268fd218
refine logic to cleanup old sessions
2017-10-16 15:36:27 -05:00
Seth Call
6ca148b515
cleanup old sessions
2017-10-16 07:41:30 -05:00
Seth Call
cd7d28c819
fix session rating and signup url
2017-10-15 21:32:51 -05:00
Seth Call
951a271089
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2017-10-15 20:57:48 -05:00
Seth Call
447edb6e68
cleanup shutdown dialog
2017-10-15 20:56:25 -05:00
Peter Walker
e56e07e6d9
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2017-10-15 20:17:59 -05:00
Peter Walker
85c020d6b4
disable send button until user selects up/down
2017-10-15 20:17:42 -05:00
Seth Call
55e9387bd5
skip recaptcha
2017-10-15 18:15:58 -05:00
Seth Call
c7804aebf1
allow posa-cards to indicate if are test cards. not used; just tracked atm
2017-10-15 17:26:00 -05:00
Seth Call
175d6d458e
update email for amazon users
2017-10-15 17:07:35 -05:00
Seth Call
21c294de59
add images
2017-10-15 16:43:03 -05:00
Seth Call
eff69dd44d
new landing pages
2017-10-15 16:42:45 -05:00
Seth Call
297967ebd7
optimize the heck out of some terrible queries
2017-10-12 11:13:54 -05:00
Seth Call
b82c9c4504
reconnect automatically in resque; kill self for websocket gateway
2017-10-10 11:08:18 -05:00
Seth Call
d3e787fb2a
optimize session query and catch dead connection in websocket gateway; heal dbconn
2017-10-08 10:43:33 -05:00
Seth Call
779b8e5c92
log out expected latency
2017-09-17 09:42:02 -05:00
Seth Call
f339da1227
shorten shutdown options
2017-09-16 11:29:23 -05:00
Seth Call
26b4c8e60e
drop Default Input/Default Output
2017-09-15 11:41:28 -05:00
Seth Call
e2ec56f2df
check for null data
2017-09-15 11:14:43 -05:00
Seth Call
d76c7a15de
oops prevent next if WDM
2017-09-15 10:40:28 -05:00
Seth Call
0e2874ae67
show 20/40 for WDM
2017-09-15 08:41:45 -05:00
Seth Call
37c7550a08
pin back hamlrails
2017-07-19 07:38:39 -05:00
Seth Call
f44783efdd
pin carrierwave before 1.0 breaking change
2017-07-16 20:20:28 -05:00
Seth Call
41e1ef7083
amazon readiness complete
2017-07-16 19:38:40 -05:00
Seth Call
7f18c6b056
get background-image check in there
2017-07-09 21:22:08 -05:00
Seth Call
7ff7327ef8
lots of progress on amazon-readiness
2017-07-09 21:21:29 -05:00
Seth Call
cd9525ac2b
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2017-06-26 15:00:47 -05:00
Seth Call
5f1536f809
hide phantom teachers that teach guitars
2017-06-26 14:59:13 -05:00
Peter Walker
3f4f411eb6
add logic to show network test dialog
2017-06-26 12:10:58 -05:00
Seth Call
3aee4f8f28
did it
2017-06-23 18:39:22 -05:00
Seth Call
eec6cc0988
fix silly bug
2017-06-15 22:51:20 -05:00
Seth Call
1b9e0011e1
fix interval bug
2017-06-15 21:23:50 -05:00
Seth Call
1318a55fc0
missing image
2017-06-10 15:35:01 -05:00
Seth Call
408c6d447f
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2017-06-10 15:34:18 -05:00
Seth Call
4d7712093a
working on livestream
2017-06-10 15:34:08 -05:00
Jonathan Kolyer
d1be7947af
VRFS-3936 merging remote
2017-05-26 19:10:09 -07:00
Jonathan Kolyer
ceb2527f56
VRFS-3936 fine-tuning mobile jtx json format some more
2017-05-26 17:09:31 -07:00
Jonathan Kolyer
65cb581d3b
VRFS-3936 more reformating of jtx mobile json
2017-05-26 13:34:11 -07:00
Seth Call
b9f9856541
build push
2017-05-26 14:47:37 -05:00
Jonathan Kolyer
f04e0b0c8c
VRFS-3936 mobile jtx json formating
2017-05-26 12:42:18 -07:00
Jonathan Kolyer
f07465f372
VRFS-3936 merging develop
2017-05-24 21:33:58 -07:00
Jonathan Kolyer
34b6887a79
VRFS-3936
...
tweaking mobile jamtracks json formatting
2017-05-24 21:31:29 -07:00
Jonathan Kolyer
cc6da7127a
VRFS-3936 creating mobile jamtrack list json
2017-05-24 18:44:08 -07:00
Jonathan Kolyer
5c87e38022
VRFS-3936 rake task to generate mobile jtx json file
2017-05-18 23:33:03 -07:00
Seth Call
ce02ba8664
fix vide orecording options
2017-05-12 08:03:59 -05:00
Seth Call
de3869ca2c
merge
2017-05-12 07:10:39 -05:00
Seth Call
f4ee0be3b7
clevie tracks and fix for detecting some sort of open window
2017-05-11 21:38:27 -05:00
Jonathan Kolyer
af4678cbed
VRFS-3936 mobile purchase sync fixes
2017-04-24 11:21:11 -07:00
Jonathan Kolyer
afe8380280
VRFS-3936 had to tweak mobile recording uploads
2017-04-20 01:06:25 -07:00
Seth Call
a1fd8c3d10
add cors for real
2017-04-14 14:34:18 -05:00
Jonathan Kolyer
cd762dcd15
VRFS-3936 conflict fixed merging develop
2017-03-22 12:49:58 -07:00
Jonathan Kolyer
a6f9413fae
VRFS-3936 fixed typo in mobile_update method
2017-03-22 12:48:36 -07:00
Seth Call
2eaa59a6d4
guitarcenter tweaks and fix accept lesson on counter recurring
2017-03-22 07:39:06 -05:00
Jonathan Kolyer
368030eedc
VRFS-3936 mobile_recording_upload
2017-03-16 17:22:54 -07:00
Jonathan Kolyer
7dcbadb75f
VRFS-3936 mobile recording json saves
2017-03-16 11:23:30 -07:00
Jonathan Kolyer
4f4757c946
VRFS-3936 index on json_stores.type column
2017-03-16 11:21:53 -07:00
Jonathan Kolyer
cbfb8f35c1
VRFS-3936 using Recording.create_immediately
2017-02-24 15:32:02 -08:00
Jonathan Kolyer
81979ba4bb
VRFS-3936 merging develop
2017-02-24 14:05:57 -08:00
Seth Call
fdd046e15f
allow ios through
2017-02-13 07:21:36 -06:00
Seth Call
9ad22b35ae
cancel fix
2017-02-12 21:13:31 -06:00
Seth Call
f80c8014dd
fix bad chat history
2017-02-12 20:56:41 -06:00
Seth Call
67facaec4a
fix display of session time
2017-02-12 20:49:33 -06:00
Seth Call
a79b44a88c
remove 403 check from jamblaster
2017-02-12 10:52:06 -06:00
Seth Call
8285781688
serial no removal
2017-02-08 08:27:06 -06:00
Seth Call
220ab8ee1b
serial no removal
2017-02-08 08:25:07 -06:00
Seth Call
1b8a6dd01b
fix ios_placed_order
2017-02-05 22:07:08 -06:00
Seth Call
cf553009bf
jamtrack price change
2017-02-05 14:42:51 -06:00
Seth Call
063cbd27ee
allow multiple users to control same jb
2017-01-29 21:41:33 -06:00
Seth Call
1491e9026e
fix teacher payment code
2017-01-17 21:22:49 -06:00
Seth Call
fb70455829
mark_lesson added
2017-01-17 12:24:49 -06:00
Seth Call
ec0b203177
carrierwave pin
2017-01-06 06:44:02 -06:00
Seth Call
575abf01e5
pin carrier wave in web
2017-01-06 06:43:38 -06:00
Seth Call
19b2edcefa
fix URI encode of download of JT from ap
2017-01-05 21:21:30 -06:00
Seth Call
4a702b46fd
fix URI encode of download of JT from ap
2017-01-05 21:15:03 -06:00
Seth Call
ea7ed8c65e
fix
2016-12-19 17:09:17 -06:00
Seth Call
c43b6cb1b9
allow serialno pinning of jamblaster artifacts
2016-12-18 22:23:05 -06:00
Seth Call
edcd297092
fix paypal gem reference
2016-12-17 11:08:26 -06:00
Seth Call
a4eea05a84
hello
2016-12-17 08:02:55 -06:00
Seth Call
6b878cf119
try to pin coffeescriptsource
2016-12-15 20:57:08 -06:00
Seth Call
5e04f72d8e
paypal support
2016-12-15 12:47:08 -06:00
Seth Call
458637b1de
VRFS-3993 - better nav/help on jamtrack player
2016-12-06 08:01:10 -06:00
Seth Call
79f6649602
fix bad asset compile
2016-12-05 10:25:37 -06:00
Seth Call
7ea80fa26f
default to default samplerate
2016-12-05 09:00:49 -06:00
Seth Call
80145a09da
Merge branch 'feature/jbmvp' into develop
2016-11-04 11:19:14 -05:00
Seth Call
ffd0469f09
working recordings
2016-11-04 11:18:58 -05:00
Seth Call
1bfdba6ca4
seo
2016-11-01 20:27:32 -05:00
Seth Call
d58330d8da
add 2 simple static landing pages
2016-10-27 20:28:21 -05:00
Seth Call
a8b181394c
wip
2016-10-27 18:24:54 -05:00
Jonathan Kolyer
cd843f300c
VRFS-3936 merging develop
2016-10-08 19:08:17 +00:00
Jonathan Kolyer
c23944607c
merging origin
2016-10-08 19:06:38 +00:00
Seth Call
abf3c6f0f5
fix jamclass posa cards
2016-10-07 11:56:48 -05:00
Seth Call
a2fd9cb87a
allow upload of giftcards
2016-10-07 11:11:06 -05:00
Seth Call
de8324e87d
posa/retailer fixes
2016-10-07 09:55:16 -05:00
Seth Call
1652dabb53
fixes for retailer
2016-10-07 08:28:17 -05:00
Seth Call
2d1c4bc507
fix bug in signup plus posa claim
2016-10-02 22:26:47 -05:00
Seth Call
60543897d4
VRFS-4287 - retail partner program done
2016-10-02 21:51:34 -05:00
Seth Call
345007f110
merged
2016-09-27 15:39:45 -05:00
Seth Call
9bdc4bb394
fix for missing checkboxs
2016-09-26 22:01:07 -05:00
Seth Call
3117c7ed3e
posa2wip
2016-09-26 21:56:12 -05:00
Seth Call
eb89ea0a43
better education interest screen
2016-09-23 08:24:42 -05:00
Seth Call
8760924e59
fix for jamtrack open twice bug
2016-09-13 04:36:18 -05:00
Seth Call
493ac18650
re-open jamtrack
2016-09-12 22:25:13 -05:00
Seth Call
57b1bebf44
VRFS-4306 - more improvements for second ed
2016-09-09 13:17:46 -05:00
Seth Call
e0f470fdcc
fix space issue
2016-09-09 10:04:55 -05:00
Seth Call
bbe6b50489
workaround for lack of rabl behavior
2016-09-09 09:56:13 -05:00
Seth Call
b781902f7d
many more school fixes
2016-09-09 09:53:38 -05:00
Seth Call
bca4356e43
many school fixes
2016-09-09 09:06:02 -05:00
Seth Call
2173a8821d
various fixes for emails for second ed program
2016-09-08 18:06:04 -05:00
Seth Call
222b9ea9c6
fix for montlies
2016-09-08 06:06:28 -05:00
Seth Call
fd4d21ae78
school education working
2016-09-08 05:59:58 -05:00
Seth Call
5353b75c2e
posa wip
2016-08-31 04:19:16 -05:00
Jonathan Kolyer
1037ad3841
VRFS-3936 merging remote develop branch
2016-08-14 22:57:48 +00:00
Seth Call
c5f7711850
VRFS-4189 - non free jamtrack support
2016-08-02 20:46:15 -05:00
Seth Call
d32cecaa03
fix typo
2016-07-19 07:30:41 -05:00
Seth Call
834d308647
stop having browsers say that they are a jamblaster, and also fix icheck assets
2016-07-18 20:58:43 -05:00
Seth Call
0aba92650c
remove is jamblaster check for now
2016-07-18 18:09:01 -05:00
Jonathan Kolyer
de7b3121e2
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2016-07-18 06:01:58 +00:00
Seth Call
88f796faed
activeadmin set to real build
2016-07-17 22:23:07 -05:00
Seth Call
cb35f75dcc
non-stupid assets
2016-07-17 21:56:29 -05:00
Seth Call
510d157262
* upgrade to Rails 4 as well as support JjamBlaster
2016-07-17 10:16:27 -05:00
Seth Call
61368ae20d
lessons.rake fix
2016-07-12 21:26:08 -05:00
Seth Call
23300f22a2
fix recurring lessons
2016-07-11 21:38:08 -05:00
Seth Call
7083cf7477
VRFS-4249 - fix for stripe error handling in charge method
2016-07-09 20:48:22 -05:00
Seth Call
611420e9c4
more completed elesson hover improvements
2016-07-09 13:51:44 -05:00
Seth Call
e2ae17755a
fix issue where complete lessons have messed up hover
2016-07-09 13:31:06 -05:00
Seth Call
cdd78f1b94
jamblaster bootstrap
2016-07-09 06:20:42 -05:00
Seth Call
10632c35c0
jamblaster bootstrapping
2016-07-09 06:06:54 -05:00
Seth Call
01736de147
recording API
2016-07-06 22:28:32 -05:00
Seth Call
9ad5a97733
return
2016-06-24 17:14:38 -05:00
Seth Call
116597cd67
Hello
2016-06-24 16:40:09 -05:00
Seth Call
48635fe669
Add JamBlasterKernel to allowed product types
2016-06-24 15:53:00 -05:00
Seth Call
526b11e0d1
fix for bug
2016-06-24 15:25:36 -05:00
Seth Call
0f9c02f5f1
initial cut at jamblaster managemente config
2016-06-24 13:42:54 -05:00
Seth Call
bd0dc40a4c
initial version of jamblaster management page
2016-06-24 09:15:04 -05:00
Jonathan Kolyer
8592894f7a
Merge branch 'develop' into VRFS-3936
2016-06-19 22:10:30 +00:00
Jonathan Kolyer
4f7c494ace
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2016-06-18 14:25:04 +00:00
Jonathan Kolyer
ce4dfa4261
VRFS-3936 recording api
2016-06-18 13:57:39 +00:00
Seth Call
e95c7fe8e5
Working on Jazz imports Stockton Helbing
2016-06-17 20:59:58 -05:00
Seth Call
17322eab1d
cohort reportin
2016-06-09 13:23:32 -05:00
Jonathan Kolyer
192948b8fe
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2016-06-08 21:24:45 +00:00
Seth Call
9db218d518
VRFS-4193 - pop open system browser for Stripe Connect when in app
2016-06-03 10:14:29 -05:00
Seth Call
c6b11e64ad
VRFS-4142 - works with logged in user
2016-06-03 09:45:11 -05:00
Seth Call
d2f478395e
VRFS-4142 - fix indentation issue
2016-06-03 08:46:42 -05:00
Seth Call
7d182e6153
VRFS-4142 - more fixes after more testing (test drive packages)
2016-06-03 08:41:14 -05:00
Seth Call
8b8aa08ac0
VRFS-4142 - a few fixes for test drive packages
2016-06-03 08:06:47 -05:00
Seth Call
88ebada41c
VRFS-4142 - test drive packaging feature
2016-06-02 23:32:09 -05:00
Seth Call
ece81a2c9b
yellow-ify link
2016-06-02 09:40:07 -05:00
Seth Call
d4aa3bef2b
bunch of jamclass fixes
2016-06-02 09:04:56 -05:00
Seth Call
1abacf0ec6
Merge branch 'develop' into feature/packages
2016-05-31 19:43:52 -05:00
Seth Call
920d648a2b
slew of jamclass fixes
2016-05-31 19:20:03 -05:00
Seth Call
e449139b63
alpha the list of FTUE instruments VRFS-4172
2016-05-31 11:54:20 -05:00
Seth Call
8793c77033
ftue fixes VRFS-4171, VRFS-4172
2016-05-31 11:13:49 -05:00
Seth Call
e8843bfd64
ready for release JamClass
2016-05-31 08:35:04 -05:00
Seth Call
55a53325dd
slew of fixes for recurring sessions, canceling sessions, and minor UI issues
2016-05-30 16:43:55 -05:00
Seth Call
197313dfc9
VRFS-4158, VRFS-4159 - audio/notation attachments work better
2016-05-30 00:32:55 -05:00
Seth Call
c6a5321601
VRFS-4160 - add checkbox styling and pop external in recording selector dialog
2016-05-29 22:50:57 -05:00
Seth Call
ad28d8d55d
VRFS-4157 - don't wipe out sessions when considering scheduling
2016-05-29 22:30:33 -05:00
Seth Call
01a096d6c3
VRFS-4151 - checkboxes fixed on search screen
2016-05-29 20:17:18 -05:00
Seth Call
d30b5326bc
get dark image up
2016-05-29 19:31:19 -05:00
Seth Call
f20d011e40
wip
2016-05-29 19:30:51 -05:00
Seth Call
3252d2cbd2
screenshots add to student anding page
2016-05-29 14:37:54 -05:00
Seth Call
4c199661bf
VRFS-4128 - refactoring of UserMailer done, but more testing needed
2016-05-29 11:17:26 -05:00
Seth Call
ae9249532b
ACH payment consideration in teacher payments
2016-05-28 18:48:40 -05:00
Seth Call
5d68fe322a
VRFS-4126 - update teacher rating/student ratig post session dialog
2016-05-27 21:33:26 -05:00
Seth Call
9d160bfd7c
VRFS-4125 - icheckbox ify teacher profile page
2016-05-27 16:23:58 -05:00
Seth Call
b4bf6319fd
VRFS-4145 - remove extra dollar sign
2016-05-27 13:35:33 -05:00
Seth Call
0a9078f94e
fix display of missed in jam class screen
2016-05-26 20:32:58 -05:00
Seth Call
ea049068e0
lesson fixes
2016-05-26 18:10:05 -05:00
Seth Call
cc3576f70f
attach notations, audio, and recordings done
2016-05-26 16:25:51 -05:00
Seth Call
5939079a89
fix bug with connection manager disconnect
2016-05-25 15:26:45 -05:00
Seth Call
9212804eae
VRFS-4118 - pulse side box
2016-05-24 21:05:31 -05:00
Seth Call
782f329947
VRFS-4130 - update welcome email
2016-05-24 18:03:26 -05:00
Seth Call
bc63407bb7
VRFS-4127 - clean up msuh after disconnect
2016-05-24 17:31:14 -05:00
Seth Call
6ab4775f96
let join now link stay for duration of lesson
2016-05-24 15:19:11 -05:00
Seth Call
61314002b2
fix cancel of lessons
2016-05-24 15:17:42 -05:00
Seth Call
0528f09e27
VRFS-4123 put disconnected msg above broadcast
2016-05-24 14:25:50 -05:00
Seth Call
af897048ad
lesson actions fix
2016-05-24 13:02:14 -05:00
Seth Call
0ff71ff551
VRFS-4117 - fixed up special case no show emails and post-testdrive emails
2016-05-24 11:45:04 -05:00
Seth Call
1528de57a4
clean up no bill email
2016-05-24 10:45:15 -05:00
Seth Call
4545b9b273
VRFS-4124 - use user-auth, not stripe_account_id
2016-05-24 10:14:53 -05:00
Seth Call
d71ecdecc2
dump analysis
2016-05-23 16:45:35 -05:00
Seth Call
021dc47d89
VRFS-4113 - lesson analysis error dealt with
2016-05-23 15:55:28 -05:00
Seth Call
2dafc8288a
VRFS-4115 - update text of student dialog
2016-05-23 14:54:19 -05:00
Seth Call
1944832c96
VRFS-4112 login redirect on client/ signin
2016-05-23 14:49:24 -05:00
Seth Call
f8c88dc225
VRFS-4111 lesson coming up soon has time data
2016-05-23 13:51:58 -05:00
Seth Call
8ad0e3ca14
VRFS-4109 - remove teach
2016-05-23 13:24:20 -05:00
Seth Call
fd85736a32
VRFS-4110 - Shouldn't offer TestDrive lesson to student who already took one from this teacher
2016-05-23 13:22:26 -05:00
Seth Call
e2073b49b9
user origin tracking VRFS-4072
2016-05-23 12:26:32 -05:00
Seth Call
a3c4b12b50
VRFS-4107 - fake break removed
2016-05-22 12:08:04 -05:00
Seth Call
2c6e3cac92
VRFS-4107 - more tweaks to jamclass student page
2016-05-22 08:29:59 -05:00
Seth Call
f9cecdd0f0
VRFS-4108 fix links on www for jamclass
2016-05-21 15:34:48 -05:00
Seth Call
2ba3655191
VRFS-4108 - student landing page updates
2016-05-21 15:18:34 -05:00
Seth Call
3deaa205d5
dont allow accepting slots in the past
2016-05-20 22:13:39 -05:00
Seth Call
f9aec0526d
Fix bug where 2nd test drive wouldn't work
2016-05-20 15:33:44 -05:00
Seth Call
7a4be8292f
fix more issues with recent changes
2016-05-20 14:31:05 -05:00
Seth Call
7737f0977e
VRFS-4091 VRFS-4089 VRFS-4088 - test drive payment screen is correct now, student can always join session
2016-05-20 10:31:43 -05:00
Seth Call
6652808f86
VRFS-4087 implement cancel button on booking screen
2016-05-19 21:49:54 -05:00
Seth Call
87eb29da11
VRFS-4086 decline to cancel
2016-05-19 21:42:27 -05:00
Seth Call
cdadc8bff4
VRFS-4083 - switched sender name in email
2016-05-19 14:45:26 -05:00
Seth Call
a8e367041e
VRFS-4082 - weird flow issue fixed when confirming a lesson
2016-05-19 14:12:43 -05:00
Seth Call
a4f7e28acc
* get lesson booking screen cleaned up (better states at end)
2016-05-19 13:26:37 -05:00
Seth Call
397be9ab14
VRFS-4066 VRFS-4044 bugs fixed
2016-05-18 23:03:22 -05:00
Seth Call
94397136d3
search options url fix for VRFS-4062
2016-05-18 20:49:57 -05:00
Seth Call
e458d65a12
VRFS-4062 - search teacher button goes to correct search page
2016-05-18 20:49:33 -05:00
Seth Call
b8ba4eb7f9
more refinement for timer on jamclass screen
2016-05-18 20:43:07 -05:00
Seth Call
a9e346ffb3
VRFS-4061 - Implement more obvious way to join a lesson when it's time to join
2016-05-18 15:18:38 -05:00
Seth Call
5214f36fc9
VRFS-4060 - timezone finagling
2016-05-17 22:11:20 -05:00
Seth Call
9725667e2a
VRFS-4058 - update search ordering for teachers
2016-05-17 21:35:09 -05:00
Seth Call
f9429f8712
VRFS-4094 - clip avatar name if too long
2016-05-17 21:05:47 -05:00
Seth Call
0690e30a32
add a little border to phone call-to-action
2016-05-17 20:59:14 -05:00
Seth Call
fb0c96e6b4
VRFS-4052 - more connectstripe form defaults
2016-05-17 20:52:25 -05:00
Seth Call
0c0e22df8c
VRFS-4041 - side bubble for teacher help reach out
2016-05-17 20:29:56 -05:00
Seth Call
22bd49b16b
* fix for URI rewrite
2016-05-17 13:34:14 -05:00
Seth Call
141736ad2f
* add rating dialogs for teacher/students and have them pop at end of lesson, be accessible from teacher rating profile pgae, and also from link in email
2016-05-17 13:31:53 -05:00
Seth Call
92b2e13ee8
jamclass enabled
2016-05-16 11:39:20 -05:00
Jonathan Kolyer
481bc36133
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2016-05-15 04:35:53 +00:00
Jonathan Kolyer
fc84d5454c
error handling for JamTrackImporter
2016-05-15 04:35:12 +00:00
Seth Call
5d82f555c5
Fix query
2016-05-12 20:13:25 -05:00
Seth Call
166647d112
VRFS-4074 - cloud uri/storage for jamblaster
2016-05-12 18:54:00 -05:00
Seth Call
94128e7115
* relax user id on charges
2016-05-12 17:41:25 -05:00
Seth Call
cfb8e27850
VRFS-3967 - backend teacher/school code working. needs test and some more edge cases
2016-05-12 16:29:27 -05:00
Seth Call
309ebb4e5a
VRFS-3965 - manage payment features for students
2016-05-11 16:03:55 -05:00
Seth Call
15d968dff5
VRFS-3964 - manage payment features for teacher
2016-05-10 21:10:24 -05:00
Seth Call
fe16d513be
session controller
2016-05-10 12:59:01 -05:00
Seth Call
ef153ad4b7
make a school if user shows school interest
2016-05-09 21:32:34 -05:00
Seth Call
4f35d5ce0f
VRFS-3896 - update email for store owners
2016-05-09 20:13:06 -05:00
Seth Call
0d564b1b83
take up full width
2016-05-09 16:57:36 -05:00
Seth Call
6f9d39ef16
VRFS-4050 - countdown timer
2016-05-09 16:47:55 -05:00
Seth Call
30aec92512
VRFS-4070 - fix cha by fix PostPrecossorMixin
2016-05-07 21:17:19 -05:00
Seth Call
5ce780f03b
Fix easydropdown oopsies
2016-05-07 13:45:02 -05:00
Seth Call
abf34bcd5d
VRFS-4049 jamclass menu UI cleaned up
2016-05-05 07:59:18 -05:00
Seth Call
e46a4b01cd
3 versions of test drive available now
2016-05-04 21:20:38 -05:00
Seth Call
0d8341c2d8
* bring back bubbles
2016-05-01 20:35:51 -05:00
Seth Call
2c51334966
teacher profile improvements
2016-04-30 22:12:45 -05:00
Seth Call
2e7e4dccf9
teacher profile improvements
2016-04-30 22:12:25 -05:00
Seth Call
4abc2f81ff
Remove influxdb dependency from other projects
2016-04-27 05:46:35 -05:00
Seth Call
dd84a3ebf7
remove influxdb as dependency to ruby project
2016-04-26 22:22:49 -05:00
Seth Call
5c246dc182
Update background image for JamClass VRFS-4018
2016-04-26 12:36:06 -05:00
Seth Call
b0ac61fbea
VRFS-4037 - no title wrap
2016-04-26 10:06:02 -05:00
Seth Call
5479e27216
VRFS-4037 - fix mailing problemg
2016-04-26 10:01:53 -05:00
Seth Call
e27a3130c1
Fix positioning of school kudos
2016-04-26 06:58:14 -05:00
Seth Call
fea26d82f5
VRFS-4037 - create a interested in school landing page
2016-04-25 22:01:15 -05:00
Seth Call
2835941834
* fix global chat
2016-04-25 11:00:59 -05:00
Seth Call
f8c62631f6
Fix bad dialog when you have test drive already
2016-04-25 10:15:23 -05:00
Seth Call
c7ca2ca974
Remove guard
2016-04-25 09:27:49 -05:00
Seth Call
6bcfe3ada3
Remove guard dependency
2016-04-25 09:01:19 -05:00
Seth Call
56cfe11e19
Removing some text from teacher landing page
2016-04-25 08:14:54 -05:00
Seth Call
872bcd2582
Better tests
2016-04-25 08:09:00 -05:00
Seth Call
a14b58f2fe
Home screen and session create screen re-worked
2016-04-22 15:00:08 -05:00
Seth Call
b13ffe2d32
Refresh user after booking
2016-04-21 15:29:40 -05:00
Seth Call
71df46a6ca
Fix bad test drive count on booking page and add nav
2016-04-21 10:51:04 -05:00
Seth Call
a4a869535e
* force pg_migrate version-
2016-04-21 09:51:28 -05:00
Seth Call
5701e888a8
Updating lessons with barely working version
2016-04-21 09:23:29 -05:00
Seth Call
3a6e7f2072
pg_migrate bump to fix RAISE EXCEPTION syntax command
2016-04-19 22:34:23 -05:00
Seth Call
d46e8ed874
* fix teacher signup page
2016-04-13 17:14:05 -05:00
Seth Call
e07bc21d2a
* cause dependency added
2016-04-13 12:38:32 -05:00
Seth Call
fc465a1b68
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2016-04-13 12:07:37 -05:00
Seth Call
10c3571cd8
* make network test optional, add help for no audio
2016-04-13 12:05:04 -05:00
Jonathan Kolyer
f8ee7b693d
VRFS-3855 use :head param to emulate head request through get
2016-04-10 21:22:52 +00:00
Seth Call
90c167fb91
* disable influx
2016-04-06 13:35:38 -05:00
Seth Call
9e4105a391
* VRFS-4004 and VRFS-4005 - student/teacher welcome emails
2016-04-06 13:01:40 -05:00
Seth Call
adf0274b73
* fixes for some tests, and also some broken functionality in the school maangement page
2016-04-06 07:06:52 -05:00
Seth Call
399d010310
* lessons 90% done, but still mostly hidden
2016-04-05 21:23:15 -05:00
Seth Call
557bdc42db
* more debug
2016-04-04 09:44:07 -05:00
Seth Call
7bdf9ddd5e
* dont hide output
2016-04-04 09:41:04 -05:00
Seth Call
40df9eed6f
* better error reporting for bad connections on join session
2016-03-29 05:50:14 -05:00
Seth Call
a6c054635d
* remove crazy debugging from base manager
2016-03-28 20:13:17 -05:00
Seth Call
c9c384cbf0
* no filters
2016-03-28 10:43:25 -05:00
Seth Call
7f2db12071
* error logging better
2016-03-25 13:49:53 -05:00
Seth Call
12d8310dc6
* update teacher dump admin page and add new URL
2016-03-25 12:08:23 -05:00
Seth Call
a82181b63d
* mored ebugs
2016-03-25 09:09:03 -05:00
Seth Call
c4f691b6d0
* teacher admin tweaks
2016-03-22 11:14:32 -05:00
Seth Call
378af99e14
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2016-03-21 21:42:24 -05:00
Seth Call
584b4b347f
* sorting corrected on teachers list
2016-03-21 16:52:44 -05:00
Seth Call
2e3f47e9b2
* student page
2016-03-21 16:37:13 -05:00
Seth Call
5c14d283ab
* teacher profile pgae
2016-03-21 15:39:15 -05:00
Jonathan Kolyer
bf59f4ac62
jtx ios batch purchase loading
2016-03-17 12:30:44 +00:00
Jonathan Kolyer
97f0d58f2e
batch purchase loading
2016-03-16 23:14:43 +00:00
Jonathan Kolyer
3d9bc9f541
jamtracks ios performance
2016-03-16 21:11:10 +00:00
Seth Call
b3e2943599
* fix minor drumma boy import issues
2016-03-16 10:10:23 -05:00
Seth Call
22ca511681
* add a bunch of traces for debugging VRFS-3986
2016-03-14 13:42:14 -05:00
Seth Call
dbf4ae777b
* support for drumma boy storage jamtracks
2016-03-13 16:46:09 -05:00
Seth Call
df4c0fba26
* sessionId fix
2016-03-11 08:00:17 -06:00
Seth Call
72e3ed165b
* move to session screen
2016-03-10 23:03:41 -06:00
Seth Call
19223e96e6
* fix login problem
2016-03-10 21:56:42 -06:00
Seth Call
2cc7a3646b
* pin reflux
2016-03-10 16:09:46 -06:00
Seth Call
bc80fd1325
fix minor issue
2016-03-10 14:58:26 -06:00
Seth Call
349e9027a3
* try different way of referencing broadcast actions
2016-03-10 14:57:14 -06:00
Seth Call
2ad2531f6b
* a little debugging info
2016-03-10 13:10:13 -06:00
Seth Call
98d29965a0
* pass back in username and also leave/join
2016-03-10 08:10:43 -06:00
Seth Call
d61f5f28da
* add diagnostic info messaging
2016-03-04 10:44:39 -06:00
Seth Call
0a3d1016a1
* VRFS-3973 - websocket gateway to allow jamblasters to connect with no connection info
2016-03-04 09:06:13 -06:00
Seth Call
8c805f0378
* VRFS-3973 - event into backend on session join/leave events
2016-03-03 16:08:01 -06:00
Seth Call
f6652fa180
* dont use email blacklist ban
2016-03-01 14:24:31 -06:00
Seth Call
54cbfc69f0
* blacklist email feature
2016-03-01 13:49:58 -06:00
Seth Call
1d532cc305
* fix heartbeat disconnect
2016-03-01 09:27:33 -06:00
Seth Call
51977c7cc3
* VRFS-3968 - remove puts
2016-02-29 11:36:34 -06:00
Seth Call
681b27a4b4
* VRFS-3968 - refine responses for jamblaster pairing API
2016-02-29 11:35:18 -06:00
Jonathan Kolyer
4c3c23606a
VRFS-3957 fixed cryptic sql query bug in UserBlacklist#banned
2016-02-26 18:37:54 +00:00
Seth Call
78c00604f3
* jamblaster user API VRFS-3918
2016-02-26 09:04:00 -06:00
Seth Call
39a240551a
* more font sizin
2016-02-24 21:27:56 -06:00
Seth Call
0cc2aca908
* bump up sizes
2016-02-24 06:56:58 -06:00
Seth Call
18a92e4cc1
* iphone/mobile optimzation of landing pagse
2016-02-23 15:48:55 -06:00
Seth Call
8942ed4ccf
* itunes links
2016-02-23 05:55:15 -06:00
Seth Call
0cd19e6725
* update jmep logic
2016-02-22 20:05:44 -06:00
Seth Call
0cebcb1e29
* dry run working with all timtracks
2016-02-21 13:59:35 -06:00
Seth Call
04234eef27
* improvements for bpm + silence detection
2016-02-21 12:49:16 -06:00
Seth Call
865e8201e0
* source added to jam-admin
2016-02-19 05:28:36 -06:00
Seth Call
f225a85484
* remove puts
2016-02-18 11:47:08 -06:00
Seth Call
9cc2ee4f4f
* VRFS-3912 - more jamblaster tweaking
2016-02-18 11:22:50 -06:00
Seth Call
7f6b41d8b1
* jamblaster apis VRFS-3912
2016-02-18 06:12:28 -06:00
Jonathan Kolyer
95c534623e
VRFS-3928 fixed bug on JamTrack.latestPurchase, handling null case
2016-02-12 11:13:42 +00:00
Jonathan Kolyer
04a7a9dea4
VRFS-3800 use constants for static strings
2016-02-09 15:17:52 +00:00
Seth Call
534b4f0e6c
* duh. backwards logic
2016-02-09 15:17:52 +00:00
Seth Call
0aecf7345f
* code review time\!
2016-02-09 15:17:52 +00:00
Jonathan Kolyer
b8a190c889
VRFS-3800 removed comment
2016-02-09 15:17:52 +00:00
Jonathan Kolyer
7e32ffcdf8
VRFS-3800 save ios receipt json
2016-02-09 15:17:52 +00:00
Jonathan Kolyer
fab38451cd
VRFS-3800 go-right receipt validation
2016-02-09 15:17:52 +00:00
Jonathan Kolyer
8c6d553823
VRFS-3800 ios receipt validation
2016-02-09 15:17:52 +00:00
Seth Call
e446c3ff44
* mark user as teacher better
2016-02-10 21:09:45 -06:00
Seth Call
1652aa4bd3
* VRFS-3922 - update ip blacklist/whitelist behavior to offer more admin flexibilyt
2016-02-09 12:58:54 -06:00
Seth Call
1da6749d70
* allow BACK button to work even if invalid state VRFS-3924
2016-02-09 10:14:37 -06:00
Seth Call
d7ddff9bb7
* fix validation
2016-02-08 20:47:01 -06:00
Seth Call
01aae26e80
* chat help
2016-02-08 16:48:12 -06:00
Seth Call
d62526d087
* update teacher landing page to work at all
2016-02-08 16:42:08 -06:00
Seth Call
dfa423a1a3
* check jamblaster serial no better
2016-02-08 12:33:39 -06:00
Seth Call
1467b2b0e7
* disconnect working again VRFS-3454
2016-02-08 11:45:11 -06:00
Seth Call
eb8e330073
* limit total msgs
2016-02-08 11:31:33 -06:00
Seth Call
0f8e607390
* fix check for if is websocket gateway
2016-02-08 07:42:48 -06:00
Seth Call
2e81bafb01
* try out chat blast with no inactivity. fix 5 instrument validation pain
2016-02-08 06:56:54 -06:00
Seth Call
853d359a7e
* VRFS-3919 - teacher testdrive settings in on pricing profile
2016-02-06 17:32:20 -06:00
Seth Call
7fc4376236
* VRFS-3914 - update jamblaster serial no if present
2016-02-03 11:18:47 -06:00
Seth Call
ce6377377b
* serial no set to nil if blank
2016-02-03 10:57:11 -06:00
Seth Call
599d26f883
* VRFS-3912 - apis for jamblaster pairing
2016-02-03 10:56:14 -06:00
Seth Call
48be48caf5
* ban downloaders on second download
2016-02-02 05:44:18 -06:00
Seth Call
8f36304c26
* chat mesages by scope in admin
2016-02-01 15:44:31 -06:00
Seth Call
c8179ccbcc
Merge branch 'feature/global_chat' into develop
2016-02-01 14:16:46 -06:00
Seth Call
2e95682b10
* wip
2016-02-01 14:14:06 -06:00
Seth Call
8900af5196
* wip
2016-01-31 08:01:33 -06:00
Seth Call
5bd36e3731
* fix feed
2016-01-30 16:09:17 -06:00
Seth Call
0f4be88677
* wip
2016-01-30 16:08:54 -06:00
Seth Call
9e9c2819dd
* update how click track is determined for jamtracks
2016-01-29 17:37:28 -06:00
Seth Call
13b58dbaa4
* issue rollback to heal connection
2016-01-29 16:00:00 -06:00
Seth Call
a49729041d
* fix syntax error in admin
2016-01-28 14:26:40 -06:00
Seth Call
641a553dcc
merged teacher search
2016-01-28 13:55:17 -06:00
Seth Call
50e2090f25
* slowley beefing up chat
2016-01-28 13:34:59 -06:00
Seth Call
e451c4be3d
* ios purchase finalization
2016-01-28 11:31:57 -06:00
Seth Call
a9d92b2250
* don't count unstarted sessions
2016-01-28 08:08:21 -06:00
Seth Call
3243abf837
* started at now set on jamtrack sessions
2016-01-28 06:28:56 -06:00
Seth Call
a7dfe55d3c
* custom error when opening free JamTrack when email not verified
2016-01-25 20:25:30 -06:00
Seth Call
8638cdda92
* VRFS-2035 allow static port config in UI
2016-01-25 10:29:27 -06:00
Seth Call
8138f11701
* JamClass teacher landing page VRFS-3872
2016-01-21 11:49:40 -06:00
Seth Call
5a0259aa54
* VRFS-3865 - initial version of jam class student landing page
2016-01-21 06:14:13 -06:00
Seth Call
d93f64c2e5
* fix easy dropdown silliness
2016-01-20 05:37:13 -06:00
Seth Call
4d8b8a38b6
* VRF-3880 many teacher profile fixes
2016-01-19 21:54:55 -06:00
Seth Call
86ea959972
* fix padding issue
2016-01-18 18:41:53 -06:00
Seth Call
491bc8cda5
* fix null mark by specifying client = true
2016-01-16 20:54:22 -06:00
Seth Call
2283317719
* count in fix
2016-01-16 20:49:22 -06:00
Seth Call
1154a83dae
* dump and correction of download tracker
2016-01-16 20:37:44 -06:00
Seth Call
ba6a7af851
* VRFS-3873 browser fingerprinting being tracked
2016-01-16 19:56:29 -06:00
Seth Call
01405618ae
* more styling of profile
2016-01-16 12:44:04 -06:00
Seth Call
7adfb3a6b9
* part way through size testing of profile
2016-01-16 12:12:15 -06:00
Seth Call
4e63b2e1d8
* more button alignment
2016-01-15 20:49:13 -06:00
Seth Call
ca246fc95e
* music profile styling tweaks
2016-01-15 20:44:37 -06:00
Seth Call
35839c1b4d
* fix alignment/scroll issues on samples page
2016-01-15 20:18:58 -06:00
Seth Call
e14484164f
* fix hugely empty dialog
2016-01-15 14:55:49 -06:00
Seth Call
5e7ba5bd8a
* fix tile bug and validate bug
2016-01-15 14:51:22 -06:00
Seth Call
e40442af15
* hide bogus profiles on profile page
2016-01-15 13:21:51 -06:00
Seth Call
c2f4cd0c56
* correct search on filter
2016-01-15 12:39:43 -06:00
Seth Call
33b02c0f55
* add jamtrack linkability for artist
2016-01-15 12:35:04 -06:00
Seth Call
d7e949885d
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2016-01-15 12:04:21 -06:00
Seth Call
37417708b3
* merged
2016-01-15 12:04:06 -06:00
Seth Call
0d49744a7a
* teacher profile musician profile QA'ed some
2016-01-15 11:59:55 -06:00
Seth Call
88afc1c272
* reviews working
2016-01-14 15:33:23 -06:00
Seth Call
1869ee021d
* reviews displaying
2016-01-14 15:23:11 -06:00
Seth Call
cb422a498f
* fix weird alignment issue with search button
2016-01-14 20:14:13 +00:00
Seth Call
b9dd872be0
* fix issue where search bar doesn't show for users with over 20 jamtracks
2016-01-14 12:54:59 -06:00
Seth Call
7fe1824085
* fix review API
2016-01-14 12:45:55 -06:00
Seth Call
e3b6c7b894
* crash dump reporting with date
2016-01-14 07:27:08 -06:00
Seth Call
9dfb04613d
* fix scroll issues with front page
2016-01-14 06:52:18 -06:00
Seth Call
e22218b163
* olark added VRFS-3853
2016-01-14 04:49:02 -06:00
Seth Call
5773ba6e57
* autofollow behavior
2016-01-13 08:04:02 -06:00
Seth Call
40c260b2ba
* make other participnat show
2016-01-13 07:44:33 -06:00
Seth Call
31e8d6a26c
* reviews
2016-01-13 07:15:58 -06:00
Seth Call
48a54b812c
* merged ratings
2016-01-12 21:06:23 -06:00
Seth Call
69c05a3e0a
* reviews updated
2016-01-12 21:01:39 -06:00
Seth Call
14643531dc
* working minus ratings
2016-01-12 20:37:00 -06:00
Seth Call
1764a3e306
fix signin link text
2016-01-09 03:37:20 +00:00
Seth Call
d136401529
* update nav to scroll
2016-01-08 21:26:12 -06:00
Seth Call
48bd7ae2da
* wip
2016-01-08 20:59:18 -06:00
Seth Call
57550d292e
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2016-01-08 17:32:25 -06:00
Seth Call
fcf4a0b566
* fix some more ui issues on home page
2016-01-08 17:32:19 -06:00
Seth Call
7a7d7c0829
* wip
2016-01-08 17:29:58 -06:00
Seth Call
77abf33332
fix url to jamtracks
2016-01-08 23:27:04 +00:00
Seth Call
40de0ef04f
* precompile modern
2016-01-08 16:46:50 -06:00
Seth Call
c05c706455
* support news
2016-01-08 16:13:59 -06:00
Seth Call
96ffaedb1a
* homepage
2016-01-08 15:40:10 -06:00
Seth Call
fc38c9ec50
* VRFS-3822 - allow follow me behavior and client nodes to get in
2016-01-07 06:52:27 -06:00
Seth Call
6344e14f7d
* wip
2016-01-07 05:12:11 -06:00
Seth Call
4beac54df5
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2016-01-04 20:44:47 -06:00
Seth Call
427bcd6e56
* treat risky users differently
2016-01-04 20:44:14 -06:00
Seth Call
521eac693d
* wip
2016-01-04 20:02:20 -06:00
Seth Call
a5016efec5
Correct Gemfile for websocket-gateway
2016-01-05 01:58:45 +00:00
Seth Call
1fd2679cbf
daily_job.rb edited online with Bitbucket - save singleton state
2016-01-05 00:32:24 +00:00
Seth Call
3a95b22762
* add specific configs for sendgrid
2016-01-04 17:37:41 -06:00
Seth Call
0b8a792af7
* wip
2016-01-04 17:25:29 -06:00
Seth Call
20e5650baa
* add ruby gemfile deps to admni
2016-01-04 16:15:07 -06:00
Seth Call
a2b8f3062a
* bounce check added as daily job
2016-01-04 15:19:23 -06:00
Seth Call
c5b8465012
* crash dum
2016-01-04 14:44:45 -06:00
Seth Call
4d41e2278d
* screen emails
2016-01-04 13:42:11 -06:00
Seth Call
854d7caab9
* jamtrack session stats VRFS-3835
2016-01-04 12:01:55 -06:00
Seth Call
922cfc4540
* finish out crash notification
2016-01-04 11:28:10 -06:00
Seth Call
7ca4de12d7
* email alert
2016-01-03 22:13:01 -06:00
Seth Call
4ef76abcf9
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2016-01-03 21:39:00 -06:00
Seth Call
70f22f8601
* track em
2016-01-03 21:38:30 -06:00
Seth Call
e2b98284ae
* remove owner to postgres statements in .sql manifest
2016-01-03 20:24:10 -06:00
Jonathan Kolyer
adecb8fc20
VRFS-3784 refactored free credit decrementing from sale into user for ios
2016-01-03 17:38:30 +00:00
Seth Call
718668b5d2
* alert on USB 1.1 being too old
2015-12-30 14:23:24 -06:00
Jonathan Kolyer
8d28efde62
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2015-12-30 18:07:31 +00:00
Jonathan Kolyer
e76ab54738
VRFS-3784 added user.id to login json response
2015-12-30 18:07:03 +00:00
Seth Call
00f69ecc01
fix user sync check
2015-12-29 14:28:04 -06:00
Seth Call
b20f79af3f
* fix sync bug
2015-12-29 11:37:06 -06:00
Seth Call
18be9f69a1
* width of p important
2015-12-29 11:02:43 -06:00
Seth Call
712f1c90f3
* update arrow
2015-12-29 11:02:10 -06:00
Seth Call
e558554324
* wip
2015-12-29 10:59:37 -06:00
Seth Call
afa4ff3182
JamBlaster product page finalization
2015-12-28 22:23:16 -06:00
Seth Call
0416ad01f1
* hover over vst instead of click, and fix placement of midi help link
2015-12-28 12:43:50 -06:00
Seth Call
0fcdb708fc
* working on basic
2015-12-28 10:43:14 -06:00
Seth Call
fb24f3beae
merged from master
2015-12-28 07:19:40 -06:00
Seth Call
d62655cbd2
* update resync audio
2015-12-28 05:32:54 -06:00
Seth Call
565544f357
* VRFS-3814 - update jamblaster product page for post-KS
2015-12-28 04:57:15 -06:00
Seth Call
f7ec3df32d
* bring back scan help, and pass in vst type ID based on win vs mac
2015-12-27 10:11:22 -06:00
Seth Call
190b43bd60
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2015-12-27 10:04:09 -06:00
Seth Call
89b48619a6
* working on new jamblaster landing page
2015-12-27 10:03:56 -06:00
Jonathan Kolyer
5411a3bbf9
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2015-12-26 02:49:30 +00:00
Jonathan Kolyer
ce1e735750
VRFS-3784 use ILIKE for search on original_artist
2015-12-26 02:47:39 +00:00
Seth Call
4208391c44
* reload if trying to load while loading due to howler bug
2015-12-24 21:28:04 -06:00
Seth Call
2ad519fc90
* fix bug with one track and count-in
2015-12-24 21:23:52 -06:00
Seth Call
a23703fb09
* remove extra print
2015-12-23 12:37:10 -06:00
Seth Call
def24616f3
* VRFS-3816 - tell user VST enable is coming in session
2015-12-23 12:35:57 -06:00
Seth Call
5ee54adc7c
* VRFS-3815 - select instrument before device requirement fixed for midi
2015-12-23 11:36:05 -06:00
Seth Call
a1774320ce
* fix show of midi track
2015-12-23 11:31:10 -06:00
Seth Call
133cc2806a
* fix update track while in session
2015-12-23 09:51:43 -06:00
Seth Call
0305369944
* midi working for the most part
2015-12-22 21:28:19 -06:00
Seth Call
1908d82012
* always show help
2015-12-22 09:34:40 -06:00
Seth Call
8d69a804e8
* fix up initial scan info
2015-12-22 09:32:22 -06:00
Seth Call
39d72e83bb
* no scan done unless user asks. scan paths
2015-12-21 16:42:18 -06:00
Seth Call
76920f97c0
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2015-12-19 21:22:10 -06:00
Seth Call
7a8775cbf6
* allow null parts on instrument assignment
2015-12-19 21:21:59 -06:00
Jonathan Kolyer
474f147892
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2015-12-19 05:35:43 +00:00
Seth Call
15e1e757dd
* skip paris songs without metadata
2015-12-18 18:11:22 -06:00
Seth Call
3aadfaaedb
* strip out whitespace from csv
2015-12-18 15:57:27 -06:00
Seth Call
b48ea1cc59
* more fixing logic for paris tracks
2015-12-18 15:32:40 -06:00
Seth Call
ff6f133620
* import fixes for Paris
2015-12-18 11:35:56 -06:00
Jonathan Kolyer
d6500449da
VRFS-3784 added layout for jamtracks app viewing of corp pages
2015-12-17 20:32:37 +00:00
Seth Call
8c7c345859
* fix importer
2015-12-15 11:26:58 -06:00
Seth Call
fc84b2657a
* update bandwidth notice
2015-12-14 15:21:14 -06:00
Seth Call
09483f219a
* paris music importing locally, stats refinement
2015-12-14 15:05:23 -06:00
Seth Call
11a8ee55f0
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2015-12-11 21:24:58 -06:00
Seth Call
3707a3abd6
* stats working decently
2015-12-11 21:14:00 -06:00
Jonathan Kolyer
48f85fecfa
VRFS-3728 comment
2015-12-11 20:02:09 +00:00
Jonathan Kolyer
153ed88a79
VRFS-3728 head call for ios app; mixdown checksum; simulate purchase
2015-12-11 20:02:09 +00:00
Seth Call
37929de36e
* fix bad coffeescript syntax
2015-12-11 07:02:37 -06:00
Seth Call
03d71b0678
* disable midi via config
2015-12-11 06:45:30 -06:00
Seth Call
f69aadbe20
* get rid of print
2015-12-10 22:20:28 -06:00
Seth Call
f82f64f2db
Merge branch 'feature/stats' into develop
2015-12-10 22:09:44 -06:00
Seth Call
8e73c5bb80
* stats and vst together
2015-12-10 22:07:56 -06:00
Seth Call
b07aedc9cc
* merged
2015-12-10 20:54:09 -06:00
Seth Call
0376b206cf
* stats workip
2015-12-10 20:52:13 -06:00
Seth Call
6a7e321142
* commit in knock files
2015-12-10 14:03:06 -06:00
Seth Call
3388ec14db
* stats wip
2015-12-10 05:21:59 -06:00
Seth Call
69363e6fd6
* revert back how free jamtracks are made
2015-12-09 12:02:22 -06:00
Seth Call
6314748225
* wip
2015-12-09 11:32:24 -06:00
Seth Call
a5e9ca18b5
* set initial tap-in silence to 0
2015-12-08 21:02:33 -06:00
Seth Call
3bc0b18968
* fix misnamed active music sessions var
2015-12-08 13:37:35 -06:00
Seth Call
1d3548cdf9
* fix misnamed active music sessions var
2015-12-08 13:37:18 -06:00
Seth Call
34dcc27641
Merge branch 'develop' into feature/vst
2015-12-07 21:05:10 -06:00
Seth Call
9afc3155ef
* remove log
2015-12-07 21:05:05 -06:00
Seth Call
886df5d092
* master mix controls for creator or delegated
2015-12-07 20:25:43 -06:00
Seth Call
6d5db83aea
* midi not working still
2015-12-04 15:29:59 -06:00
Seth Call
dd8e375766
* scan weirdness
2015-12-04 12:08:40 -06:00
Seth Call
d9f1becb9b
* merge
2015-12-04 11:37:59 -06:00
Seth Call
949ce8a513
* VRFS-3756 - webcam audio
2015-12-04 11:16:40 -06:00
Seth Call
223988f421
* better align
2015-12-04 09:39:33 -06:00
Seth Call
8e72a9833a
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2015-12-04 09:29:04 -06:00
Seth Call
3adeef4dee
* csv/pdf links in place in the UI
2015-12-04 09:27:28 -06:00
Seth Call
5049e3f813
* generate CSV and PDF for jamtracks
2015-12-04 08:32:18 -06:00
Jonathan Kolyer
bcca86da8f
VRFS-3728 merge
2015-12-04 05:29:04 +00:00
Jonathan Kolyer
53f7f29c06
VRFS-3728 ios client sync api tweaks
2015-12-04 05:26:26 +00:00
Seth Call
54a437d6e1
* VRFS-3725 - frontend support for click tracks and tap-in creation
2015-12-03 14:21:07 -06:00
Seth Call
ebdde28f85
* add more info to ip blacklist dump
2015-12-02 16:58:56 -06:00
Seth Call
4cb737761a
* add download trakcer page
2015-12-02 16:53:09 -06:00
Seth Call
c1402e2777
* VRFS-3757 - Fix jamtrack search bugs
2015-12-02 15:01:18 -06:00
Seth Call
819e87079e
* click track import working
2015-11-30 21:21:27 -06:00
Seth Call
e3b4b2324b
* clicktrack support
2015-11-30 17:54:17 -06:00
Seth Call
b7cbb86e3b
* tweak gift card landing
2015-11-30 11:03:32 -06:00
Seth Call
32d32b3393
* click track import working
2015-11-30 08:03:38 -06:00
Seth Call
d6d3ef4299
* fix formatting
2015-11-30 05:28:10 -06:00
Seth Call
7f0fd988ce
* add gift card image
2015-11-30 05:07:47 -06:00
Seth Call
6f488d4692
* make nice display for admin
2015-11-29 14:30:34 -06:00
Seth Call
7432b50438
* fix some minor display issues
2015-11-29 14:15:53 -06:00
Seth Call
bd02774db9
GiftCards are purchable
2015-11-29 13:58:10 -06:00
Seth Call
6d514c3df2
* api for marking purchase from ios
2015-11-28 19:38:39 -06:00
Jonathan Kolyer
50c3731dff
VRFS-3728 check for purchases and mixes outside of ios
2015-11-25 03:47:22 +00:00
Seth Call
5e754a7096
* update video Url
2015-11-24 07:45:17 -06:00
Seth Call
b9a7bd6e09
* fix JS error
2015-11-24 06:49:35 -06:00
Seth Call
becf0a82b1
* updatin landing pages for JamBlaster on Kickstarter
2015-11-24 06:03:23 -06:00
Seth Call
143506afd5
* wip
2015-11-21 15:29:15 -06:00
Seth Call
83b7009c51
* wip
2015-11-20 16:18:08 -06:00
Seth Call
826f53ce84
* add in more onboarding helpers
2015-11-20 10:07:18 -06:00
Seth Call
049a90445b
* return meta
2015-11-20 08:39:01 -06:00
Seth Call
c329912527
*remove AAC generation warning
2015-11-20 07:07:56 -06:00
Seth Call
51429e8b5a
* import of timtracks working
2015-11-20 06:57:32 -06:00
Seth Call
184bf2ba4d
* merge
2015-11-19 22:09:11 -06:00
Seth Call
c2772398a8
* importer
2015-11-19 22:07:38 -06:00
Seth Call
1da8cfd4a1
* support abort signal
2015-11-19 16:58:55 -06:00
Seth Call
2a74d7ec9a
* record crash dump description
2015-11-19 11:22:41 -06:00
Seth Call
86b7327eca
* unpin fog
2015-11-18 20:06:30 -06:00
Seth Call
4aa5842deb
* change to 8 ticks
2015-11-18 15:59:12 -06:00
Seth Call
086f555bbf
* add finish
2015-11-18 15:42:14 -06:00
Seth Call
d3d2fbb210
* generate jmep automatically
2015-11-18 15:22:06 -06:00
Seth Call
d4cdab8d6b
* VRFS-3715 - filepicker fixed by taking out signature and policy
2015-11-17 06:26:37 -06:00
Seth Call
cd6bf55a1a
* VRFS-3719 - dont show update dialog more than one at a time
2015-11-17 05:28:02 -06:00
Seth Call
38a64a3dde
* VRFS-3711 - push video button brings to front
2015-11-16 20:46:44 -06:00
Seth Call
bec9388aae
* vst fixems
2015-11-13 15:35:13 -06:00
Seth Call
5fad4953bc
* vst working
2015-11-13 14:00:37 -06:00
Seth Call
021db62539
Merge branch 'develop' into feature/vst
2015-11-13 11:06:07 -06:00
Seth Call
efb4214e9a
* fix path in admin gift card upload
2015-11-13 10:48:39 -06:00
Seth Call
e8cb399692
* fix some tests
2015-11-13 10:00:46 -06:00
Seth Call
7fbb215fca
* VRFS-3708 - allow redemption of gift cards
2015-11-13 07:12:58 -06:00
Seth Call
c3626ebe22
* wip
2015-11-11 05:39:28 -06:00
Seth Call
bb9beb9cab
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2015-11-09 15:33:14 -06:00
Seth Call
1da8c73721
* wip
2015-11-09 15:33:04 -06:00
Jonathan Kolyer
9df947097f
VRFS-3681 develop branch merge review
2015-11-08 23:05:34 +00:00
Jonathan Kolyer
fb9a7c01af
VRFS-3681 develop branch merge tweaks
2015-11-08 23:02:18 +00:00
Jonathan Kolyer
f41aced15f
VRFS-3681 reverted changes for develop branch merge
2015-11-08 22:44:15 +00:00
Jonathan Kolyer
0f4fb0816e
VRFS-3681 removed files added by bundler
2015-11-08 22:25:59 +00:00
Jonathan Kolyer
57314a9b1c
VRFS-3681 reverting edits prior to develop branch merge
2015-11-08 22:24:31 +00:00
Jonathan Kolyer
d7a6bdaaba
VRFS-3681 mobile load preview image
2015-11-08 22:15:01 +00:00
Jonathan Kolyer
70f047dd3c
VRFS-3681 removed git merge artifcats
2015-11-08 22:06:19 +00:00
Jonathan Kolyer
7fc646babe
VRFS-3681 test run for develop merge
2015-11-08 21:31:38 +00:00
Seth Call
99cd31ea78
* whitespace change
2015-11-01 16:22:43 -06:00
Seth Call
38109c8b61
* update deliverable csv for jamtrack users
2015-11-01 06:40:17 -06:00
Seth Call
022fd60b3c
* wip
2015-11-01 06:39:51 -06:00
Jonathan Kolyer
958bb9346e
Merge branch 'feature/mobile' of bitbucket.org:jamkazam/jam-cloud into feature/mobile
2015-11-01 02:32:55 +00:00
Jonathan Kolyer
1bcee2e60c
Merge branch 'develop' into feature/mobile
2015-11-01 02:28:10 +00:00
Jonathan Kolyer
c27ed06455
VRFS-3681 add year and counter
2015-11-01 02:27:18 +00:00
Seth Call
9e461c61dd
* update deliverable csv for jamtrack users
2015-10-30 14:43:59 -05:00
Seth Call
f7267d38c6
* wip
2015-10-30 09:59:50 -05:00
Jonathan Kolyer
61e93b7d1d
VRFS-3681 fixed artist pagination
2015-10-29 03:17:47 +00:00
Seth Call
b0c8c88524
* fix display issues with sales
2015-10-28 16:32:55 -05:00
Seth Call
9d8c46ca7c
* sale line items
2015-10-28 08:10:03 -05:00
Seth Call
76e3bb3284
* affilate quarterly payments
2015-10-27 16:21:16 -05:00
Seth Call
a84f344335
* disable resizing
2015-10-27 13:06:33 -05:00
Seth Call
68d165427c
* bump
2015-10-27 12:11:40 -05:00
Seth Call
806308ac01
* bump from top
2015-10-27 09:51:39 -05:00
Seth Call
86d33c0f79
* create mix not working; fixed
2015-10-27 09:48:07 -05:00
Seth Call
8d026a3fdb
* fix bug with stemId downoad
2015-10-27 09:20:37 -05:00
Seth Call
52524c774d
* wip
2015-10-27 09:19:14 -05:00
Seth Call
b686020b49
* wip
2015-10-26 20:20:26 -05:00
Seth Call
d52f6b570a
* add scroll and my mixes on by default
2015-10-26 16:49:55 -05:00
Seth Call
fbc2e9498f
* fix iphone/ipad actions, also stop doing popups anywhere
2015-10-26 16:03:43 -05:00
Seth Call
73a04d4d95
* typo added in video_upload
2015-10-24 05:13:33 -05:00
Jonathan Kolyer
1fe20d6c2b
merging develop
2015-10-24 01:58:49 +00:00
Jonathan Kolyer
2a0e733b84
VRFS-3672 adding :duration
2015-10-24 01:57:35 +00:00
Seth Call
af1da5ead4
* add pointers to admin
2015-10-23 15:08:54 -05:00
Seth Call
f002864a08
* most of VRFS-3674 (detect browser-based fraud) done
2015-10-23 14:42:51 -05:00
Seth Call
150c5da5b3
* remove rails react img
2015-10-23 07:52:33 -05:00
Seth Call
b2fca8cc0b
* VRFS-2818 - control both master/personal mix for volume/mute controls of media tracks
2015-10-22 11:08:34 -05:00
Seth Call
95ec9ce66e
* VRFS-3667 - put download buttons in client app view
2015-10-22 09:04:49 -05:00
Seth Call
0c5dbe2c68
* VRFS-3647 - add search capability to jamtrack page, and VRFS-3676 - poke redeem users
2015-10-22 05:51:49 -05:00
Jonathan Kolyer
8e88e7fe7e
Merge branch 'develop' into feature/mobile
2015-10-22 09:02:42 +00:00
Jonathan Kolyer
8e21fb1fe7
merging develop
2015-10-22 01:00:34 +00:00
Seth Call
d3d9a2db49
* VRFS-3668 - show download errors in popup player, VRFS-3659 - cache tracks in popup player
2015-10-21 10:44:02 -05:00
Seth Call
f086ff74c3
* fix how player occurs in native client
2015-10-21 08:36:41 -05:00
Seth Call
023648a5be
* VRFS-3673 - normalize non-jkz files
2015-10-21 06:45:30 -05:00
Seth Call
27328a7c65
* VRFS-3670 - affiliate rate usage
2015-10-20 21:09:58 -05:00
Jonathan Kolyer
ffa5fe1798
Merge branch 'develop' into feature/mobile
2015-10-20 00:40:05 +00:00
Jonathan Kolyer
93d11d6b3b
VRFS-3459 removed errand git merge inserts
2015-10-20 00:38:46 +00:00
Seth Call
9dbcdb2436
* help doc tweak
2015-10-19 17:53:50 -05:00
Seth Call
93e0be7bdd
* bump
2015-10-19 15:40:55 -05:00
Jonathan Kolyer
bfa3b0b8c9
VRFS-3459 accidental file adding
2015-10-19 20:00:09 +00:00
Jonathan Kolyer
7a2dd6ea0b
VRFS-3459 merging develop
2015-10-19 19:58:41 +00:00
Seth Call
5073c2d4e7
* show daily status
2015-10-19 14:34:06 -05:00
Seth Call
2b81276e1b
* sort by referrals
2015-10-19 14:06:18 -05:00
Seth Call
53f5c6d4df
* fix help doc link
2015-10-19 13:54:33 -05:00
Seth Call
515704898c
* make player list not be dynamic, and fix context.stats write
2015-10-19 13:42:39 -05:00
Seth Call
f0ece5f894
* allow custom mixes to be made even if full jamtrack not selected
2015-10-19 13:04:17 -05:00
Seth Call
993e12995c
* track redeem correctly; also try and fix admin
2015-10-19 12:56:52 -05:00
Seth Call
a63f9085f4
* VRFS-3664 - dont say dear anonymous in emails
2015-10-19 10:07:53 -05:00
Seth Call
fa586d878d
* force width to be 450 VRFS-3663
2015-10-19 09:44:58 -05:00
Seth Call
813e8b2fbe
* VRFS-3665 - move download icon to the right of folder icon
2015-10-19 08:24:09 -05:00
Seth Call
e7f8e2fed1
* fix nil crash in importer, and make referral page display friendlier
2015-10-18 09:05:24 -05:00
Seth Call
25bda4de4d
* skip tracks that are messing audio path
2015-10-18 08:48:17 -05:00
Seth Call
0b6b2e1b86
* node number/node count support
2015-10-17 06:48:26 -05:00
Seth Call
1ecb17d2a7
* only need params affiliate to be present
2015-10-17 06:30:45 -05:00
Seth Call
d2d1b8facc
* anonymous check is correct now, as well as video in landing page
2015-10-16 16:50:08 -05:00
Seth Call
9a8aeced51
* VRFS-3660 - fix issue with jamtrack tile page not refreshing when user buys free jamtrack
2015-10-16 15:59:29 -05:00
Seth Call
801504be2b
* fixing bug when referencing name instead of first/last for feed
2015-10-16 14:56:54 -05:00
Seth Call
7d5edc298d
* updated video links for JamTracks
2015-10-16 14:26:23 -05:00
Seth Call
58b8a29f51
* VRFS-3630 - jamtrack landing page revamp
...
* VRFS-3637 - jamtrack landing tile updated
* VRFS-3638 - jamtrack web player
2015-10-16 14:01:18 -05:00
Seth Call
55007e9619
* use closure to caputer video true/false
2015-10-15 11:16:12 -05:00
Seth Call
e01634285a
* make sure upload to youtube popup is only shown for video dialogs
2015-10-15 06:10:21 -05:00
Seth Call
29f3b52120
* VRFS-3651 - dont show upload to youtube checkbox for audio sessions
2015-10-15 06:03:03 -05:00
Jonathan Kolyer
c700f856e5
Merge branch 'develop' into feature/mobile
2015-10-13 17:34:12 +00:00
Jonathan Kolyer
325768e5e1
VRFS-3459 added plan_code to jam_track_search json
2015-10-13 17:33:12 +00:00
Jonathan Kolyer
538f7e75a1
VRFS-3459 added :year, :plan_code
2015-10-13 17:31:15 +00:00
Seth Call
2d54b03a07
* VRFS-3633 - fix metronome visualization in popup
2015-10-09 07:20:29 -05:00
Seth Call
70b3a2f5de
* translate enum ids into framerates for start video recording - VRFS-3631
2015-10-09 06:37:18 -05:00
Seth Call
eba43cf228
* translate enum ids into framerates for start video recording - VRFS-3631
2015-10-09 06:32:53 -05:00
Seth Call
6ecf591520
* VRFS-3629 - deal with upload failure correctly
2015-10-08 15:07:51 -05:00
Seth Call
c3097d4436
* VRFS-3625 - tell backend correctly abot keeping video if user discards, and filter out recordingId of video
2015-10-08 12:18:18 -05:00
Seth Call
4bdf555409
* make height of google prompt bigger because we ask for more
2015-10-08 11:45:18 -05:00
Seth Call
aa51114e8a
* deal with no refresh token better
2015-10-08 11:36:16 -05:00
Seth Call
509cc56cdb
* dont let refresh attempt bust API
2015-10-08 07:50:20 -05:00
Seth Call
276442a9b4
* VRFS-3512 - upload videos to youtube
2015-10-07 21:12:26 -05:00
Steven Miers
8f20da7567
VRFS-3359 : Currency field behavior
...
* Formats on blur only
* Render pulls currency value from local cache if field has focus
* Save to cache on initial focus, even if not changed
2015-10-05 15:37:54 -05:00
Jonathan Kolyer
0c25d0e40b
merging develop
2015-10-05 14:06:39 +00:00
Jonathan Kolyer
830dd4595c
merging
2015-10-03 03:21:32 +00:00
Jonathan Kolyer
47def5113b
VRFS-3459 config.middleware.use Rack::Deflater
2015-10-03 03:20:25 +00:00
Jonathan Kolyer
09432cea1c
VRFS-3459 tweaks for mobile mixdowns
2015-10-03 03:19:56 +00:00
Jonathan Kolyer
5d5ea51a16
VRFS-3459 mixdown ios
2015-10-03 03:17:43 +00:00
Seth Call
4290d449ed
* default to full avail
2015-09-30 12:26:24 -05:00
Seth Call
9abee035be
* VRFS-3513 - start/stop video possible from frontentd
2015-09-30 11:26:03 -05:00
Seth Call
cb76a6e28f
* VRFS-3588 generating AAC's for master previews
2015-09-29 19:57:31 -05:00
Seth Call
38aa35765d
* allow someone to make a replica of the master mix if the boolean 'full' is passed with true
2015-09-26 14:37:05 -05:00
Seth Call
c0d78c9d26
* VRFS-3586 up 40 from 20 for the jamtrack account screen
2015-09-26 14:01:51 -05:00
Seth Call
8e67d6d9b8
* fix help alignment
2015-09-25 13:28:48 -05:00
Seth Call
aaa450f14e
* add help article link to popup for JamTracks
2015-09-25 10:53:53 -05:00
Seth Call
3fdf835942
* hide custom mix controls when custom mix is active
2015-09-25 08:36:25 -05:00
Seth Call
5018be71dd
* fix sample rate issue typo in keys.rabl
2015-09-23 18:30:38 -05:00
Seth Call
a5e4c2dfce
* VRFS-3519 - prevent play click when JamTrack is loading
2015-09-23 15:27:41 -05:00
Seth Call
49dc6890fc
* VRFS-3579 - dont try to kick off 2 downloads
2015-09-23 14:39:34 -05:00
Seth Call
0aa2f215b6
* VRFS-3580 - empty windows shouldn't show
2015-09-23 13:57:14 -05:00
Seth Call
6c5c4731ed
* VRFS-3577 - hide open media controls while JamTrack mixdown is downloading
2015-09-23 12:03:40 -05:00
Seth Call
c379c6dc44
* VRFS-3576 - deal with case that mixdown is not yet created
2015-09-23 10:38:38 -05:00
Seth Call
284e671b01
* VRFS-3571 - fixes to temp ban user if they are spamming server
2015-09-23 09:18:00 -05:00
Seth Call
0f9b1c3f07
* don't find against notifications for a blank notify
2015-09-22 21:34:34 -05:00
Seth Call
e4e65f8c04
* add timings for websocket-gateway health issues
2015-09-22 20:57:01 -05:00
Seth Call
1dce984247
* VRFS-3519 - 2-player sessions working with custom mix
2015-09-22 15:25:48 -05:00
Seth Call
1733c8689d
* fix typo in JamTrackCleaner
2015-09-22 09:42:53 -05:00
Seth Call
032d30c3f3
* fix query in db cleaner
2015-09-22 06:03:55 -05:00
Seth Call
a0feb09509
* check in missing images
2015-09-22 05:48:00 -05:00
Seth Call
de9856b5be
* pin back react-select
2015-09-21 21:11:01 -05:00
Seth Call
d3ca53672b
* remove react_rails_img
2015-09-21 20:30:51 -05:00
Seth Call
4a647b8bd1
* VRFS-3519 - client and server jamtrack mixdown support
2015-09-21 20:01:39 -05:00
Steven Miers
ae854d858f
VRFS-3359 : Fix several errors related to syntax, property usage, etc.
2015-09-21 13:00:06 -05:00
Jonathan Kolyer
5534ec0224
VRFS-3459 mixdown merging
2015-09-21 01:00:38 +00:00
Jonathan Kolyer
23bf15eb50
VRFS-3390 fixed quoting issue and text search
2015-09-21 01:00:38 +00:00
Jonathan Kolyer
c1b8bf9ff7
VRFS-3391 fixing glitches from mobile tests
2015-09-21 01:00:38 +00:00
Jonathan Kolyer
5c0178df8f
VRFS-3393 jam_track has_many genres support
2015-09-21 01:00:37 +00:00
Jonathan Kolyer
4b01097c97
VRFS-3393 register api--first draft
2015-09-21 01:00:37 +00:00
Jonathan Kolyer
7e911bdb32
VRFS-3393 added KEY_RESULTS field to filter
2015-09-21 01:00:37 +00:00
Jonathan Kolyer
3c16949615
VRFS-3389 changed results schema
2015-09-21 01:00:37 +00:00
Jonathan Kolyer
dd420527c0
VRFS-3398 fixing queries, api integration
2015-09-21 01:00:37 +00:00
Jonathan Kolyer
af662fa714
VRFS-3389 jamtrack search
2015-09-21 01:00:37 +00:00
Jonathan Kolyer
10d4d99953
VRFS-3389 fetch genres/instrumnets only with jamtracks; initial search impl
2015-09-21 01:00:37 +00:00
Seth Call
077b5a700d
* allow jamblaster to fetch http
2015-09-21 01:00:37 +00:00
Seth Call
468b0c4998
* adding guess code and fixing importer
2015-09-20 15:14:45 -05:00
Steven Miers
b3b3e46dc9
VRFS-3359 : Fix page not loading due to input tag formatting
2015-09-19 18:37:33 -05:00
Jonathan Kolyer
4e57f50271
VRFS-3459 mixdown merging
2015-09-19 21:55:02 +00:00
Jonathan Kolyer
5a61b3584c
VRFS-3390 fixed quoting issue and text search
2015-09-19 21:54:25 +00:00
Jonathan Kolyer
f01532804d
VRFS-3391 fixing glitches from mobile tests
2015-09-19 21:54:25 +00:00
Jonathan Kolyer
56f0725006
VRFS-3393 jam_track has_many genres support
2015-09-19 21:54:25 +00:00
Jonathan Kolyer
5d434e0020
VRFS-3393 register api--first draft
2015-09-19 21:54:25 +00:00
Jonathan Kolyer
e18e6ed81f
VRFS-3393 added KEY_RESULTS field to filter
2015-09-19 21:54:25 +00:00
Jonathan Kolyer
2030b0fd00
VRFS-3389 changed results schema
2015-09-19 21:54:25 +00:00
Jonathan Kolyer
36db710b4b
VRFS-3398 fixing queries, api integration
2015-09-19 21:54:25 +00:00
Jonathan Kolyer
efd5ffd4ed
VRFS-3389 jamtrack search
2015-09-19 21:54:25 +00:00
Jonathan Kolyer
074facfd30
VRFS-3389 fetch genres/instrumnets only with jamtracks; initial search impl
2015-09-19 21:54:25 +00:00
Seth Call
e97d2eec89
* allow jamblaster to fetch http
2015-09-19 21:54:24 +00:00
Steven Miers
2e4dfaa728
Squashed commit of the following:
...
commit 30965c6351
Author: Seth Call <sethcall@gmail.com>
Date: Tue Sep 15 05:23:27 2015 -0500
* allow jamblaster to fetch http
commit 5c8fb6b01e
Author: Seth Call <sethcall@gmail.com>
Date: Fri Sep 11 13:43:07 2015 -0500
* don't issue stop video in session end
commit 3e27680ea9
Author: Seth Call <sethcall@gmail.com>
Date: Fri Sep 11 13:40:34 2015 -0500
* decommision webcam_viewer in session page
commit ac1cc0c828
Author: Seth Call <sethcall@gmail.com>
Date: Thu Sep 10 07:24:42 2015 -0500
* VRFS-3541 - don't use HTML to store data sent to server for genre
ID bug in profile
commit 004991119a
Author: Seth Call <sethcall@gmail.com>
Date: Wed Sep 9 15:10:51 2015 -0500
* set 'are you our user' cookie to do better job with ad tracking
commit 13a950e65f
Author: Seth Call <sethcall@gmail.com>
Date: Wed Sep 9 07:58:46 2015 -0500
* align disable vide obutton better
commit 9722c6cbc6
Author: Seth Call <sethcall@gmail.com>
Date: Wed Sep 9 07:45:18 2015 -0500
* whitesapce
commit 3976707b14
Author: Seth Call <sethcall@gmail.com>
Date: Wed Sep 9 07:13:51 2015 -0500
* check for video enabled better
commit b483dd537f
Author: Seth Call <sethcall@gmail.com>
Date: Wed Sep 9 07:02:12 2015 -0500
* better text for video test
commit a4f465b6d1
Author: Seth Call <sethcall@gmail.com>
Date: Tue Sep 8 20:30:47 2015 -0500
* VRFS-3530, VRFS-3531 - allow user to test and disable video
commit ba99f88048
Author: Seth Call <sethcall@gmail.com>
Date: Tue Sep 8 10:05:26 2015 -0500
* VRFS-3534 - fix start recording API signature
commit 386ed8144c
Author: Seth Call <sethcall@gmail.com>
Date: Sun Sep 6 19:03:08 2015 -0500
* VRFS-3528 - make sure open jamtrack dialog passes
'show_purchased_only'
commit 6d010a561b
Author: Seth Call <sethcall@gmail.com>
Date: Fri Sep 4 20:43:15 2015 -0500
* deal with too-few tracks on landing page, and the 3rd CTA bubble
clipping off text
commit 0076f0205a
Author: Seth Call <sethcall@gmail.com>
Date: Fri Sep 4 15:00:45 2015 -0500
* VRFS-352 - instrument-centric landing page
commit 3ee71634b3
Author: Seth Call <sethcall@gmail.com>
Date: Wed Sep 2 09:40:06 2015 -0500
* remove test stuff
commit d07ac009bf
Author: Seth Call <sethcall@gmail.com>
Date: Tue Sep 1 08:11:35 2015 -0500
* VRFS-3509 - case where no device is configured handled
commit 9420cebad4
Author: Seth Call <sethcall@gmail.com>
Date: Sun Aug 30 05:00:00 2015 -0500
* VRFS-3494 - show popup when video window launches for the 1st
time to offer guidance
commit c3f81a4d23
Author: Seth Call <sethcall@gmail.com>
Date: Thu Aug 27 10:35:43 2015 -0500
* build bump
commit e782d5f9bb
Author: Seth Call <sethcall@gmail.com>
Date: Thu Aug 27 09:43:40 2015 -0500
* VRFS-3419 - check better for window opener
commit 36b6699cde
Author: Seth Call <sethcall@gmail.com>
Date: Thu Aug 27 08:12:47 2015 -0500
* validate popup VRFS-3419
commit 8948f0498f
Author: Seth Call <sethcall@gmail.com>
Date: Thu Aug 27 07:59:21 2015 -0500
* fix changed path
commit 2bce35d604
Author: Seth Call <sethcall@gmail.com>
Date: Wed Aug 26 20:38:34 2015 -0500
* fix jamtrack test
commit 63ef63c20d
Author: Seth Call <sethcall@gmail.com>
Date: Wed Aug 26 20:34:40 2015 -0500
* fix typo again in webcamViewer. need to go to bed
commit 8566cc5bc9
Author: Seth Call <sethcall@gmail.com>
Date: Wed Aug 26 20:31:34 2015 -0500
* fix typo added in webcamViewer
commit 22ea6e89fd
Author: Seth Call <sethcall@gmail.com>
Date: Wed Aug 26 20:26:39 2015 -0500
* VRFS-3488 - jamtrack search by artist and song need to pin to the
match, not do a sloppy search
commit a4bd28e168
Author: Seth Call <sethcall@gmail.com>
Date: Wed Aug 26 16:43:34 2015 -0500
VRFS-3474 - watch for USB events and refresh video pages
commit d2edfd22c5
Author: Seth Call <sethcall@gmail.com>
Date: Wed Aug 26 12:01:52 2015 -0500
* VRFS-3467 - previews are 20 seconds long indicator on jamtracks
commit defdfa8ce9
Author: Seth Call <sethcall@gmail.com>
Date: Wed Aug 26 06:04:53 2015 -0500
* VRFS-3473 - fix 'videoShared' state in webcamViewer
commit 090cfa17c0
Merge: 7560b34 818596a
Author: Seth Call <sethcall@gmail.com>
Date: Tue Aug 25 14:53:35 2015 -0500
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into
develop
commit 7560b340c7
Author: Seth Call <sethcall@gmail.com>
Date: Tue Aug 25 14:52:05 2015 -0500
* VRFS-3466 - updated frontend to pass in GUIDs
commit 1252dbe178
Author: Seth Call <sethcall@gmail.com>
Date: Tue Aug 25 05:28:15 2015 -0500
* use new bridge calls to handle current FPS and resolution
VRFS-3428
commit 818596ae36
Author: Jonathan Kolyer <jonathan@jamkazam.com>
Date: Tue Aug 25 08:23:52 2015 +0000
VRFS-3451 musician_search verifying instrument and genres inputs
commit 6918eaf095
Author: Seth Call <sethcall@gmail.com>
Date: Mon Aug 24 17:55:06 2015 -0500
more UI tweaks for video settup in account screen VRFS-3428
commit fc69242578
Author: Seth Call <sethcall@gmail.com>
Date: Mon Aug 24 16:18:31 2015 -0500
* VRFS-3427 - update FTUE to test video, not just audio
commit 729974013a
Author: Seth Call <sethcall@gmail.com>
Date: Mon Aug 24 16:17:53 2015 -0500
* VRFS-3428 - fix button text
commit db1f1d60d5
Merge: 04825d2 90c8d05
Author: Seth Call <sethcall@gmail.com>
Date: Mon Aug 24 15:56:42 2015 -0500
Merge branch 'feature/video_frontend' into develop
commit 04825d2659
Author: Seth Call <sethcall@gmail.com>
Date: Mon Aug 24 15:54:59 2015 -0500
* VRFS-3428 - update how we query backend for frame rates
commit 39d0731d74
Author: Seth Call <sethcall@gmail.com>
Date: Sat Aug 22 05:44:59 2015 -0500
* VRFS-3456 - remove special chars from search
commit 1874720ee8
Author: Seth Call <sethcall@gmail.com>
Date: Sat Aug 22 05:32:28 2015 -0500
* VRFS-3456 - protect special chars from tsquery
commit 29104ff09b
Author: Seth Call <sethcall@gmail.com>
Date: Fri Aug 21 05:02:48 2015 -0500
* VRFS-3446 - bug fix for no genre specified on join of session;
also fix search bar in jamtrack dialog
commit 3b6d1febdb
Author: Seth Call <sethcall@gmail.com>
Date: Thu Aug 20 15:44:21 2015 -0500
* forget cta image
commit 6ac622853c
Author: Seth Call <sethcall@gmail.com>
Date: Thu Aug 20 15:02:55 2015 -0500
* VRFS-3449 - a little more tweaking of JamTrack landing page
commit d7fcadcd0d
Author: Seth Call <sethcall@gmail.com>
Date: Thu Aug 20 14:49:07 2015 -0500
* VRFS-3450 - fix 'show all tracks' when pagination occurs by not
doubleregistering
commit e7b50ca4a8
Author: Seth Call <sethcall@gmail.com>
Date: Thu Aug 20 14:19:07 2015 -0500
* VRFS-3449 - updates for direct landing pages
commit 0d075a9568
Author: Seth Call <sethcall@gmail.com>
Date: Thu Aug 20 09:19:17 2015 -0500
* fix spacing issue
commit 9c17d9a024
Merge: 9873450 0b67ef5
Author: Seth Call <sethcall@gmail.com>
Date: Thu Aug 20 09:06:48 2015 -0500
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into
develop
commit 98734506df
Author: Seth Call <sethcall@gmail.com>
Date: Thu Aug 20 09:06:36 2015 -0500
* VRFS-3448 - fix invisible downloader
commit 90c8d05d00
Author: Seth Call <sethcall@gmail.com>
Date: Wed Aug 19 14:17:10 2015 -0500
* wip
commit bf4044d92e
Author: Seth Call <sethcall@gmail.com>
Date: Wed Aug 19 09:24:14 2015 -0500
* VRFS-3422 - don't die if the user has on sale_line_items
commit 87c62b4db2
Author: Seth Call <sethcall@gmail.com>
Date: Wed Aug 19 08:29:22 2015 -0500
* a fix for linux? hfa code
commit 3fa58715fc
Author: Seth Call <sethcall@gmail.com>
Date: Wed Aug 19 07:36:04 2015 -0500
* fix open jamtrack dialog for people with less than 10 jamtracks
commit d045c94f54
Author: Seth Call <sethcall@gmail.com>
Date: Wed Aug 19 07:17:37 2015 -0500
* more HFA request polish
commit dc343f10e3
Author: Seth Call <sethcall@gmail.com>
Date: Wed Aug 19 07:01:47 2015 -0500
* don't show free jamtrack notice on landing page if
redeemed_jamtrack cookie is set
commit e6618da456
Author: Seth Call <sethcall@gmail.com>
Date: Tue Aug 18 21:29:15 2015 -0500
* fix a bug in figuring out if the user should be show GET IT FREE
commit 5ba03a2755
Author: Seth Call <sethcall@gmail.com>
Date: Tue Aug 18 20:41:37 2015 -0500
* VRFS-3431 - better response when creating HFA request
commit 37d6c3e57c
Author: Seth Call <sethcall@gmail.com>
Date: Tue Aug 18 15:19:40 2015 -0500
* add csv to dump released JamTracks
commit f6101f3621
Author: Seth Call <sethcall@gmail.com>
Date: Tue Aug 18 14:26:41 2015 -0500
VRFS-3422, VRFS-3423, VRFS-3424, VRFS-3429 - JamTrack search/listing
commit 0b67ef5f52
Author: Jonathan Kolyer <jonathan@jamkazam.com>
Date: Sat Aug 15 15:03:00 2015 +0000
fixed test for instruments in musician search
2015-09-19 16:33:39 -05:00
Seth Call
a597671712
* send out event when it kicks off
2015-09-17 22:20:37 -05:00
Seth Call
3d2eeba638
* found some state/error transition bugs
2015-09-17 22:13:07 -05:00
Seth Call
db34ac1611
* fix sbsms invocation
2015-09-17 20:06:14 -05:00
Seth Call
b107df2478
* fix bugs
2015-09-17 17:31:00 -05:00
Seth Call
3538e7b0ae
* mark mixdown API
2015-09-15 13:40:15 -05:00
Seth Call
ac7f762a1d
* edit mixdown API handles 'active' boolean
2015-09-15 12:44:43 -05:00
Seth Call
30965c6351
* allow jamblaster to fetch http
2015-09-15 05:23:27 -05:00
Seth Call
8bcef09ae4
* wip
2015-09-15 05:07:41 -05:00
Seth Call
7e28b115a2
* allow jkz's to be built
2015-09-12 14:59:21 -05:00
Seth Call
5fd8722510
* fix web code to stop simulating ios app
2015-09-12 13:56:52 -05:00
Seth Call
c2543d064b
* fix test
2015-09-12 13:56:16 -05:00
Seth Call
d5fd7b6384
* make aac work, validate that pitch & speed are integer
2015-09-12 13:49:30 -05:00
Seth Call
c57e7fd527
* update show API
2015-09-12 12:38:18 -05:00
Seth Call
0741119a5d
Merge branch 'develop' into feature/mixdown
2015-09-12 11:25:24 -05:00
Seth Call
ad24f3d3b6
* packager working, apis working
2015-09-11 21:11:19 -05:00
Seth Call
5c8fb6b01e
* don't issue stop video in session end
2015-09-11 13:43:07 -05:00
Seth Call
3e27680ea9
* decommision webcam_viewer in session page
2015-09-11 13:40:34 -05:00
Seth Call
9bce6964bd
* wip
2015-09-11 12:53:00 -05:00
Seth Call
ac1cc0c828
* VRFS-3541 - don't use HTML to store data sent to server for genre ID bug in profile
2015-09-10 07:24:42 -05:00
Seth Call
544ab4539e
* wip
2015-09-10 06:08:29 -05:00
Seth Call
004991119a
* set 'are you our user' cookie to do better job with ad tracking
2015-09-09 15:10:51 -05:00
Seth Call
2ffd9bb7a7
* wip
2015-09-09 14:49:45 -05:00
Seth Call
13a950e65f
* align disable vide obutton better
2015-09-09 07:58:46 -05:00
Seth Call
8c75f41a3f
* wip
2015-09-09 07:58:22 -05:00
Seth Call
9722c6cbc6
* whitesapce
2015-09-09 07:45:18 -05:00
Seth Call
3976707b14
* check for video enabled better
2015-09-09 07:13:51 -05:00
Seth Call
b483dd537f
* better text for video test
2015-09-09 07:02:12 -05:00
Seth Call
2260350fc4
* wip
2015-09-09 06:11:16 -05:00
Seth Call
a4f465b6d1
* VRFS-3530, VRFS-3531 - allow user to test and disable video
2015-09-08 20:30:47 -05:00
Seth Call
c802759e42
* wip
2015-09-08 15:30:44 -05:00
Seth Call
5df4192356
* mip
2015-09-08 12:33:23 -05:00
Seth Call
ba99f88048
* VRFS-3534 - fix start recording API signature
2015-09-08 10:05:26 -05:00
Seth Call
e29050b0db
wip
2015-09-08 09:59:53 -05:00
Seth Call
50684890cb
* wip
2015-09-07 14:00:04 -05:00
Seth Call
386ed8144c
* VRFS-3528 - make sure open jamtrack dialog passes 'show_purchased_only'
2015-09-06 19:03:08 -05:00
Seth Call
6d010a561b
* deal with too-few tracks on landing page, and the 3rd CTA bubble clipping off text
2015-09-04 20:43:15 -05:00
Seth Call
0076f0205a
* VRFS-352 - instrument-centric landing page
2015-09-04 15:00:45 -05:00
Seth Call
ff01b6df0e
* wip
2015-09-04 13:11:42 -05:00
Steven Miers
900400f053
VRFS-3359 : Styling, cleanup, more idiomatic react state management for input fields.
2015-09-03 03:53:06 -05:00
Steven Miers
766842f4e7
VRFS-3359 : Teacher pricing
...
* Currency fields only appear when both the appropriate pricing option
(column) AND the time range (row).
* Currency fields set state and format on blur
2015-09-03 03:52:04 -05:00
Steven Miers
dace5dd08a
VRFS-3359 : New fields in API output and controller spec.
2015-09-03 02:00:18 -05:00
Steven Miers
3f2fd94c58
VRFS-3359 : Update schema and models with per-month and per-lesson price for each interval. Update tests to match.
2015-09-03 01:53:28 -05:00
Seth Call
3ee71634b3
* remove test stuff
2015-09-02 09:40:06 -05:00
Seth Call
d07ac009bf
* VRFS-3509 - case where no device is configured handled
2015-09-01 08:11:35 -05:00
Steven Miers
8ce313f5c7
VRFS-3359 : Teacher pricing
...
Display or hide fields depending on checkboxes.
2015-08-31 23:02:44 -05:00
Steven Miers
005ee8aabd
VRFS-3359 : Validate end year greater or equal start year.
2015-08-31 14:56:25 -05:00
Steven Miers
69bb4e469a
VRFS-3359 : Teacher Experience List Component
...
* Add field label properties to experience list component. Each of the
three lists can set labels for title and organization. Date label is
inferred from showEndDate property
* Update usages of this list
* Sort by start_date
* List display uses available fields (e.g., date range when available)
2015-08-31 13:12:36 -05:00
Steven Miers
0878c5fd3f
VRFS-3359 : Proper setting of experience keys and saving.
2015-08-31 11:32:20 -05:00
Seth Call
9420cebad4
* VRFS-3494 - show popup when video window launches for the 1st time to offer guidance
2015-08-30 05:00:00 -05:00
Steven Miers
e028a604cf
VRFS-3359 : Validate experience forms using HTML5 validations.
2015-08-29 12:52:29 -05:00
Steven Miers
6e62db85eb
VRFS-3359 : React component functionality and styles to display various experience lists.
2015-08-28 15:50:20 -05:00
Steven Miers
67696a72d7
VRFS-3359 : Teacher API work
...
* Return distinct experience collections for teaching, education, and
awards.
* Update tests for new behavior.
* Responders for language and subject APIs.
2015-08-28 15:11:52 -05:00
Steven Miers
4eac4ccd7a
VRFS-3359 : Style updates, mostly for experience page.
2015-08-28 13:30:32 -05:00
Steven Miers
cf6f4046da
VRFS-3359 : More react behavior and view updates to generic and specialized components.
2015-08-28 13:30:01 -05:00
Steven Miers
7fe542a1ff
VRFS-3359 : Fix classes for various profile setup pages.
2015-08-28 13:27:57 -05:00
Steven Miers
6c25907a58
VRFS-3359 : New react components for profile setup. Incremental
2015-08-27 11:25:48 -05:00
Seth Call
c3f81a4d23
* build bump
2015-08-27 10:35:43 -05:00
Seth Call
e782d5f9bb
* VRFS-3419 - check better for window opener
2015-08-27 09:43:40 -05:00
Seth Call
36b6699cde
* validate popup VRFS-3419
2015-08-27 08:14:39 -05:00
Seth Call
8948f0498f
* fix changed path
2015-08-27 07:59:21 -05:00
Seth Call
2bce35d604
* fix jamtrack test
2015-08-26 20:38:34 -05:00
Seth Call
63ef63c20d
* fix typo again in webcamViewer. need to go to bed
2015-08-26 20:34:40 -05:00
Seth Call
8566cc5bc9
* fix typo added in webcamViewer
2015-08-26 20:31:34 -05:00
Seth Call
22ea6e89fd
* VRFS-3488 - jamtrack search by artist and song need to pin to the match, not do a sloppy search
2015-08-26 20:26:39 -05:00
Seth Call
a4bd28e168
VRFS-3474 - watch for USB events and refresh video pages
2015-08-26 16:43:34 -05:00
Seth Call
d2edfd22c5
* VRFS-3467 - previews are 20 seconds long indicator on jamtracks
2015-08-26 12:01:52 -05:00
Seth Call
defdfa8ce9
* VRFS-3473 - fix 'videoShared' state in webcamViewer
2015-08-26 06:04:53 -05:00
Steven Miers
2558c03f3d
VRFS-3359 : Updates to teacher models and tests
...
* Scope experience based on type: teaching, education, awards
* Save experience using these different types
* Add new tests to verify
2015-08-25 19:21:48 -05:00
Steven Miers
66e17c64d6
VRFS-3407 : Populate initial list of subjects and list of common languages.
2015-08-25 19:18:13 -05:00
Seth Call
090cfa17c0
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2015-08-25 14:53:35 -05:00
Seth Call
7560b340c7
* VRFS-3466 - updated frontend to pass in GUIDs
2015-08-25 14:53:28 -05:00
Seth Call
1252dbe178
* use new bridge calls to handle current FPS and resolution VRFS-3428
2015-08-25 05:28:15 -05:00
Jonathan Kolyer
818596ae36
VRFS-3451 musician_search verifying instrument and genres inputs
2015-08-25 08:23:52 +00:00
Seth Call
6918eaf095
more UI tweaks for video settup in account screen VRFS-3428
2015-08-24 17:55:06 -05:00
Seth Call
fc69242578
* VRFS-3427 - update FTUE to test video, not just audio
2015-08-24 16:18:31 -05:00
Seth Call
729974013a
* VRFS-3428 - fix button text
2015-08-24 16:17:53 -05:00
Seth Call
db1f1d60d5
Merge branch 'feature/video_frontend' into develop
2015-08-24 15:56:42 -05:00
Seth Call
04825d2659
* VRFS-3428 - update how we query backend for frame rates
2015-08-24 15:54:59 -05:00
Seth Call
39d0731d74
* VRFS-3456 - remove special chars from search
2015-08-22 05:44:59 -05:00
Seth Call
1874720ee8
* VRFS-3456 - protect special chars from tsquery
2015-08-22 05:35:25 -05:00
Steven Miers
78ccf3b9f4
VRFS-3359 : Teacher Setup - Factor out common functionality into a CheckBoxList, of which the instrument selector is composed.
2015-08-21 08:30:44 -05:00
Seth Call
29104ff09b
* VRFS-3446 - bug fix for no genre specified on join of session; also fix search bar in jamtrack dialog
2015-08-21 05:02:48 -05:00
Seth Call
3b6d1febdb
* forget cta image
2015-08-20 15:44:21 -05:00
Seth Call
6ac622853c
* VRFS-3449 - a little more tweaking of JamTrack landing page
2015-08-20 15:02:55 -05:00
Seth Call
d7fcadcd0d
* VRFS-3450 - fix 'show all tracks' when pagination occurs by not doubleregistering
2015-08-20 14:49:07 -05:00
Steven Miers
ec7c4e3e4d
VRFS-3359 : Cleanup
2015-08-20 14:44:50 -05:00
Seth Call
e7b50ca4a8
* VRFS-3449 - updates for direct landing pages
2015-08-20 14:19:07 -05:00
Steven Miers
949bf6ec25
VRFS-3359 : Teacher Profile Instrument Selector List
...
* Instrument Selector List Component
* Necessary backend api tweaks so only necessary instrument information
is returned (array of ids only)
* Refactor styles and add common checkbox scroller styles.
2015-08-20 14:15:51 -05:00
Seth Call
0d075a9568
* fix spacing issue
2015-08-20 09:19:17 -05:00
Seth Call
9c17d9a024
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2015-08-20 09:06:48 -05:00
Seth Call
98734506df
* VRFS-3448 - fix invisible downloader
2015-08-20 09:06:36 -05:00
Seth Call
90c8d05d00
* wip
2015-08-19 14:17:10 -05:00
Seth Call
bf4044d92e
* VRFS-3422 - don't die if the user has on sale_line_items
2015-08-19 09:24:14 -05:00
Seth Call
87c62b4db2
* a fix for linux? hfa code
2015-08-19 08:29:22 -05:00
Seth Call
3fa58715fc
* fix open jamtrack dialog for people with less than 10 jamtracks
2015-08-19 07:36:04 -05:00
Seth Call
d045c94f54
* more HFA request polish
2015-08-19 07:17:37 -05:00
Seth Call
dc343f10e3
* don't show free jamtrack notice on landing page if redeemed_jamtrack cookie is set
2015-08-19 07:01:47 -05:00
Seth Call
e6618da456
* fix a bug in figuring out if the user should be show GET IT FREE
2015-08-18 21:29:15 -05:00
Seth Call
5ba03a2755
* VRFS-3431 - better response when creating HFA request
2015-08-18 20:41:37 -05:00
Seth Call
37d6c3e57c
* add csv to dump released JamTracks
2015-08-18 15:19:40 -05:00
Seth Call
f6101f3621
VRFS-3422, VRFS-3423, VRFS-3424, VRFS-3429 - JamTrack search/listing
2015-08-18 14:26:41 -05:00
Steven Miers
7c95e526e4
Merge branch 'develop' into feature/profile-teacher
2015-08-17 14:11:41 -05:00
Steven Miers
fea9d1e25a
Fix unit test (build instead of create).
2015-08-17 14:10:32 -05:00
Steven Miers
dd98f3bf2e
VRFS-3359 : API and REST for languages and subjects
2015-08-17 14:08:03 -05:00
Steven Miers
6edb4b6012
Merge with develop
2015-08-15 17:18:15 -05:00
Steven Miers
b4018e0124
VRFS-3359 : Teacher lookup
...
* Fix a problem with teacher query
* Addresses a few test failures
* Cleanup logging output
2015-08-15 17:11:47 -05:00
Steven Miers
b2b9022f50
VRFS-3359 : Styling and markup for react components, incremental.
2015-08-15 16:36:42 -05:00
Steven Miers
c1927dd20a
VRFS-3359 : Teacher API detail method
...
* Now includes sub-records: genres, instruments, languages, subjects
* Test to verify
2015-08-15 16:35:51 -05:00
Seth Call
efbecded54
* fix importer on oriental/asian
2015-08-15 14:26:54 -05:00
Jonathan Kolyer
0b67ef5f52
fixed test for instruments in musician search
2015-08-15 15:03:00 +00:00
Seth Call
e62d9e126f
* VRFS-3435 allow multiple onboarders to execute
2015-08-15 06:22:46 -05:00
Steven Miers
86a196e7c8
VRFS-3359 : Solid navigation for teacher setup steps.
2015-08-14 16:56:36 -05:00
Seth Call
c4981376ac
* set storage format for sync_all_dev
2015-08-13 11:13:13 -05:00
Seth Call
ee6493afd3
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2015-08-13 11:10:04 -05:00
Seth Call
d36999032f
* expand part size
2015-08-13 11:09:54 -05:00
Steven Miers
fee62c225b
VRFS-3359 : Navigation and additional styling/markup.
2015-08-12 13:03:32 -05:00
Seth Call
40f3b7d83e
* correct part deduplicator
2015-08-12 10:14:54 -05:00
Seth Call
03f5407727
* deal with duplicate instrument/parts better than failing
2015-08-12 09:36:42 -05:00
Seth Call
96fa38f611
* fix db migration for production
2015-08-11 10:41:37 -05:00
Seth Call
5300f62063
* don't eat up horns part if specified
2015-08-11 05:51:58 -05:00
Seth Call
795f0b5375
* allow a non-video client into a session on a server configured with video
2015-08-10 11:05:24 -05:00
Seth Call
aec3d106fa
* more scopes for onboarding
2015-08-09 17:27:30 -05:00
Seth Call
da726a574b
* remove unique constraint on jamtrack name
2015-08-09 14:20:21 -05:00
Seth Call
eba1280708
* make it so it's easy to find jam tracks with problems
2015-08-09 13:57:19 -05:00
Seth Call
af355ec096
* get activeadmin working for JamTracks after onboarding enhancements were added
2015-08-09 13:47:49 -05:00
Seth Call
557e19e5e7
* allow better onboarding of JamTracks including audio from Tency Music (VRFS-3296, VRFS-3386)
2015-08-09 13:37:43 -05:00
Steven Miers
09b7f44a91
VRFS-3359 : Enhance show/detail record. Also allow looking up by teacher or current user, which changes URI signature. Update tests accordingly.
2015-08-08 15:06:15 -05:00
Steven Miers
fb95aa3d4d
VRFS-3359 : And language and subject factories for testing.
2015-08-08 15:03:58 -05:00
Steven Miers
87eaf3646d
VRFS-3359 : Hook up react components - incremental.
2015-08-08 15:03:23 -05:00
Steven Miers
c38fe715a5
VRFS-3359 : Extract styles for simple use in react. Styling for error/validation.
2015-08-08 15:02:18 -05:00
Steven Miers
8908ef3081
VRFS-3359 : Validations and tests for introductory video.
2015-08-08 15:01:38 -05:00
Steven Miers
176f2b9e2f
VRFS-3359 : Initial react components.
2015-08-08 15:01:22 -05:00
Steven Miers
d76899be54
VRFS-3359 : Teacher profile REST functions.
2015-08-08 15:00:44 -05:00
Steven Miers
968722bf80
VRFS-3359 : Routes and controller API, with test.
2015-08-08 15:00:16 -05:00
Jonathan Kolyer
c11cc5eb9e
added fixmes for sql injection vulnerabilities
2015-08-04 14:11:46 +00:00
Jonathan Kolyer
6a806a05cb
VRFS-3393 merging musician-search2 into develop
2015-08-04 14:10:02 +00:00
Jonathan Kolyer
aa36b2f215
merging develop
2015-08-04 13:44:47 +00:00
Seth Call
55ccf89e64
* VRFS-3396 took out carmen gem; database in production/staging has display names in db
2015-07-28 14:11:28 -05:00
Steven Miers
c89d537904
VRFS-3359 : Teacher profile, staged validations and specs.
2015-07-28 14:00:14 -05:00
Steven Miers
98110f68bc
VRFS-3359 : Save and test other segments of teacher profile.
2015-07-27 17:00:39 -05:00
Seth Call
0c58a0c1d3
* VRFS-3364 - show metronome while jamtrack is open
2015-07-27 15:35:21 -05:00
Steven Miers
460783a5aa
VRFS-3359 : Teacher models, relationships, some validations, and initial tests.
2015-07-27 10:02:37 -05:00
Steven Miers
cb3137ff80
VRFS-3359 : Teacher Profile Migrations
2015-07-24 18:32:29 -05:00
Steven Miers
823da09ef3
Re-add NULL constraint.
2015-07-24 16:57:48 -05:00
Seth Call
bf0e29952e
* VRFS-3381 - make sure a recorded jamtrack shows up correctly
2015-07-24 14:57:01 -05:00
Seth Call
395fa21318
* VRFS-3368 - show muted icon if either output mixer is muted
2015-07-24 14:21:45 -05:00
Seth Call
a3b2a7d0aa
* VRFS-3384 - ensure that .always fires in session refresh, requiring a try/catch wrap
2015-07-24 13:16:15 -05:00
Seth Call
b1b8708195
* VRFS-3382 - control my chat and peer chat with master volume slider
2015-07-24 12:33:25 -05:00
Seth Call
afa1d449ca
* VRFS-3385 - metronome flicker code removed, fixing some error scenarios
2015-07-24 12:20:10 -05:00
Seth Call
0f85888479
* VRFS-3356, VRFS-3371 - deal with async timing issues for self and remote peers as you join a session
2015-07-23 21:00:39 -05:00
Seth Call
b777fb5364
* VRFS-3356 - use SessionStore currentSessionId directly
2015-07-23 16:30:55 -05:00
Seth Call
dfc0ea596a
* VRFS-3356 - use SessionStore currentSessionId directly
2015-07-23 16:26:51 -05:00
Seth Call
0fe883cd1e
* give network test more time, VRFS-3356 - correlate backend tracks attempt #1
2015-07-23 16:10:56 -05:00
Seth Call
05028cc45c
* noop
2015-07-23 15:00:48 -05:00
Seth Call
82b0272786
* VRFS-3374 - relative move of media group
2015-07-23 14:12:44 -05:00
Seth Call
dd579f8c32
* VRFS-3373 - tell remote users about the MIXER button if they mess with volume/pan
2015-07-23 11:53:24 -05:00
Seth Call
125f50872f
* VRFS-3370 - mute button show logic was busted
2015-07-23 11:01:48 -05:00
Seth Call
2027b90705
* don't show metronome popup just because metronome is active in backend
2015-07-23 09:47:14 -05:00
Seth Call
e779d25955
* VRFS-3366 - make the 'Music' volume affect 5 categories, not just one
2015-07-22 17:46:33 -05:00
Seth Call
e143dc4e1f
* VRFS-3361 - make sure we leave the session in all cases that you leave the session screen
2015-07-22 09:55:28 -05:00
Seth Call
a4b3ff4b03
* fix up the 'no local tracks' font sizing and click behavior
2015-07-22 09:30:28 -05:00
Seth Call
6fede36b04
* protect against double-activation of search of find session screen
2015-07-22 08:16:00 -05:00
Seth Call
bade8884f3
* stop influxdb prints in web tests
2015-07-22 07:52:41 -05:00
Steven Miers
82dd27754c
Tweak
2015-07-22 02:54:10 +00:00
Seth Call
80edd3f8f5
* VRFS-3356 temmporary patch for MyTracks being missing
2015-07-21 21:01:13 -05:00
Steven Miers
82aa6bb244
Use scopes to clean up.
2015-07-21 19:14:18 -05:00
Steven Miers
46cd9c4798
Remove stray debug output.
2015-07-21 18:10:45 -05:00
Steven Miers
35ec59ff97
Merge branch 'develop' into feature/ratings
2015-07-21 16:56:40 -05:00
Steven Miers
2d4ce4cf3c
VRFS-3316 : Review cleanup, new tests
2015-07-21 16:55:40 -05:00
Seth Call
45e8ab0480
* VRFS-3358 - UserMedia/MediaTrack group association corrected for the group controls of any media track
2015-07-21 16:12:04 -05:00
Steven Miers
1262dbfcc6
VRFS-3316 : Reviews : routes and api controller
...
* Expose review query methods as an API/rest interface.
* Required updates to model
* Spec to verify
2015-07-21 14:47:35 -05:00
Seth Call
f76987c2e5
* VRFS-3351 - advise users why they can't adjust volume remotely on media tracks
2015-07-21 14:26:03 -05:00
Seth Call
609cdacec3
* still trying to fix find session tests; aestetic tweaks to session screen (VRFS-3355 and VRFS-3354)
2015-07-21 13:23:12 -05:00
Seth Call
1cd05ff7b4
* found one escape hatch issue when coming in from account page for a JamTrack session, and removed some extra logging
2015-07-21 08:40:07 -05:00
Seth Call
4345d898f7
* VRFS-3348 - support JamTrack opening automatically when opened from account page
2015-07-21 08:08:34 -05:00
Steven Miers
bd4b3380c2
VRFS-3316 : Review query method and spec to verify.
2015-07-20 20:33:20 -05:00
Steven Miers
74b8c81a8a
VRFS-3316 : Review query method and spec to verify.
2015-07-20 19:11:52 -05:00
Steven Miers
2c594bf783
VRFS-3316 : Reduce method to roll up reviews
...
* Creates review_summaries
* Calculate and store wilson score
* Unit tests
2015-07-20 16:49:22 -05:00
Seth Call
131c2dc95b
* mark another test intermittent
2015-07-20 14:10:01 -05:00
Seth Call
472c86497d
* fix syntax error
2015-07-20 14:04:16 -05:00
Seth Call
6de0253c4c
* trying to fix these find session test failures
2015-07-20 13:52:36 -05:00
Seth Call
b11c707155
* add intermittent:true to avoid certain tests
2015-07-20 12:56:47 -05:00
Seth Call
0a6cde40a5
* add help to metronome master view VRFS-3347
2015-07-20 12:25:55 -05:00
Seth Call
7c70a36d80
* allow youtube_spec to be excluded by build server
2015-07-20 11:58:33 -05:00
Seth Call
03e8b1e036
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2015-07-20 11:38:16 -05:00
Seth Call
2171f06685
* VRFS-3347 - disable metronome in master mix view (still can't get helpbubble to show), update password of google account
2015-07-20 11:38:04 -05:00
Steven Miers
4b52d97a64
VRFS-3316 : Review summary uniqueness validation and spec.
2015-07-20 11:35:16 -05:00
Steven Miers
0beb386bea
VRFS-3316 : Review Uniqueness validation and spec.
2015-07-20 11:29:19 -05:00
Steven Miers
91a8b4ab9c
VRFS-3316 : Reviews/Ratings
...
* schemas for reviews and review_summaries
* migrations
* models
* validations
* initial specs to verify creation of reviews and review_summaries with
a jamtrack and subsequently, various validations.
2015-07-20 11:01:08 -05:00
Steven Miers
f13d14b62d
Some brief notes on the youtube spec.
2015-07-20 10:45:55 -05:00
Seth Call
e53af19dc6
* fixing more tests
2015-07-20 08:59:24 -05:00
Seth Call
4b7e7c1c7f
* ignore ssl errors in phantomjs
2015-07-20 07:58:15 -05:00
Seth Call
f6d54a57f5
* test fixes
2015-07-19 09:57:40 -05:00
Seth Call
35e07c3d7f
* trying to protect against leaky data in ruby tests
2015-07-18 14:41:29 -05:00
Seth Call
a9dc1c92b7
* VRFS-3344 - ensure popups are all removed when you leave a session
2015-07-18 14:26:50 -05:00
Seth Call
ecc575c7d9
* fixnig download spec
2015-07-18 07:49:45 -05:00
Seth Call
2a2ad4a378
* test fix
2015-07-17 19:32:58 -05:00
Seth Call
1cec394698
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2015-07-17 16:02:45 -05:00
Seth Call
d280a53e48
* fix metronome personal/master bug; try to fix intermittent fail
2015-07-17 16:02:36 -05:00
Steven Miers
339c681900
Fix musician search spec to pass updated user validation logic.
2015-07-17 16:01:43 -05:00
Steven Miers
d999978f84
VRFS-3335 : Conditional validation for hourly rate and daily minimum when editing profile.
...
* Use conditional validation on server side
* Don’t always convert empty to 0 on client side
* On view, manipulate visibility of dependent items through classes.
2015-07-17 13:42:48 -05:00
Seth Call
af870d3439
* trying to fix find_session tests and others
2015-07-17 12:16:16 -05:00
Seth Call
d8e712e85c
* fixing more tests and slight style issues
2015-07-17 11:52:46 -05:00
Seth Call
40d5e2bc17
* delete all music sessions before ruby test (uncessary until figure out root cause)
2015-07-17 09:50:48 -05:00
Seth Call
9e74df841f
* video button is conditional in session screen based on config
2015-07-17 09:49:48 -05:00
Seth Call
a54e7cb0b4
* updated mute/volume icon
2015-07-17 09:36:47 -05:00
Seth Call
67f433040f
* fix user_progression tests for download page
2015-07-17 08:11:30 -05:00
Seth Call
a1bd2d6941
* try fixing find session tests when run with existing test data
2015-07-17 07:30:16 -05:00
Seth Call
d4ab19d792
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2015-07-17 07:18:33 -05:00
Seth Call
c5033435f2
* fixing feed_spec
2015-07-17 07:18:27 -05:00
Steven Miers
d332932b27
VRFS-3334 : Proper initialization of webcam viewer with unique parents. Trigger resolution change when select box changes.
2015-07-16 16:39:39 -05:00
Seth Call
fbc6c0517c
* marking some tests pending while debugging them
2015-07-16 16:09:42 -05:00
Seth Call
cd37c85c68
* fix more tests and disable autorun of test-unit now that we have to include it as a dependency
2015-07-16 13:55:00 -05:00
Seth Call
be26beae09
* fix band_spec intermittent test
2015-07-16 13:12:48 -05:00
Seth Call
55c1d2fb41
* trying to fix transition to 2.2.2
2015-07-16 11:48:17 -05:00
Seth Call
efe3dea8e3
* updating Rails to 3.2.22 to allow compat with ruby 2.2.2
2015-07-16 10:58:03 -05:00
Seth Call
db3ffafd38
* adding SHOULD BE unnecessary before-all rspec blocks to clean db state for tests that tend to fail intermittently. (workaround for some real problem)
2015-07-15 21:00:35 -05:00
Seth Call
921c2ddd5e
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2015-07-15 20:42:44 -05:00
Seth Call
3e11f7a5eb
* VRFS-3339 - small aesthetic tweaks to session screen
2015-07-15 20:42:34 -05:00
Steven Miers
bbcfd3336e
VRFS-3332 : Band setup : validate genres only when on the correct step AND the next button is used.
2015-07-15 20:05:24 -05:00
Steven Miers
f389f07b52
VRFS-3338 : Tests for genre validation behavior.
2015-07-15 19:33:10 -05:00
Steven Miers
7f35bab8c7
Fixes VRFS-3338 : Set & validate genres on updates to a valid band.
2015-07-15 18:56:45 -05:00
Steven Miers
ef949590fe
Remove stray log.
2015-07-15 17:07:24 -05:00
Steven Miers
2f5e7a71e6
Fixes VRFS-3337 : Fixes youtube spec / google login to match new behavior.
2015-07-15 17:05:11 -05:00
Steven Miers
42d4e9723c
VRFS-3336 : Fix final save button on edit account profile.
...
* Only bind the screen to ‘account/profile/samples’ if it is the user
version
* Parent parameter was being overwritten; change to use the provided
argument.
2015-07-15 17:05:11 -05:00
Seth Call
946313d56b
* more clean up to ensure clean start on test
2015-07-15 15:13:44 -05:00
Seth Call
c7dd8fe095
* whack bands created in 'shared_example' manually
2015-07-15 14:57:24 -05:00
Seth Call
6b70483743
* restoring admin packaging phase, debugging ruby test problem
2015-07-15 12:12:29 -05:00
Seth Call
393696a0f8
* fixing ruby tests and trying to harvest up db deb's better
2015-07-15 11:25:58 -05:00
Seth Call
3b71931e73
merge conflict from feature/new_session (VRFS-3283)
2015-07-15 10:04:45 -05:00
Steven Miers
f2ce59005a
VRFS-3321 : Disable create account submit button until successful recaptcha callback. Re-disable if captcha expires.
2015-07-10 15:46:49 -05:00
Steven Miers
a467388ac8
Merge test fix
2015-07-10 11:09:16 -05:00
Steven Miers
2761ea8ed7
Merged session reminder feature branch.
...
Squashed commit of the following:
commit 84293ed637
Author: Steven Miers <steven.miers@gmail.com>
Date: Thu Jul 9 17:52:26 2015 -0500
VRFS-3300 : Reminder notification functionality -- sends in-app/1-day/upcoming emails as necessary.
commit 521b0f4ba7
Author: Steven Miers <steven.miers@gmail.com>
Date: Thu Jul 9 17:50:33 2015 -0500
VRFS-3300 : Reminder mails on user mailer. Also add tests to spec.
commit ed487e11a3
Author: Steven Miers <steven.miers@gmail.com>
Date: Thu Jul 9 17:48:04 2015 -0500
VRFS-3300 : Music session reminder job and spec
commit e5c7f50cd2
Author: Steven Miers <steven.miers@gmail.com>
Date: Thu Jul 9 17:46:55 2015 -0500
VRFS-3300 : Reminder cron setting
2015-07-10 10:51:12 -05:00
Steven Miers
614cfcbe85
Merge feature/calendaring branch:
...
commit 8023d6481c
VRFS-3276 : Hook calendar creation into user controller API. Add test to verify.
commit 3a35002a46
VRFS-3276 : Calendar cleanup job
* Add cleanup method to calendar manager
* Create a daily job.
* Add calendar cleanup to that job.
* Add CRON entry
* Daily job/ calendar cleanup test cases
* Fix calendar manager spec for new required attribute
commit 3ff5910f1f
VRFS-3276 : Add a delete-calendar directive when RSVP is canceled.
VRFS-3276 : Include path to partial. This fails depending on the method used to start the web server.
commit d2441cbf57
VRFS-3276 : Test new calendar features. Use icalendar gem in test mode only to more deeply verify calendar in strict mode.
commit 9ac272a0fb
VRFS-3276 : Calendar manager updates to include manual calendars. Some refactoring to keep common stuff in one place.
commit b5d0c758f0
VRFS-3276 : Schema, model updates and new calendar model.
commit 20472b6b26
VRFS-3276 : Change initial submit behavior of RSVP dialog to display calendar info. The user can then close the dialog after this prompt.
commit 77c99103d0
VRFS-3276 : Calendar feed markup and styling. Included as partial.
commit e632f48600
VRFS-3276 : Routes and controller implementation of user calendar ICS feed, which uses calendar manager.
commit 21fd80a188
VRFS-3276 : Initial tests for calendar manager
commit 92a2524c65
VRFS-3276 : Calendar manager
* Streamline logic
* Enable recurring sessions through rrule
* Implement method to create ics feed for user
* Extract a type-safe scheduled duration method on music_session for
external and internal use.
commit b71ad3a4cd
VRFS-3276 : Include calendar manager
commit f8eaafd036
VRFS-3276 : Calendar Manager - initial checkin
* Create ICS events given individual parameters
* Create calendar from music session
* Also will create ICS “delete” events
2015-07-06 15:34:27 -05:00
Jonathan Kolyer
832e716e8b
Merge branch 'feature/musician_profile_enhancements' into feature/musician_search2
2015-06-28 19:52:45 +00:00
Jonathan Kolyer
4f2f37f7a9
removed latency as search; fixed regressions
2015-06-28 19:49:02 +00:00
Jonathan Kolyer
4f897fc6aa
VRFS-3036 fixed typo referencing old constant SKILL_VAL_STRS
2015-06-28 04:00:44 +00:00
Seth Call
5c79bdab5c
* make unsubscribed work, and only dump first_name
2015-06-20 14:49:11 -05:00
Seth Call
c5bc95c562
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2015-06-20 14:04:13 -05:00
Seth Call
53d62f1087
* synchronize jam-admin and jam-web secret token
2015-06-20 14:03:24 -05:00
Steven Miers
0d8beef0e2
VRFS-3190 : Last band test fixed
2015-06-17 15:56:29 -05:00
Steven Miers
75779da846
VRFS-3190 : Fix saveInvitations method
2015-06-17 15:05:19 -05:00
Steven Miers
d37383a578
VRFS-3190 : Fix more band tests.
2015-06-17 15:04:27 -05:00
Steven Miers
104a0c015a
VRFS-3190 : Fix another band test, add constant, more cleanup.
2015-06-17 08:24:57 -05:00
Steven Miers
e6d1980495
VRFS-3190 : Fix band tests, add new tests for new tabs / cleanup
2015-06-16 17:55:55 -05:00
Steven Miers
cfda14e16e
VRFS-3190 : Merge with latest develop branch
2015-06-16 12:23:57 -05:00
Seth Call
2da5b3804e
* * delete broadcast views when user is deleted (for tests)
2015-06-16 08:21:41 -05:00
Seth Call
5af9d759f2
* delete broadcast views when user is deleted (for tests)
2015-06-15 20:54:40 -05:00
Steven Miers
02be103694
VRFS-3190 : Fix band model tests
2015-06-15 19:09:25 -05:00
Steven Miers
bd0c931df0
VRFS-3270 : Fix submit button on edit musician profile screen.
...
This was broken when changing from ids to classes on screens common to
band and user profiles.
2015-06-15 18:23:31 -05:00
Steven Miers
c5285002e4
VRFS-3247 : Hide online presence and performance sample icons by default. Avoids flash at page load time.
2015-06-15 18:11:27 -05:00
Steven Miers
e72980a32e
VRFS-3248 : Band profile - history
...
* Allow context.JK.Feed to be attached to band, passing through to jam
rest as necessary. Hook up from band profile JS.
* Markup and styling for feed on band profile history tab.
2015-06-15 18:10:17 -05:00
Seth Call
9ff44a21ac
* deal with changed ChannelGroupIds enum in backend
2015-06-15 13:58:21 -05:00
Steven Miers
9b24e0c05b
VRFS-3247 : Band profile - use classes instead of ids for embedded partials.
2015-06-11 17:33:04 -05:00
Seth Call
6afcc84088
* only list users who have opted into email
2015-06-10 16:41:52 -05:00
Steven Miers
4e8d563184
VRFS-3247 : JS rendering of band instruments, current interests and experience.
2015-06-10 15:34:43 -05:00
Steven Miers
8cd3b836ea
VRFS-3247 : Band's online presence and performance samples specify foreign key so it won’t default to a nonexistent field name.
2015-06-10 15:31:36 -05:00
Seth Call
622f750b2d
* VRFS-3261 add link to let sendgrid pull our users email info down for emailing out good unsubscribe links
2015-06-10 15:14:15 -05:00
Jonathan Kolyer
5d8ba22172
VRFS-3036 added performance sample test case
2015-06-10 16:36:58 +00:00
Jonathan Kolyer
ebe620a3b3
VRFS-3036 fixed performance sample query and test
2015-06-10 16:35:39 +00:00
Jonathan Kolyer
1ad3f6a79f
VRFS-3036 css tuning
2015-06-10 16:07:49 +00:00
Seth Call
0dbbfc0ee7
* VRFS-2855 - broadcast notifications done
2015-06-10 08:26:45 -05:00
Jonathan Kolyer
405350c649
VRFS-3036 CSS tuning and integration testing
2015-06-09 07:09:05 +00:00
Jonathan Kolyer
745c448e6b
VRFS-3036 CSS tuning and integration testing
2015-06-09 06:46:34 +00:00
Jonathan Kolyer
c40d7c5f62
VRFS-3036 CSS tuning
2015-06-09 05:39:03 +00:00
Jonathan Kolyer
b49b44f724
VRFS-3036 CSS tuning
2015-06-09 04:56:14 +00:00
Jonathan Kolyer
1137420175
VRFS-3036 CSS tuning
2015-06-08 06:48:41 +00:00
Jonathan Kolyer
119b4fcb12
VRFS-3036 CSS tuning
2015-06-08 06:30:30 +00:00
Jonathan Kolyer
0be7146e4f
VRFS-3036 CSS tuning
2015-06-08 06:11:55 +00:00
Steven Miers
141ee5f2e7
VRFS-3247 : Band Summary - About
...
* Layout and styling for musical experience, performance samples,
online presence, and current interests.
* Refactor online presence icons into slim partial and use from both
musician and band profile
* Refactor performance sample icons into slim partial and use from both
musician and band profile.
* Hook up buttons: edit, delete, invite, edit bio.
2015-06-06 10:17:32 -05:00
Steven Miers
0967513a4d
VRFS-3247 : Cleanup/rename.
2015-06-05 17:22:50 -05:00
Steven Miers
ba52794c3d
VRFS-3247 : Refactor rendering logic to util class. Incremental.
2015-06-05 15:56:19 -05:00
Steven Miers
01c3b8af5f
VRFS-3190 : Use scoped classes instead of ids for navigation buttons. Initialize musician profile samples properly.
2015-06-05 12:55:55 -05:00
Steven Miers
61268bdc30
VRFS-3190 : Fix race condition. Init should be called in the same asynchronous block as construction.
2015-06-05 09:24:49 -05:00
Steven Miers
cb058e851b
VRFS-3190 : Several bug fixes for band profile
...
* Storing validator in window was screwing things up now that we have
multiple of these. This is now stored at the class instance level.
* Deleting a performance sample didn’t delete it from the validator, as
the comparison was flaky.
* Styling fixes
2015-06-04 18:55:15 -05:00
Steven Miers
972b65c4ef
VRFS-3190 : Fix a few functional and style problems. Cleanup as necessary.
2015-06-04 14:05:20 -05:00
Jonathan Kolyer
d099ca039d
VRFS-3036 description testing
2015-06-04 08:17:46 +00:00
Jonathan Kolyer
0691e079af
VRFS-3036 description testing
2015-06-04 08:11:41 +00:00
Jonathan Kolyer
965ee2e0bc
VRFS-3036 tests for description
2015-06-04 07:38:16 +00:00
Jonathan Kolyer
3eca6aeee5
Merge branch 'feature/musician_profile_enhancements' into feature/musician_search2
2015-06-04 05:59:31 +00:00
Jonathan Kolyer
56af10afb3
VRFS-3036 results / builder page swpping
2015-06-04 05:54:02 +00:00
Steven Miers
b39c314e5b
VRFS-3246 : Scope the unstopped selector.
2015-06-03 17:44:17 -05:00
Steven Miers
c800ea8b00
Fix wayward merge.
2015-06-03 17:23:11 -05:00
Steven Miers
6c5ffd6644
VRFS-3246 : Cleanup code and style
2015-06-03 16:34:37 -05:00
Steven Miers
bf14fa9926
VRFS-3246 : Allow parent to be specified to instance of SiteValidator. This allows multiple instances of the same site_type.
...
Also, change the way the validators are invoked. Uses classes instead
of ids, again as there are now multiple of a site_type.
2015-06-03 16:34:19 -05:00
Steven Miers
d5a8959677
Merge with develop.
2015-06-03 14:22:21 -05:00
Jonathan Kolyer
dde84587b9
VRFS-3036 syncing ui/json
2015-06-03 06:41:21 +00:00
Steven Miers
d60eff50ba
VRFS-3246 : Support online presences and performance samples through sub-widget. Incremental.
2015-06-02 15:13:41 -05:00
Steven Miers
bd8287b528
VRFS-3246 : Remove references to current_user, change to target_player.
2015-05-31 21:50:04 -05:00
Steven Miers
1f076dcc75
VRFS-3246 : More reliable layout and styling for online presence and performance samples.
2015-05-31 20:14:18 -05:00
Steven Miers
4dbf2e1c95
VRFS-3246 : Refactoring to allow online presence and samples controls to be used on bands -- incremental.
2015-05-31 17:35:09 -05:00
Steven Miers
a571f726eb
VRFS-3245 : Correct parent so validation message displays.
2015-05-31 16:05:41 -05:00
Steven Miers
a22a77bbb6
VRFS-3245 : Fix genre validation on wrong step.
2015-05-31 14:54:29 -05:00
Steven Miers
7f02ca5240
VRFS-3245 : Hook up help hover bubbles
...
* Refactor common profile help bubble initialize convenience function
to profile_utils.
* Add new hover bubble text and hook up via HTML attribute on anchor tag
2015-05-31 09:53:28 -05:00
Seth Call
cdaac868de
* JamPermissionError instead of PermissionError
2015-05-30 13:30:32 -05:00
Seth Call
b436ed7da3
build bump
2015-05-30 08:01:17 -05:00
Seth Call
ecd8b75f91
* fix case in raleway assets path
2015-05-29 23:21:29 -05:00
Seth Call
7199a76e3d
* cors gem added to gemfile for cloudfront and https
2015-05-29 22:41:01 -05:00
Seth Call
2cb01d8492
* VRFS-3268 - make bugsnag and recurly async
2015-05-29 21:33:45 -05:00
Steven Miers
540c3cc37f
VRFS-3245 : Instrument selector
...
* Wrap instrument selector widget in dialog widget and delegate as
necessary
* Add instrument info to band api result
* Integrate with band setup flow
* Style to approximate spec
* Fix a few logic and syntax errors encountered along the way
2015-05-29 21:04:33 -05:00
Seth Call
8e75465ccd
* VRFS-3268 - use our own webfont
2015-05-29 17:09:52 -05:00
Seth Call
666fbfff2a
* remove stats write for now, until stats server is hTTPs
2015-05-29 16:22:32 -05:00
Seth Call
43b92d4a17
* VRFS-3264 - help bubbles on jamtrack browse screen when not logged in, VRFS-3267 help IE11 visualize jamtrack browse page correctly
2015-05-29 15:30:23 -05:00
Steven Miers
d91d0b0cfe
VRFS-3245 : Instrument selector dialog -- incremental.
2015-05-28 22:41:03 -05:00
Steven Miers
dbd161a068
VRFS-3245 : Change "edit profile" to "set up band".
2015-05-28 22:40:19 -05:00
Steven Miers
c02f8ceda8
VRFS-3245 : Fix reset form logic.
2015-05-28 22:39:32 -05:00
Steven Miers
a4317a532b
VRFS-3245 : Render optional controls
...
* If new member is wanted, show play commitment and touring option
* If paid gigs, show amount and gig minimum
* Works largely through class names.
2015-05-28 17:12:39 -05:00
Seth Call
6e2145abea
* up the sample rate
2015-05-28 15:31:11 -05:00
Seth Call
dd8b45cc28
* update how we track with GA (add more options)
2015-05-28 15:20:28 -05:00
Seth Call
07e8397187
* add in page name
2015-05-28 15:04:20 -05:00
Steven Miers
8d73ef6aac
VRFS-3245 : Serialize additional attributes.
2015-05-28 14:21:55 -05:00
Seth Call
6ba4c4d280
* remove debugging print
2015-05-28 14:06:08 -05:00
Seth Call
90dbb395bd
* fix navigation timings
2015-05-28 13:57:07 -05:00
Seth Call
de4411fbdd
* add preview text and preload master on landing page
2015-05-28 13:52:20 -05:00
Seth Call
54a7cb40c9
* turn timing off, and track with GA
2015-05-28 11:10:50 -05:00
Seth Call
e9504b1fc6
* performance API and color changes on affilate page
2015-05-28 10:34:07 -05:00
Seth Call
31a0803019
* VRFS-3226 - default WDM to 48000 on selection. fix bad filter logic for monthly payments (VRFS-3030)
2015-05-28 08:53:24 -05:00
Seth Call
d959a17be4
* affiliate program in place VRFS-3030
2015-05-28 08:20:14 -05:00
Steven Miers
9d59e53679
VRFS-3245 : Tweak style/layout to more closely match spec.
2015-05-27 16:14:00 -05:00
Steven Miers
c714b98af1
VRFS-3245 : Integrate iCheck and style accordingly.
2015-05-27 13:11:12 -05:00
Jonathan Kolyer
4f5a39db18
VRFS-3036 band results display
2015-05-27 15:08:04 +00:00
Jonathan Kolyer
e50dc6e20d
VRFS-3036 band search results
2015-05-27 12:17:42 +00:00
Jonathan Kolyer
b64aff9fdc
VRFS-3036 merging
2015-05-27 09:17:36 +00:00
Jonathan Kolyer
1bd1794318
VRFS-3036 band web search args
2015-05-27 08:20:46 +00:00
Jonathan Kolyer
8480f582ad
VRFS-3036 tuning band search filter spec
2015-05-27 05:08:56 +00:00
Jonathan Kolyer
f66cf79cf2
VRFS-3036 band search filter tests
2015-05-27 04:10:05 +00:00
Jonathan Kolyer
9757712977
VRFS-3036 testing filter by key
2015-05-27 02:58:04 +00:00
Jonathan Kolyer
caca4165fe
merge feature/musician_profile_enhancements
2015-05-27 02:21:25 +00:00
Steven Miers
79af533348
VRFS-3245 : Layout and initial styling of band profile current interests screen -- incremental.
2015-05-26 21:17:25 -05:00
Jonathan Kolyer
38881216fc
VRFS-3036 genre filter spec
2015-05-27 02:14:39 +00:00
Jonathan Kolyer
7edee8d494
VRFS-3036 first pass testing
2015-05-26 08:43:11 +00:00
Jonathan Kolyer
2f28d3a342
VRFS-3036 band query
2015-05-26 06:39:43 +00:00
Steven Miers
064f402f59
VRFS-3244 : Add additional fields for musical experience. Fix a few bugs and style issues.
2015-05-23 13:00:22 -05:00
Steven Miers
c5fc6cb93d
Fix typos.
2015-05-23 08:36:48 -05:00
Jonathan Kolyer
cb7b48b4ec
VRFS-3036 band search querying
2015-05-22 12:09:14 +00:00
Jonathan Kolyer
da58ac6eab
merging
2015-05-22 08:20:07 +00:00
Jonathan Kolyer
b5f46329b3
VRFS-3036 tightening code
2015-05-22 08:09:52 +00:00
Jonathan Kolyer
14bce171c8
VRFS-3036 fixed nits
2015-05-22 07:48:05 +00:00
Jonathan Kolyer
777d4a39cb
VRFS-3036 tohire builder
2015-05-21 06:42:27 +00:00
Jonathan Kolyer
3af55a3c14
VRFS-3036 tohire builder
2015-05-21 05:47:14 +00:00
Steven Miers
a3c09bf8ad
VRFS-3244 : Incremental - Refactor some common code. Whack unused code.
2015-05-20 19:46:29 -05:00
Steven Miers
429d5ad35d
VRFS-3244 : New navigation logic for band profile editor -- incremental.
2015-05-20 14:17:53 -05:00
Seth Call
8a82f86e64
fix the fully redeemed count
2015-05-20 10:17:01 -05:00
Seth Call
c96f0a7859
* VRFS-3260 - fraud check code and admin helpers complete
2015-05-20 09:24:17 -05:00
Jonathan Kolyer
8d3247e084
VRFS-3036 to hire builder
2015-05-20 09:24:53 +00:00
Jonathan Kolyer
1a91704532
VRFS-3036 band search filters
2015-05-20 06:25:22 +00:00
Steven Miers
1c93cdb797
VRFS-3243 : Fix tests
2015-05-19 13:33:25 -05:00
Steven Miers
69a8f1e8be
VRFS-3243 : Some general style and code cleanup.
2015-05-19 13:33:07 -05:00
Steven Miers
f16bd28574
VRFS-3243 : Ability to selectively skip genre validation
2015-05-19 13:32:15 -05:00
Jonathan Kolyer
e794ccc7af
VRFS-3036 bands to_join builder controls
2015-05-19 05:48:29 +00:00
Jonathan Kolyer
d76f54b40e
VRFS-3036 fixed broken merge
2015-05-19 00:52:35 +00:00
Jonathan Kolyer
21f90d7352
merging
2015-05-19 00:45:53 +00:00
Steven Miers
826022d414
VRFS-3243 : Band profile basics
...
* Convert to HAML
* Update to look and layout.
* Update how avatar control is optionally hidden, so the table view
will still work properly.
* Prevent double-submits.
2015-05-18 19:19:54 -05:00
Steven Miers
d684ecda3b
Merge with latest from develop and manually fix.
2015-05-18 16:02:07 -05:00
Seth Call
48f61552ce
* VRFS-3216 - send up stats more fully formed
2015-05-18 14:18:48 -05:00
Seth Call
1be53f2563
* VRFS-3216 - refine landing events
2015-05-18 14:08:39 -05:00
Seth Call
781a9838b7
* VRFS-3216 - add virtual page views for JamTrack funnels, add test mode for fraud check VRFS-3260
2015-05-18 10:33:58 -05:00
Jonathan Kolyer
737367b016
VRFS-3036 building out band search filter features, refactoring musician search filter
2015-05-18 04:00:12 +00:00
Seth Call
f5595a03d5
* actually send email when fraud detected
2015-05-16 10:18:35 -05:00
Seth Call
a62aaeef11
* VRFS-3260 - fraud check allowed in tests
2015-05-15 23:50:27 -05:00
Seth Call
792212e952
* VRFS-3260 - disable fraud
2015-05-15 23:28:46 -05:00
Seth Call
0264c539b1
*hardcoding https where http is found
2015-05-15 18:25:47 -05:00
Seth Call
515b2013cc
* fix details showing for metadata VRFS-3254
2015-05-15 16:24:58 -05:00
Seth Call
b0cfad89f1
* fix any youtube URI in http
2015-05-15 16:14:18 -05:00
Seth Call
2c6a5fe81a
* fix facebook signup issues VRFS-3253
2015-05-15 16:01:39 -05:00
Seth Call
eba9afab04
* fix bug in ability to open JamTrack
2015-05-15 15:30:15 -05:00
Seth Call
8e7ebcf3d6
* VRFS-3236 - update landing pages for jamtracks
2015-05-15 15:02:00 -05:00
Seth Call
939f8cdf82
* VRFS-3255 (shopping cart only on /client) , VRFS-3253 - frictionless shopping done with tests
2015-05-15 12:34:35 -05:00
Steven Miers
c5ee5a58fd
VRFS-3242 : Fix one last reference to user_id.
2015-05-13 23:23:30 -05:00
Steven Miers
726cd853bf
VRFS-3242 : Add missing included file. Fixes a bunch of tests.
2015-05-13 22:39:38 -05:00
Steven Miers
11f60b71e4
VRFS-3242 : Schema and model changes required for band profile functionality.
...
* Additional attributes for band_type, band_status, concert_count,
add_new_members, play_commitment, touring_option, paid_gigs,
hourly_rate, gig_minimum
* For joined table musician_instruments, remove the hard requirement
that they be joined to a user, rather a “player” that is polymorphic.
* For joined table performance_stamples, remove the hard requirement
that they be joined to a user, rather a “player” that is polymorphic.
* For joined table online_presences, remove the hard requirement that
they be joined to a user, rather a “player” that is polymorphic.
* Change models as appropriate with new attributes and modify
belongs_to / has_many directives as necessary.
* Fix existing usages of user_id to work with polymorphic player_id.
* Fix tests that use user_id
* Add new tests that exercise online_presence, performance_samples, and
instruments that target a band, rather than a user.
2015-05-13 21:06:14 -05:00
Steven Miers
193888f960
VRFS-3242 : Merge with latest develop
2015-05-13 20:56:58 -05:00
Seth Call
1a133c588d
* remove media seeking html
2015-05-12 15:46:34 -05:00
Seth Call
fb463d6703
* VRFS-3234 - auto-open jamtrack from account screen
2015-05-12 15:45:23 -05:00
Seth Call
9459215a0f
* reset filters if none specified VRFS-3237
2015-05-12 14:59:53 -05:00
Seth Call
41945d73fe
* VRFS-3211 - seek updated to be more responsive
2015-05-12 14:49:52 -05:00
Seth Call
9edc291ced
* VRFS-3211 - seek feature updated to be more responsive
2015-05-12 14:42:10 -05:00
Seth Call
2723cd8a78
* VRFS-3215 - add checkoutComplete URL
2015-05-12 14:14:44 -05:00
Seth Call
831fdf8c8e
* add https to artifact update
2015-05-12 11:55:55 -05:00
Seth Call
f1bc3b6498
* VRFS-3214 - adsense tracing code aded
2015-05-12 09:33:48 -05:00
Seth Call
64a64e99bb
* VRFS-2680 - try out audiomixer/quick mixer without secure PUT
2015-05-12 08:47:26 -05:00
Steven Miers
b0fd3fd4c8
VRFS-3007 : Test for presence of online presence and performance samples for musician profile feature. Also, add classes to ease identification of dynamically added elements. Fix a few style issues.
2015-05-11 17:25:57 -05:00
Steven Miers
294c01d44a
Merge with latest develop
2015-05-11 17:25:37 -05:00
Seth Call
4709622546
* VRFS-2680 - adding redirect logic for ssl
2015-05-11 16:52:58 -05:00
Seth Call
643595c531
* fix typo in SSL support VRFS-2680
2015-05-11 13:45:36 -05:00
Seth Call
f2aba1e390
* VRFS-3235 - download helper
2015-05-11 11:15:57 -05:00
Seth Call
8c04a601ab
* add required websocket configs
2015-05-11 09:50:45 -05:00
Steven Miers
a23033ebcd
VRFS-3007 : Dedicated tests for musician profile -- incremental
2015-05-11 09:03:08 -05:00
Steven Miers
ec6f50bc70
VRFS-2858 : Soundcloud recording widget. Hooked up on profile summary page.
2015-05-09 20:08:49 -05:00
Seth Call
62b6820e90
* VRFS-3220 - estimate taxes manually
2015-05-09 08:30:12 -05:00
Steven Miers
7beacb1803
VRFS-3227 : Genre selector dialog:
...
* Change from table to a 3-column list
* Format/spacing for caption
2015-05-08 19:07:08 -05:00
Seth Call
35057a4da0
* skip default input when querying sample rate
2015-05-08 18:39:04 -05:00
Steven Miers
eaf4f49763
VRFS-3015 : Add list items as necessary and remove ordinal selectors. This prevents both some spacing issues and flash of empty list items seen when the form is loaded.
2015-05-08 17:51:33 -05:00
Steven Miers
3314515577
VRFS-3105 : Update online presence after updating, and not just on init. Also call show on the appropriate elements, as they could be hidden if an item is being set for the first time.
2015-05-08 16:44:55 -05:00
Seth Call
b80cf2f1cc
* don't set chat's sample rate
2015-05-08 16:00:30 -05:00
Steven Miers
ca46ffa43b
VRFS-3104 : Profile Sample edit screen : fix list items displaying over one another.
2015-05-08 15:36:37 -05:00
Seth Call
e5e6742400
* VRFS-3225 - don't show sampler dropdown if old client
2015-05-08 15:35:17 -05:00
Steven Miers
81464a5cd6
VRFS-3104 : Fix overlapping of divs and alignment on profile sample edit screen.
2015-05-08 15:34:20 -05:00
Seth Call
10da152916
* VRFS-3225 - show sampler ate dropdown
2015-05-08 15:03:19 -05:00
Steven Miers
183f5a5fdd
VRFS-3046 : Add profile interest help bubbles (topics stored as attributes on element)
2015-05-08 11:45:13 -05:00
Steven Miers
6d6307f9c9
VRFS-3047 : Polish Save & Next buttons on profile editing screens.
2015-05-07 18:01:12 -05:00
Seth Call
f2e2a79b5b
* VRFS-3220 - estimated taxes fixed
2015-05-07 14:48:28 -05:00
Seth Call
2495f58bf5
* VRFS-3220 - estimated taxes fixed
2015-05-07 14:48:16 -05:00
Jonathan Kolyer
6fb07d8a31
VRFS-3036 more refactoring
2015-05-07 19:02:21 +00:00
Jonathan Kolyer
13c1c5311e
VRFS-3036 more refactoring
2015-05-07 19:02:21 +00:00
Jonathan Kolyer
33cdb33f37
VRFS-3036 refactoring musician_search into base_search
2015-05-07 19:02:21 +00:00
Jonathan Kolyer
0b64986766
VRFS-3036 refactoring musician_search into base_search for band_search
2015-05-07 19:02:21 +00:00
Jonathan Kolyer
674d1de2d3
VRFS-3036 refactoring band search
2015-05-07 19:02:21 +00:00
Jonathan Kolyer
7e2e5241bf
VRFS-3036 refactoring musician_search into base_search for band_search
2015-05-07 19:02:21 +00:00
Jonathan Kolyer
5a6049c935
VRFS-3036 more refactoring
2015-05-07 18:08:36 +00:00
Seth Call
4df95f45fe
* jamtrack cleaner needs to be tested manually
2015-05-07 12:18:24 -05:00
Jonathan Kolyer
6a23477c4e
VRFS-3036 more refactoring
2015-05-07 17:11:24 +00:00
Jonathan Kolyer
4cf7f20844
VRFS-3036 refactoring musician_search into base_search
2015-05-07 15:21:39 +00:00
Jonathan Kolyer
4658f72f98
VRFS-3036 refactoring musician_search into base_search for band_search
2015-05-07 14:41:27 +00:00
Seth Call
840d2169b1
* remove puts/debug settings
2015-05-07 09:03:24 -05:00
Seth Call
0ea2931837
* add config to remove whitespace from credit card number. probably unnecessary; just doing now before release
2015-05-07 09:02:58 -05:00
Seth Call
dfe010d0a5
fix nothing in cart msg on shopping cart screen
2015-05-07 08:52:14 -05:00
Seth Call
12eeb460a3
* VRFS-3212 - track counts of concurrent packaging attempts
2015-05-07 08:49:15 -05:00
Jonathan Kolyer
749c58f377
VRFS-3036 refactoring band search
2015-05-07 13:21:53 +00:00
Jonathan Kolyer
ce3bf635f0
VRFS-3036 refactoring musician_search into base_search for band_search
2015-05-07 12:55:13 +00:00
Seth Call
f593a6d706
VRFS-3208 - let admins purchase anyway when pucrhase_nabled = false
2015-05-07 07:45:07 -05:00
Seth Call
76a4a13c41
* fixed the message that occurs when gear goes in/out of USB during FTUE
2015-05-06 22:44:16 -05:00
Seth Call
b523850296
* VRFS-3208 - add new config - purchases_enabled, so that we can stop purchases if needed
2015-05-06 22:09:07 -05:00
Seth Call
c8142c9b0f
* fix chat/recording button vertical alignment VRFS-3207
2015-05-06 21:13:29 -05:00
Seth Call
6e5472f219
* VRFS-3206 - cancel out of StopRecording earlier
2015-05-06 21:08:17 -05:00
Steven Miers
d964cff2a3
VRFS-3205 : Add max height and scrolling to genre selector dialog.
2015-05-06 16:34:36 -05:00
Steven Miers
2d1877926e
VRFS-3063 : Fix genre selection bug with proper use of unbind.
2015-05-06 16:07:14 -05:00
Seth Call
0b9d1c3ed2
* VRFS-3201 and probably VRFS-3202 - don't issue two stops to backend and don't issue two openrecordings
2015-05-06 15:54:06 -05:00
Steven Miers
7b5cdbf390
VRFS-3106 : Populate country name and state(region) labels using carmen gem.
2015-05-06 15:35:41 -05:00
Steven Miers
839eab5713
VRFS-3106 : Add clear:all to fix spacing problem
2015-05-06 15:15:45 -05:00
Steven Miers
d208a8cd82
VRFS-3007 : Change text to what is observed. I'm not 100% sure about this, so I'm going to run with it in this branch for a bit.
2015-05-06 13:26:23 -05:00
Steven Miers
cf6ceb6b38
VRFS-3007 : This doesn't actually appear (fixes test).
2015-05-06 13:25:12 -05:00
Steven Miers
ccb4680c36
This seems to be required now.
2015-05-06 13:24:21 -05:00
Steven Miers
a823be0b2e
VRFS-3007 : Stub non-existent method to fix test.
2015-05-06 13:24:03 -05:00
Seth Call
eaabd98ca4
* VRFS-3198 - fix simple boolean bug to rectify out of sync play/pause buttons on playcontrols
2015-05-06 11:54:09 -05:00
Seth Call
4c14e1fbee
* VRFS-3196 - pass correct value (even if it's ignored by backend today)
2015-05-05 18:45:14 -05:00
Seth Call
05f5cd619a
* VRFS-3193 - indicate on jamtrack browse page that 1st jamtrack is free
2015-05-05 16:38:29 -05:00
Seth Call
adfc3d18a9
* VRFS-3184 - user dropdown only shows get help, community, and support
2015-05-05 14:48:39 -05:00
Seth Call
ceb00c1735
* remove jamtrack download ready notification
2015-05-05 14:36:07 -05:00
Seth Call
6c40ede050
* bug in VRFS-3176 jamtrack preview regenerator
2015-05-05 11:46:58 -05:00
Seth Call
96df8cbfea
* disabling teaspoon gemfile for now, because of weird errors; and also VRFS-3176 (jamtrack preview regen task)
2015-05-05 11:44:28 -05:00
Seth Call
8f445883fd
VRFS-3146 - fixes for the get ready spiner
2015-05-05 10:29:30 -05:00
Seth Call
6c3cdda1d8
* VRFS-3186 - fix formatting of recording widget on homescreen
2015-05-05 09:58:44 -05:00
Seth Call
6c82e7e3d7
* VRFS-3183 - website home page to have signin
2015-05-05 09:31:11 -05:00
Seth Call
5970fae4fa
* VRFS-3188 - sort instrument appropriately
2015-05-05 09:22:15 -05:00
Seth Call
48c2b9a2b2
* VRFS-3187 - track when a user 1st downloads a jamtrack
2015-05-05 08:53:46 -05:00
Seth Call
d13204336b
* VRFS-3189 - don't include master track when checking for instruments
2015-05-04 22:06:35 -05:00
Seth Call
f31a40343e
* add jmep as warning to onboarding flags column
2015-05-04 21:45:26 -05:00
Seth Call
12ea7312a7
* VRFS-3168 - fix sidebar on session/recording landing pages
2015-05-04 21:36:40 -05:00
Seth Call
0ac94ae6fc
* VRFS-3167 - call context.jamClient.FTUELoadAudioConfiguration when dialog is loaded
2015-05-04 20:56:05 -05:00
Seth Call
1a191f1b0b
* VRFS-3178 - sort instrument by alpha
2015-05-04 18:27:28 -05:00
Seth Call
99fa64f4b0
* initialize inviter when user is logged in - VRFS-3180
2015-05-04 18:24:46 -05:00
Seth Call
6a3c9b85b2
* VRFS-3179 - tweaking text on jamtracks product page
2015-05-04 18:05:56 -05:00
Seth Call
6fdb784eb4
* remove title setter in downloads partial to fix title; VRFS-3185
2015-05-04 18:03:28 -05:00
Seth Call
af98559dfd
* VRFS-3181 hide availability filter
2015-05-04 18:01:03 -05:00
Seth Call
4d28915381
* VRFS-3177 - add spinner to playback and stop preloading all media on page
2015-05-04 17:48:14 -05:00
Seth Call
9144efb8fa
* VRFS-3175 - order filter by band dropdown
2015-05-04 14:50:27 -05:00
Seth Call
d77ee8cd23
* VRFS-3173 - stats on active sessions
2015-05-04 14:37:49 -05:00
Seth Call
17ce9f641d
* VRFS-3165 - stop preview widget by using pause, VRFS-3174 - stop preview when you leave page
2015-05-04 14:09:55 -05:00
Seth Call
73e422a2cc
* VRFS-2931 - show video as thumbnail - forgot youtube icon
2015-05-04 13:33:47 -05:00
Seth Call
b0dfccec85
* VRFS-2931 - show video as thumbnail
2015-05-04 11:16:13 -05:00
Seth Call
acc9e2112d
* call new sample rate setters when FTUE profile is created VRFS-3144
2015-05-04 09:01:51 -05:00
Seth Call
0ac1f977b5
update jamblaster video on home page and on product page
2015-05-04 08:54:42 -05:00
Seth Call
a2d5c0a2b9
* VRFS-3166 - only play one widget at a time
2015-05-04 07:52:30 -05:00
Seth Call
3069d6b077
* adding video to browse page VRFS-2931
2015-05-04 07:19:48 -05:00
Seth Call
5adc6fe217
* update more locations with wrong video for JamTracks
2015-05-03 22:56:46 -05:00
Seth Call
4cadabe19e
* VRFS-3149 - paginator arrows now working
2015-05-03 22:27:48 -05:00
Seth Call
c8daee4e00
* VRFS-3148 - column widths are consistent across pages
2015-05-03 22:20:39 -05:00
Seth Call
4cc9dbb896
* VRFS-3130 - slider shows 0 on stop
2015-05-03 22:07:23 -05:00
Seth Call
4be257c52e
* finishing up VRFS-2829 now that JamTracks video is available
2015-05-03 21:58:15 -05:00
Seth Call
23108544bc
* don't check against backend while user has stopped playing VRFS-3145
2015-05-03 21:48:31 -05:00
Seth Call
d5b12eacfa
* VRFS-3161 - don't use floats for one-liner; use white-space:no-wrap
2015-05-03 21:40:04 -05:00
Seth Call
7063d6e1ea
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2015-05-03 21:28:28 -05:00
Seth Call
f1c96c1531
* feature/VRFS-3146
2015-05-03 21:28:17 -05:00
Steven Miers
4c4121e4d7
Merge with latest develop
2015-05-01 20:00:08 -05:00
Steven Miers
4a83100f37
VRFS-3119 : Musician search bug fixes. Fixes some more tests.
2015-05-01 18:48:41 -05:00
Seth Call
32f0967b2a
* VRFS-3141 - tell user why they can't close JamTrack
2015-05-01 16:34:56 -05:00
Seth Call
3697ca9743
* VRFS-3141 - disable close button for JamTrack for non-opener
2015-05-01 16:34:29 -05:00
Seth Call
9f49e9f366
* disable close button for JamTrack for non-opener
2015-05-01 16:30:03 -05:00
Seth Call
7d313b2298
* VRFS-3136 - make sure the 'preferred' is chosen for device, so set the FTUE preferred sample mode
2015-05-01 15:40:42 -05:00
Steven Miers
77ce45d7c6
VRFS-3119 : Comment about broken feature/test.
2015-05-01 13:49:59 -05:00
Steven Miers
425916f31d
VRFS-3007 : Fix another bad method reference, and some more tests.
2015-05-01 13:49:28 -05:00
Steven Miers
571ae9a3d6
VRFS-3007 : Fix another musician search issue and a few tests.
2015-05-01 13:22:34 -05:00
Seth Call
7dec27083b
* VRFS-3139 - hide jamkazam virtual input text in account summary screen
2015-05-01 12:16:13 -05:00
Steven Miers
b39ab852ba
VRFS-3007 : Fix a few more musician search API and feature tests.
2015-05-01 12:09:23 -05:00
Seth Call
1cd57cb4e8
* VRFS-3118 - check for high latency while in session, VRFS-3138 - fix tons of issues with user downloading both sample rates
2015-05-01 12:09:18 -05:00
Steven Miers
6c1371c619
VRFS-3007 : Fix profile history specs.
2015-04-30 20:53:19 -05:00
Steven Miers
7359cb36bf
VRFS-3007 : Fix feed tests (bad selector).
2015-04-30 20:48:26 -05:00
Steven Miers
5ba6e1ed18
VRFS-3007 : Fix band feature specs (bad selector).
2015-04-30 20:37:40 -05:00
Steven Miers
51dc0c408a
Merge branch 'develop' into feature/musician_profile_enhancements
2015-04-30 19:33:04 -05:00
Steven Miers
d4d8489ef1
VRFS-3007 : Fix faulty logic when extracting recording data. Addresses a few test failures.
2015-04-30 19:31:44 -05:00
Steven Miers
86c483a0d5
VRFS-3007 : Fix tests that intermittently fail depending on order (always whack users before starting).
2015-04-30 13:14:25 -05:00
Seth Call
487736a619
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2015-04-29 22:03:24 -05:00
Seth Call
68b4ab529a
* VRFS-3118 - reload audio globally configurable
2015-04-29 22:03:02 -05:00
Seth Call
69ccf0d4e5
* VRFS-3118 - refresh latency by start/stopping audio system
2015-04-29 21:51:54 -05:00
Steven Miers
4ffb46b755
VRFS-3007 : Fix feed spec test failure (was intermittently passing only).
2015-04-29 19:36:50 -05:00
Steven Miers
64e84c17eb
VRFS-3007 : Fix feed spec test failure (was intermittently passing only).
2015-04-29 19:09:30 -05:00
Steven Miers
2e33851e30
VRFS-3007 : Fix band filter search test failure.
2015-04-29 19:08:59 -05:00
Steven Miers
03bab53b2f
VRFS-3007 : Remove redundant "model" suffix from spec name as folder is already named "model".
2015-04-29 19:06:33 -05:00
Seth Call
0ddbfc5e72
* VRFS-3120 - make sure FTUE starts out of session
2015-04-29 16:41:02 -05:00
Seth Call
e21a1504d1
* VRFS-3129 - ignore metronome spinner display check if jamtrack is open
2015-04-29 16:02:33 -05:00
Seth Call
45d973fedd
* VRFS-3134 - give minimum size of opened recording area a little more room
2015-04-29 15:59:44 -05:00
Steven Miers
5b43688443
VRFS-3007 : Fix failure on musician search spec.
2015-04-29 15:34:28 -05:00
Seth Call
a7526dad43
* fix description label
2015-04-29 15:28:01 -05:00
Seth Call
b9d30567db
* VRFS-3128 - reset seek on load of JamTrack
2015-04-29 14:38:03 -05:00
Steven Miers
daef55d1a2
Merge branch 'develop' into feature/musician_profile_enhancements
2015-04-29 12:59:11 -05:00
Steven Miers
757a9a5522
VRFS-3007 : Fix javascript bug causing test and browser problems. Fixes 164 of 203 failures.
2015-04-29 12:58:49 -05:00
Steven Miers
cf515a9cf0
VRFS-3007 : Fix tests and models failing due to PermissionError
2015-04-29 12:56:16 -05:00
Seth Call
72ff54213a
* VRFS-2997 - added license to accounts link. also adding config to ignore high latency if in a pinch
2015-04-28 20:07:21 -05:00
Seth Call
a6128a195b
* VRFS-3121 - fix network test dialog
2015-04-28 17:39:59 -05:00
Steven Miers
2260d21fc1
VRFS-3007 : Merge with latest develop
2015-04-28 16:43:38 -05:00
Seth Call
13e4e816d9
* VRFS-3071 - progress indicator for download
2015-04-28 16:29:48 -05:00
Seth Call
7d5e92baaa
* VRFS-3113 - fix bad avatar location for alert
2015-04-28 14:54:47 -05:00
Seth Call
00c9ccf699
* temporarily disable high latency
2015-04-28 14:47:27 -05:00
Seth Call
9fa10fe2b2
* temporarily disable high latency
2015-04-28 11:28:10 -05:00
Seth Call
a73aaec393
* don't fail someone joining a session with an unknown latency or very large latency
2015-04-28 11:00:16 -05:00
Seth Call
a70e90ab8c
* VRFS-3099 - fix left over download confirmation on checkout page if you re-enter it
2015-04-28 10:33:42 -05:00
Seth Call
cada0ed0b9
* VRFS-3112 - make recording smaller so no horizontal scroll bar
2015-04-28 09:44:56 -05:00
Seth Call
255ea39e77
* VRFS-3116 - honor positions
2015-04-28 09:35:39 -05:00
Seth Call
1ad86b1d80
* VRFS-3098 - pause button added to jamtrack
2015-04-28 08:58:34 -05:00
Seth Call
34b2614600
* fix dissappearing pause button
2015-04-27 21:39:46 -05:00
Seth Call
1bd054d050
* VRFS-3094 - update style and minor issues in shopping cart screen
2015-04-27 15:42:38 -05:00
Seth Call
907e2a4552
* fix jamtrack shopping tests for the change in button text
2015-04-27 13:42:03 -05:00
Seth Call
760ddecbb1
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
...
Conflicts:
web/app/views/users/_user_dropdown.html.erb
2015-04-27 11:13:31 -05:00
Seth Call
8e6b923b05
* VRFS-3092 - fix jamtrack browse page styling issues, VRFS-3096 - fix standalone download page to have no signup context
2015-04-27 10:35:09 -05:00
Seth Call
d4679f6524
* VRFS-3903 - small shopping cart, VRFS-3092 - done except for play/pause icon
2015-04-26 08:25:36 -05:00
Steven Miers
7aa9f3d10a
VRFS-3055 : Don't force override of video_available if current_user is admin.
2015-04-24 17:42:32 -05:00
Seth Call
258c034876
* VRFS-3089 - kill timer if the screen changes for jamtrack guides
2015-04-24 17:28:59 -05:00
Seth Call
13c3818c42
* add support for personal alerts email
2015-04-24 16:16:47 -05:00
Seth Call
774c50984d
* add a space after dash to give room to packaging prcentage
2015-04-24 15:05:08 -05:00
Seth Call
933d56524c
* poke downloaded_since_sign on jamtrackright page
2015-04-24 14:58:31 -05:00
Seth Call
24e244d766
* VRFS-3085 - further TOS updates
2015-04-24 14:45:49 -05:00
Seth Call
776858c391
* VRFS-3087 - disable filter dropdowns
2015-04-24 13:45:47 -05:00
Seth Call
d94388161c
* fixing recording-based tests and one checkout test
2015-04-24 12:09:22 -05:00
Seth Call
e4bd80a3c3
* VRFS-3085 - update TOS
2015-04-24 10:08:43 -05:00
Seth Call
4cce21e7f8
* VRFS-3080 - partial refund manual process done
2015-04-23 16:20:21 -05:00
Seth Call
989518fa68
* VRFS-3082 - email alert if jamtrack fails
2015-04-23 10:34:17 -05:00
Seth Call
32b5e741cc
* ignore jt_metadata.json file
2015-04-22 15:48:57 -05:00
Seth Call
d66f8e50d1
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2015-04-22 15:47:57 -05:00
Seth Call
2133bb086e
* VRFS-3079 - hide the download prompt if the user has already downloaded the app before
2015-04-22 15:46:44 -05:00
Seth Call
091f2be556
* make the nobody@jamkazam.com configurable so that we can override it in chef to provide context clues
2015-04-22 15:43:36 -05:00
Steven Miers
6c84abdfba
Whack test output images.
2015-04-22 15:36:22 -05:00
Steven Miers
75ac40e765
VRFS-3055 : Fix broken gear wizard spec. Add additional test to verify
2015-04-22 15:36:21 -05:00
Steven Miers
b916d4d997
VRFS-3055 : Multiple levels of config option video_available
...
“none”, “mvp”, and “full”. “mvp” mode is similar to full, except it
hides video recording functionality.
2015-04-22 15:36:21 -05:00
Seth Call
39f45f20ba
* VRFS-3078 - show original price in void purchase
2015-04-22 14:20:07 -05:00
Seth Call
2fc8041f3f
* VRFS-3077 - fix issue with no null check of current_user
2015-04-22 14:04:20 -05:00
Seth Call
05b4b8f3fa
* VRFS-2605 -tested mixer manifest with latest client with jamtrack offsets and all of that
2015-04-22 14:02:44 -05:00
Seth Call
9217e92372
* protect against video calls when in account screen
2015-04-22 10:21:08 -05:00
Seth Call
763ade01dd
* protect against webcamViewer from getting involved if video is not available
2015-04-22 10:18:33 -05:00
Seth Call
a3021479fd
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2015-04-22 09:45:08 -05:00
Seth Call
49ef08ff5d
* prepare production db for preview URLS, and save jam_track after setting duration in the sync task
2015-04-22 09:44:57 -05:00
Steven Miers
8f49d7b83f
Merge remote-tracking branch 'origin/develop' into develop
2015-04-21 18:30:17 -05:00
Steven Miers
c3134d8177
VRFS-3070 : Webcam selection & state fixes
...
* Hook up test webcam button
* Handle object vs. string from client method.
2015-04-21 18:30:02 -05:00
Steven Miers
196ed1340e
VRFS-3070 : Fix text that alludes to embedded webcam.
2015-04-21 18:28:16 -05:00
Seth Call
67c9f5d891
* VRFS-2605 - automatically stop recording if jamtrack is playing
2015-04-21 16:34:57 -05:00
Seth Call
3181a67bda
* VRFS-2605 - prevent close of jamtrack or backing track while recordig
2015-04-21 16:30:40 -05:00
Seth Call
1ce41c5a54
* VRFS-2605 - refining jamtrack offset values and manifest for audiomixer, and fixnig bug with jamtrack monitoring applied to playcontrols.js by accident
2015-04-21 16:24:10 -05:00
Steven Miers
74a0cbd18e
Fix intermittent failure.
2015-04-21 16:23:10 -05:00
Steven Miers
7a760e087b
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2015-04-21 14:29:43 -05:00
Seth Call
655f59fc52
* remove puts
2015-04-21 14:08:16 -05:00
Seth Call
ed0d69db13
* require tzinfo explicitely
2015-04-21 13:54:08 -05:00
Steven Miers
a9ab5bb730
Merge video_ui branch into develop.
2015-04-21 13:47:00 -05:00
Seth Call
556347f35b
* VRFS-2605 compute offset and seeks in manifest
2015-04-21 13:46:33 -05:00
Seth Call
03072b2e8d
* VRFS-2605 - compute offset and seek based on client info
2015-04-21 11:26:55 -05:00
Seth Call
8369ef0e13
* VRFS-3051 - pass userId into JamTrackDownload bridge call
2015-04-21 10:30:37 -05:00
Steven Miers
6f4c8d819d
VRFS-3055 : Video features on gear wizard available via config. Update spec to match behavior.
2015-04-21 09:23:57 -05:00
Steven Miers
ea45c286ea
VRFS-3055 : Make video features optional via config option.
2015-04-21 09:21:55 -05:00
Seth Call
c29af72938
* fix jamtrack landing page formatting VRFS-3056
2015-04-20 22:13:30 -05:00
Seth Call
72af829645
* VRFS-3066 - fix bug with rsvp_request controller not using api_signed_in_user filter (causing 500 errors on the service)
2015-04-20 21:31:08 -05:00
Seth Call
2480be23ab
* make the addition of duration column to jam tracks failable, since this has been applied to production in advance of the real migration
2015-04-20 20:40:50 -05:00
Seth Call
35ccd39979
* fix id-generator
2015-04-20 17:39:45 -05:00
Seth Call
8bb37c5a65
* fix incrementer
2015-04-20 14:56:10 -05:00
Seth Call
b60ded91d7
* fix typo in JamTrack download notification VRFS-3064
2015-04-20 13:58:58 -05:00
Seth Call
0236353ee7
VRFS-3048 - resync task for audio updates to existing jamtracks
2015-04-20 13:56:05 -05:00
Seth Call
9480aadaae
Conflicts:
...
ruby/lib/jam_ruby/models/jam_track_track.rb
2015-04-20 13:55:33 -05:00
Seth Call
022304c6af
* VRFS-3065 - permission error name change
2015-04-20 10:42:09 -05:00
Seth Call
375ec7008d
* wip
2015-04-20 10:42:00 -05:00
Seth Call
31e17151a7
* fix jamtrack shopping test
2015-04-19 18:03:26 -05:00
Seth Call
1763c151bd
* VRFS-3061 - deal with shopping cart porting over correctly when user logs in during shopping
2015-04-19 16:40:35 -05:00
Seth Call
6991e8afaf
* VRFS-3057 - shopping cart to reflect real price
2015-04-19 12:19:05 -05:00
Seth Call
fc99fbce6c
* VRFS-3058 - fix uniqueness constraint on ShoppingCart and test
2015-04-19 11:43:54 -05:00
Seth Call
64836c1a44
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2015-04-18 20:46:49 -05:00
Seth Call
b618fea59d
* VRFS-3054 - set default sales_region to any availability
2015-04-18 20:46:20 -05:00
Steven Miers
a2c64ee13a
VRFS-1848 : Make sure save/discard buttons are enabled after validation. Make event handler registration idempotent.
2015-04-17 17:55:23 -05:00
Seth Call
e882bb272c
* VRFS-3050 - disable configure button for playback profile
2015-04-17 16:32:53 -05:00
Steven Miers
c0e36d0f9e
VRFS-1848 : Better state management for recording finished dialog WRT google authorization / youtube errors. Hide youtube errors via ajax upon successful login.
2015-04-17 15:29:19 -05:00
Seth Call
1809b0213b
* VRFS-3043 - pass along preview timeline data in preview
2015-04-17 15:01:56 -05:00
Seth Call
a2e5d941c1
* remove double scrollbars when in client on the shopping cart page VRFS-3052
2015-04-17 14:09:29 -05:00
Seth Call
3c37cbbf59
* VRFS-3042 - remove duplicate registrations on pagination
2015-04-17 14:01:07 -05:00
Steven Miers
b6fad726c4
VRFS-1848 : Halt claim recording and show error if "Save to Youtube" selected, but not logged into google.
2015-04-17 13:22:20 -05:00
Seth Call
3a2590a472
* VRFS-3037 - code added without testing, and VRFS-3039 - download link added to checkout confirmation screen if you've not downloaded the app yet
2015-04-17 09:39:27 -05:00
Steven Miers
267e5a7e10
VRFS-1848 : Make login window disappear when login complete after the google oauth callback.
2015-04-17 09:31:40 -05:00
Steven Miers
f4765d03f9
VRFS-1848 : Fix JS syntax error
2015-04-16 16:24:39 -05:00
Steven Miers
832cd9bf31
VRFS-1848 : Move google auth JS to module. Fix bug causing google auth to appear in same window.
2015-04-16 16:24:23 -05:00
Steven Miers
4a4a70a894
VRFS-1847 : Hide fields from video widget.
2015-04-16 16:22:41 -05:00
Seth Call
fefd5a3fda
* jamtrack UI fixes: VRFS-3041 (ordering fixed), VRFS-3004 - loading/no more jamtrack notice fixes, and VRFS-3005 - filter by band works
2015-04-16 15:44:38 -05:00
Seth Call
4cf4e21552
* VRFS-2938 - packaging phase now shows % indicator
2015-04-16 14:45:29 -05:00
Steven Miers
3c41af5bd2
VRFS-1847 : Make video button behave appropriately as a toggle. Also, turn off video on initial load and before hiding.
2015-04-16 14:20:34 -05:00
Steven Miers
7025673939
VRFS-1847 : Show video button in session.
...
* Hook to webcam viewer widget and initialize and toggle as appropriate
from session.js
* Camera icon
2015-04-16 13:05:40 -05:00
Steven Miers
766568f8cb
Merge and fix
2015-04-16 12:16:09 -05:00
Steven Miers
005dfdaa91
Merge branch 'feature/jam_track_analytics' into develop
2015-04-16 11:11:07 -05:00
Steven Miers
705e67a810
VRFS-2874 : Clean up code and logic - fixes problem of false positive.
2015-04-16 00:21:45 -05:00
Seth Call
13027649f4
* VRFS-3023 - i want a jamblaster functionality
2015-04-15 21:37:22 -05:00
Seth Call
35d2cb7657
* VRFS-2991 - updating descriptions for SEO per David's comments
2015-04-15 20:37:49 -05:00
Steven Miers
168d1e77f1
VRFS-2874 : Developer tracking
2015-04-15 18:37:07 -05:00
Steven Miers
946640e724
VRFS-2874 : Jam Track Analytics : Hook up broadcast listen.
2015-04-15 18:27:00 -05:00
Steven Miers
280496af78
VRFS-2874 : JamTrack analytic core tracking functionality
2015-04-15 18:23:51 -05:00
Steven Miers
4db40f6d3b
VRFS-2874 : Some prerequisite functionality required for analytics.
2015-04-15 18:22:55 -05:00
Steven Miers
ae050590f6
Whack extraneous logging.
2015-04-15 18:17:02 -05:00
Seth Call
ec7cffbe49
* VRFS-2991 - fix bug in outputting recording links
2015-04-15 15:26:10 -05:00
Seth Call
cda3adc931
* VRFS-2991 - seo mvp mostly done with new meta tags
2015-04-15 15:16:05 -05:00
Seth Call
42b58a97e8
* VRFS-3034 - workaround QtWebkit crash by conditionalizing the 'crashy' rule
2015-04-15 15:14:41 -05:00
Seth Call
19ad2fbcc5
* VRFS-2991 - sitemap generator done (but still vetting other parts of the site for basic SEO)
2015-04-14 16:39:39 -05:00
Seth Call
ab1fadaea4
* VRFS-3031 - jamtrackBrowse is new URL
2015-04-14 15:16:37 -05:00
Seth Call
06c964a151
* VRFS-2977 - make facebook signup work with checkout flow
2015-04-14 14:12:24 -05:00
Seth Call
4a826a7aff
* VRFS-3032 - fix startup of websocket gateway by reordering requires order of bugsnag
2015-04-14 09:44:30 -05:00
Brian Smith
75f1098ca3
Merge branch 'develop' into feature/musician_profile_enhancements
2015-04-14 03:13:27 -04:00
Brian Smith
09e4253f5f
VRFS-2699 select checkboxes for items already in list
2015-04-14 03:06:18 -04:00
Brian Smith
12f5fc94c2
VRFS-2699 recording selector dialog
2015-04-14 02:43:29 -04:00
Seth Call
1183d0790c
* add default to exiting sales databases
2015-04-13 16:05:43 -05:00
Seth Call
eee6be5d0b
* VRFS-2978 - give temporary pass to payment screen if you just filled out info
2015-04-13 15:54:23 -05:00
Steven Miers
0e0ea46771
Merge branch 'develop' into feature/jam_track_analytics
2015-04-13 13:10:43 -05:00
Steven Miers
f56cf339e9
VRFS-2874 : Incremental hookup of ga for jam tracks.
2015-04-13 13:08:34 -05:00
Steven Miers
1d6f690f82
VRFS-2874 : Jam Track Analytics JS tracking method implementation.
2015-04-13 13:07:50 -05:00
Seth Call
fb3ca2cec1
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2015-04-13 09:57:24 -05:00
Seth Call
fa725af5e4
* VRFS-2945 - jamtrack countin spinner and text now showing
2015-04-13 09:56:48 -05:00
Brian Smith
b81222278d
merge develop
2015-04-13 08:16:45 -04:00
Brian Smith
4ef86587b6
VRFS-2699 recording selector work
2015-04-13 08:12:18 -04:00
Jonathan Kolyer
711fd1984b
VRFS-2893 added SaveSettings bridge call
2015-04-13 02:08:15 +00:00
Seth Call
34d50f4330
* VRFS-3025 - vertically align recording elements even when scrollbar is present
2015-04-12 16:53:24 -05:00
Seth Call
0dc77b400a
* VRFS-3006 - remove 'No audio loaded' when jamtrack is loading, and VRFS-3016 - no more text wrapping in error msg
2015-04-12 16:22:01 -05:00
Seth Call
b1b6686d3a
* VRFS-2976 - change default to 10/2/2 for WDM
2015-04-12 15:55:48 -05:00
Seth Call
ab2925ef88
VRFS-2821 - payment history screen added
2015-04-12 13:46:22 -05:00
Jonathan Kolyer
818b9a00ff
Merge branch 'feature/unsubscribe' of bitbucket.org:jamkazam/jam-cloud into feature/unsubscribe
2015-04-12 11:04:16 +00:00
Jonathan Kolyer
252beca091
VRFS-2895 added unsubscribe link to email footer that doesnt require login
2015-04-12 11:03:12 +00:00
Jonathan Kolyer
002e2f168e
Merge branch 'feature/unsubscribe' of bitbucket.org:jamkazam/jam-cloud into feature/unsubscribe
2015-04-12 06:27:19 +00:00
Jonathan Kolyer
b4d604dd3b
VRFS-2895 added unsubscribe link to email footer that doesnt require login
2015-04-12 06:25:12 +00:00
Jonathan Kolyer
d8b582be64
VRFS-2895 added unsubscribe link to email footer that doesnt require login
2015-04-12 06:18:31 +00:00
Brian Smith
5a4157c563
check for nil
2015-04-10 20:19:53 -04:00
Seth Call
e42b926a5e
* VRFS-3028 - switch to using Recurly Adjustments for JamTrack purchases
2015-04-10 15:19:08 -05:00
Brian Smith
246efbdaa8
merge develop
2015-04-09 20:47:01 -04:00
Seth Call
c230f57592
* adding in required images for VRFS-2868
2015-04-09 09:29:51 -05:00
Seth Call
fd02e23572
* updated home page VRFS-2868
2015-04-08 22:44:21 -05:00
Steven Miers
6110bc736f
Merge branch 'develop' into feature/jam_track_analytics
2015-04-08 15:54:41 -05:00
Seth Call
974049f204
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2015-04-08 14:36:48 -05:00
Seth Call
42dac058e1
VRFS-2884 - Update things in session and FTUE for default profile
2015-04-08 14:34:05 -05:00
Steven Miers
d12b7efb38
VRFS-3018 : Resolve api_jam_tracks#purchased before api_jam_tracks/:plan_code as the wildcard was preventing resolution to the former.
2015-04-08 12:56:59 -05:00
Steven Miers
c1dd0f45fe
VRFS-3018 : Style artist list to be two columns. Also tweak the other styles to more closely resemble screenshot. Fix physical layout as appropriate.
2015-04-08 12:55:02 -05:00
Steven Miers
3fd659c3df
VRFS-3019 : Fix :group_artist option on JamTrack query to not also group by id, like the regular version of the query.
2015-04-08 12:53:09 -05:00
Steven Miers
1b463c02d9
VRFS-3018 : Account JamTracks empty state - show "no jam tracks" message and provide a link to the shopping page. Also remove stray debug logs.
2015-04-08 12:51:40 -05:00
Steven Miers
6784c750ce
VRFS-2874 : Initial analytics for playing JamTracks in a session attended by multiple participants.
2015-04-07 14:04:29 -05:00
Steven Miers
34edd24972
Merge branch 'feature/VRFS-2998' into develop
2015-04-07 12:08:03 -05:00
Brian Smith
0a451742ef
merge develop
2015-04-06 21:26:54 -04:00
Steven Miers
4238d9b0ce
Add spec to verify expand functionality.
2015-04-06 16:48:58 -05:00
Steven Miers
1e24b20f3c
Tableize floated div view.
2015-04-06 16:10:03 -05:00
Steven Miers
6e971b159c
Fix bug found in spec.
2015-04-06 15:52:34 -05:00
Steven Miers
b051c33bd7
VRFS-2998 : Misc formatting. Also only show jam_track_tracks if expanded.
2015-04-10 15:58:03 -05:00
Steven Miers
31a8729f71
VRFS-2998 : Fix runaway previews by only allowing one expanded item at a time.
2015-04-10 15:56:33 -05:00
Jonathan Kolyer
08198e0aae
Merge branch 'feature/musician_profile_enhancements' into feature/musician_search2
2015-04-04 23:43:34 +00:00
Brian Smith
40899dab90
VRFS-2701 minor cleanup
2015-04-05 19:59:36 -04:00
Brian Smith
91e9e73644
VRFS-2701 adding SoundCloud/YouTube sources fully functional
2015-04-04 21:46:37 -04:00
Jonathan Kolyer
279f97ec9a
VRFS-2795 fixed broken spec
2015-04-04 23:42:41 +00:00
Jonathan Kolyer
51b38bbeed
VRFS-2795 css styling of builder page
2015-04-04 23:32:39 +00:00
Jonathan Kolyer
52f88692ca
VRFS-2795 styling; result link fixes
2015-04-04 21:57:59 +00:00
Jonathan Kolyer
086b3bc3c4
VRFS-2795 styling and descriptions
2015-04-04 20:26:41 +00:00
Jonathan Kolyer
e0d2feb84d
VRFS-2795 pagination
2015-04-04 17:29:15 +00:00
Jonathan Kolyer
0890aee9da
VRFS-2795 paginating
2015-04-04 16:11:36 +00:00
Jonathan Kolyer
e4795d9297
VRFS-2795 fixed filter description issue
2015-04-04 15:36:15 +00:00
Jonathan Kolyer
e563ad0d8b
Merge branch 'feature/musician_profile_enhancements' into feature/musician_search2
2015-04-04 14:56:36 +00:00
Jonathan Kolyer
4fbf3e694d
VRFS-2795 filter description & spec tests; support for reset, cancel buttons; proper display and update impl
2015-04-04 14:55:41 +00:00
Brian Smith
5ae708a898
VRFS-2701 added ability to remove recordings from list
2015-04-04 10:51:48 -04:00
Brian Smith
5bd5b26406
VRFS-2701 consolidated site add code / added X to remove row
2015-04-04 09:59:54 -04:00
Brian Smith
9ad1ffc3f6
remove binding.pry
2015-04-04 02:32:00 -04:00
Brian Smith
2f8d048dde
VRFS-2701 updated site validator lib to extract recording title for YouTube and SoundCloud URLs
2015-04-04 02:31:12 -04:00
Jonathan Kolyer
1f432446f5
VRFS-2795 fixing results display; generating same data
2015-04-04 02:54:58 +00:00
Seth Call
821ca9d76a
* VRFS-2875 - sales record keeping as well as recurly hook processing
2015-04-03 15:34:12 -05:00
Jonathan Kolyer
325d3d2780
VRFS-2975 cloning findMusician js
2015-04-02 16:00:34 +00:00
Jonathan Kolyer
4f7c43b9d8
VRFS-2795 cloning old search code into new musician_search
2015-04-02 14:52:16 +00:00
Jonathan Kolyer
c3ede10f1d
merging feature/musician_profile_enhancements
2015-04-02 14:51:33 +00:00
Jonathan Kolyer
0ccf30b023
VRFS-2795 adding result rows
2015-04-02 12:27:20 +00:00
Brian Smith
a87c08afe3
Merge branch 'develop' into feature/musician_profile_enhancements
2015-04-01 23:09:51 -04:00
Brian Smith
269519a394
VRFS-2701 wip adding external recordings
2015-04-01 23:09:16 -04:00
Seth Call
c0e541b49d
* importer
2015-04-01 20:38:54 -05:00
Seth Call
d3cc9fa6af
* download master command
2015-04-01 20:35:23 -05:00
Seth Call
c276d97e42
* pass in data with metronome open stat
2015-04-01 09:04:52 -05:00
Brian Smith
03f94480e7
VRFS-2701 wip adding recording sources
2015-03-31 22:32:41 -04:00
Seth Call
778a9030a3
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2015-03-31 21:08:52 -05:00
Seth Call
80a48c60c6
* VRFS-2879 - adding 3 product pages (jamblaster, platform, jamtracks)
2015-03-31 21:08:09 -05:00
Steven Miers
4c2d4958fe
VRFS-2894 Update email / user info in recurly upon finalize. Test to verify.
2015-03-31 20:25:54 -05:00
Steven Miers
d21a88a5de
VRFS-2998 : Hooking up preview widget - incremental.
2015-03-31 19:55:26 -05:00
Brian Smith
9d4943d814
VRFS-2701 fixed HTML
2015-03-31 20:42:57 -04:00
Brian Smith
546205b186
VRFS-2701 wip editing presence and samples
2015-03-31 20:35:38 -04:00
Seth Call
84ac9f049c
* VRFS-2871 - generic jamtrack landing page
2015-03-31 16:25:10 -05:00
Seth Call
b1b2d3ad24
* VRFS-2869 - band landing page
2015-03-31 16:17:17 -05:00
Seth Call
47c6b3ec16
* VRFS-2870 - tests add for individual jam track song page
2015-03-31 15:17:43 -05:00
Seth Call
6f64b4e5c7
* add missing howler
2015-03-31 14:04:05 -05:00
Seth Call
17c947f02e
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2015-03-31 13:38:15 -05:00
Seth Call
f7febfabcf
* VRFS-2999 - create whole track preview for master track on import
...
* VRFS-3000 - create duration for jam track
* VRFS-2996 - create jamtrack preview widget
* VRFS-2870 - individual jam track landing page (still needs tests)
2015-03-31 13:36:49 -05:00
Steven Miers
7058e897c2
Add no-login-required class to jam track landing page.
2015-03-31 10:29:04 -05:00
Jonathan Kolyer
ddc4decfd3
merging feature/musician_profile_enhancements
2015-03-30 06:07:43 +00:00
Seth Call
3d43f123b1
* VRFS-2992 -make mp3 as well as ogg preview
2015-03-29 21:51:14 -05:00
Brian Smith
c9468d0981
Merge branch 'feature/musician_profile_enhancements' of bitbucket.org:jamkazam/jam-cloud into feature/musician_profile_enhancements
2015-03-29 21:22:27 -04:00
Brian Smith
b02013846e
VRFS-2701 remove error message when username is blank
2015-03-29 21:22:12 -04:00
Brian Smith
83c00ea6e4
merge develop
2015-03-29 10:12:42 -04:00
Brian Smith
a0e9dbdd25
VRFS-2701 added callbacks to site validator to highlight invalid usernames and site URLs
2015-03-29 10:06:39 -04:00
Seth Call
398f7e04ad
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2015-03-28 10:10:29 -05:00
Seth Call
260a80ee37
* VRFS-2987 - remote participants can see opened JamTracks
2015-03-28 10:10:18 -05:00
Steven Miers
401fd43849
Merge branch 'feature/jam_track_ui_2' into develop
2015-03-27 15:48:08 -05:00
Seth Call
23fdf51110
* resize session based on track content VRFS-2819
2015-03-27 15:36:09 -05:00
Steven Miers
e6265f0b65
Fix test to match new behavior.
2015-03-27 12:45:17 -05:00
Seth Call
9ee31aad2c
VRFS-2799 - musicians tile icon updated to be guitar
2015-03-27 10:21:05 -05:00
Steven Miers
4f08f6acad
Merge and fix
2015-03-27 09:54:01 -05:00
Seth Call
e2957592ea
VRFS-2605 - audiomixer manifest updated for volume and offsets
2015-03-26 17:45:23 -05:00
Steven Miers
3f994e3993
Merge branch 'develop' into feature/jam_track_ui_2
2015-03-26 11:59:49 -05:00
Steven Miers
bb4ea7cd94
Merge branch 'feature/jam_track_ui_2' of bitbucket.org:jamkazam/jam-cloud into feature/jam_track_ui_2
2015-03-26 11:59:42 -05:00
Steven Miers
77a3ea7e6b
Merge branch 'develop' into feature/jam_track_ui_2
2015-03-26 11:58:47 -05:00
Seth Call
ef78471b59
Merge cherry pick
2015-03-26 11:58:41 -05:00
Seth Call
4a36bc6982
* VRFS-2988 - relax position duplication constraint
2015-03-26 10:16:14 -05:00
Jonathan Kolyer
21322318d8
VRFS-2795 latency ordering
2015-03-26 06:28:38 +00:00
Jonathan Kolyer
f3344affaf
VRFS-2795 distance sort order
2015-03-26 05:56:43 +00:00
Jonathan Kolyer
cc1660d1dc
Merge branch 'feature/musician_profile_enhancements' into feature/musician_search2
2015-03-26 04:28:09 +00:00
Jonathan Kolyer
9eeb0e454b
VRFS-2795 merging with feature/musician_profile_enhancements
2015-03-26 03:31:21 +00:00
Brian Smith
1b89e570e3
Merge branch 'feature/musician_profile_enhancements' of bitbucket.org:jamkazam/jam-cloud into feature/musician_profile_enhancements
2015-03-25 22:20:58 -04:00
Brian Smith
5e6082d1f1
VRFS-2701 integrated site validators
2015-03-25 22:20:43 -04:00
Seth Call
f63c94d9a3
* VRFS-2984 - use alternate syntax for sox trim
2015-03-25 16:05:41 -05:00
Seth Call
1e1e6222bb
* VRFS-2686 - if user seeks to 0, then offest it back to beginning of JamTrack (before prelude)
2015-03-25 15:01:22 -05:00
Seth Call
31e4fbfdf8
* suppress metronome logic when JamTrack is open VRFS-2971
2015-03-25 14:45:51 -05:00
Seth Call
8d296e6b8e
* remove code that I did not mean to commit
2015-03-25 14:33:27 -05:00
Seth Call
0848a59082
* merged develop again
2015-03-25 14:32:03 -05:00
Seth Call
5bd05321ef
* add user to PlayablePlay factor
2015-03-25 14:20:52 -05:00
Steven Miers
d0e036252e
Touch
2015-03-25 17:09:08 +00:00
Seth Call
54853afd3b
* fake bump for build server
2015-03-25 11:27:28 -05:00
Seth Call
f0c4647ef5
* VRFS-2981 - check for create_type = nil in scheduled_rsvp
2015-03-25 11:26:32 -05:00
Seth Call
53ef0f1b4f
VRFS-2975 - change jam track Id to varchar(64)
2015-03-25 11:11:10 -05:00
Steven Miers
5f953d1b19
VRFS-2830 : Merge / manual fix
2015-03-25 10:56:24 -05:00
Seth Call
6885424668
* allow admin to open jamtrack
2015-03-25 09:34:43 -05:00
Steven Miers
adef8c8c45
VRFS-2830 : Payment History
...
API, client, view, styles and test
2015-03-24 17:13:09 -05:00
Seth Call
f51b11b2e0
* VRFS-2979 - show jamtracks tile if admin
2015-03-24 15:20:56 -05:00
Seth Call
7510b098ab
* fix two tests needing new method of uploading
2015-03-24 15:07:33 -05:00
Seth Call
18563ff065
* VRFS-2890 fix infinite scroll as well as bug with limit vs per_page style scrolling
2015-03-24 14:59:20 -05:00
Seth Call
bfe302b2f1
* merged
2015-03-24 14:43:48 -05:00
Seth Call
ccd60aa631
* merged develop
2015-03-24 11:27:26 -05:00
Seth Call
1c0407cca4
* wip
2015-03-24 10:19:21 -05:00
Brian Smith
bc98a17786
VRFS-2701 wired up action buttons on samples page
2015-03-23 22:32:04 -04:00
Brian Smith
d3cf83db85
VRFS-2701 remove use of template on experience screen
2015-03-23 22:26:36 -04:00
Steven Miers
5e2d860bf7
VRFS-2830 : License dialog and hookup
2015-03-23 15:38:55 -05:00
Brian Smith
9face3b3f9
VRFS-2701 wip presence/sample edit
2015-03-23 16:27:36 -04:00
Jonathan Kolyer
98ea77a5e0
Merge branch 'develop' into feature/cohort_data
2015-03-23 20:07:24 +00:00
Jonathan Kolyer
8c2df0bb6b
VRFS-2916 added jamtrack plays handling; worked around jam_tracks.id bigint problem (with commented dependencies); tested jamtrack play saves from JS through rspec; final cleanup of cohort reporting
2015-03-23 20:06:32 +00:00
Brian Smith
231f7c69b5
VRFS-2701 wip presence/sample edit
2015-03-23 13:11:28 -04:00
Seth Call
04aa1a9b3c
* wip
2015-03-23 08:52:52 -05:00
Jonathan Kolyer
153d79749c
VRFS-2972 for jam_track_rights, exclude is_test_purchase=true
2015-03-23 07:03:57 +00:00
Jonathan Kolyer
dd23b38f4e
VRFS-2916 fixed subquery override from block
2015-03-23 04:48:13 +00:00
Brian Smith
3ae34fc426
VRFS-2974 fixed broadcast widget bug when session is private
2015-03-22 21:30:08 -04:00
Brian Smith
e4aa6609ec
VRFS-2974 fixed broadcast widget bug when session is private
2015-03-22 21:13:53 -04:00
Brian Smith
370ca1086e
VRFS-2701 VRFS-2699 wip performance samples edit screen
2015-03-21 20:53:38 -04:00
Brian Smith
ae71c1b9e9
VRFS-2701 VRFS-2699 wip performance samples edit screen
2015-03-21 10:16:46 -04:00
Brian Smith
96a816f317
merge develop
2015-03-21 10:06:53 -04:00
Brian Smith
9acb235a6d
VRFS-2701 VRFS-2699 wip performance samples edit screen
2015-03-21 10:04:46 -04:00
Seth Call
128a8119cf
* VRFS-2942 - show correct instrument and show correct part info
2015-03-20 22:04:03 -05:00
Seth Call
b137d7586f
* VRFS-2973 - fix pagination in jam trackdialog
2015-03-20 21:27:11 -05:00
Seth Call
36b4179492
* VRFS-2972 - adding test purchase feature to jam-admin for buying all JamTracks (admin users only)
2015-03-20 17:26:56 -05:00
Seth Call
f29a9d7465
* wip
2015-03-20 16:15:13 -05:00
Steven Miers
e3d1a80a6f
VRFS-2830 : Mesh out purchased jam tracks view and behavior.
2015-03-20 15:26:06 -05:00
Seth Call
49368e2e66
Merge branch 'hotfix/recording_fix' into develop
2015-03-20 11:26:50 -05:00
Seth Call
3cb706495e
* wip
2015-03-20 11:25:42 -05:00
Seth Call
d44236abc4
remove jamblaster notice from site
2015-03-20 09:58:58 -05:00
Seth Call
6df6165bb7
remove jamblaster notice from site
2015-03-20 09:55:35 -05:00
Seth Call
301b365044
* VRFS-2968 - escape strings passed to JamTrack builder
2015-03-20 09:44:25 -05:00
Seth Call
393f05f9b0
* wip
2015-03-20 09:21:29 -05:00
Seth Call
10f25be8c4
* replace old style of volume changes VRFS-2964
2015-03-20 08:53:34 -05:00
Seth Call
6032d91725
Merge branch 'master' into develop
2015-03-20 08:50:04 -05:00
Seth Call
661c4ed446
* wip
2015-03-20 08:48:00 -05:00
Jonathan Kolyer
cba86f4db4
VRFS-2916 added totals; limit month range to 1; filled out all unpopulated cols with 0; misc tweaks
2015-03-20 08:06:02 +00:00
Brian Smith
299caa5b59
VRFS-2701 VRFS-2923 bug fixes on musician profile enhancements / genre selector dialog
2015-03-19 02:50:49 -04:00
Jonathan Kolyer
5621f227b8
VRFS-2916 formatting, added jam_track_played placeholders
2015-03-19 06:07:43 +00:00
Brian Smith
82f35e221f
VRFS-2701 fixed cancel and back buttons
2015-03-18 21:42:18 -04:00
Brian Smith
32b36ea28b
VRFS-2701 added social media logos to profile page
2015-03-18 08:18:29 -04:00
Brian Smith
8ee9dbaee5
VRFS-2701 added online presence logos, fixed html issue that broke the dialogs
2015-03-18 08:13:33 -04:00
Steven Miers
abb31c4e40
VFFS-2830 : Jam tracks account overview
2015-03-17 13:52:30 -05:00
Seth Call
cfd80927f9
* fix broken tests that occurred when removing mount_uploader from jam_track_track
2015-03-17 13:39:21 -05:00
Seth Call
bb35535262
* VRFS-2941 - fix meddling of mount_uplaoder with existing URS
2015-03-17 10:55:16 -05:00
Seth Call
5269520924
* fix bug in earliest cohort code
2015-03-17 10:36:41 -05:00
Seth Call
137c6faedc
* wip
2015-03-17 10:15:00 -05:00
Brian Smith
c91fd0cb0e
merge develop
2015-03-17 03:10:22 -04:00
Brian Smith
c0dcbcce75
VRFS-2701 edit current interests working
2015-03-17 03:08:40 -04:00
Jonathan Kolyer
188274cbb5
merging feature/cohort_data with develop
2015-03-17 05:33:01 +00:00
Jonathan Kolyer
a577a6e43e
VRFS-2916 monthly tweaking
2015-03-17 05:31:04 +00:00
Jonathan Kolyer
4a0aa25785
VRFS-2916 monthly filter
2015-03-17 05:04:13 +00:00
Jonathan Kolyer
5ee4784417
VRFS-2916 admin index
2015-03-17 01:34:04 +00:00
Seth Call
ab72438a3f
* VRFS-2932 - make preview apply to all jam track tracks
2015-03-16 17:50:38 -05:00
Seth Call
b4d581dbc1
* VRFS-2936 - ugly button for Peter testing
2015-03-16 16:04:44 -05:00
Seth Call
c2abab8982
* VRFS-2936 - ugly button for Peter testing
2015-03-16 16:04:29 -05:00
Seth Call
9dd3984d07
* VRFS-2936 - ugly button for Peter testing
2015-03-16 13:36:02 -05:00
Seth Call
97d469cc85
* wip
2015-03-16 13:27:39 -05:00
Jonathan Kolyer
420c00e3b5
VRFS-2916 fixed monthly queries
2015-03-16 06:03:36 +00:00
Steven Miers
07b74cc3e7
VRFS-2823 : Enable proper back button behavior.
2015-03-16 00:29:57 -05:00
Steven Miers
4e99505d2a
VRFS-2877 : Update look and feel of cart
...
* New checkmark icon
* Use table layout instead of width/float
* Misc layout fixes
2015-03-15 21:32:37 -05:00
Steven Miers
e6b09e5728
VRFS-2892 : Reset main form error to hidden upon re-entering purchase flow.
2015-03-15 20:30:39 -05:00
Steven Miers
f3f655720c
VRFS-2896 : Show proper state on jam track re: purchased or already in cart.
2015-03-15 20:22:02 -05:00
Steven Miers
4d04558c88
Capitalize TODO
2015-03-15 19:57:08 -05:00
Steven Miers
f4cd225142
VRFS-2823 : Bugfix and cleanup.
2015-03-15 19:45:58 -05:00
Steven Miers
05d029243d
VRFS-2823 : Update test for changed items and add a test for switching the filter via URL.
2015-03-15 19:45:37 -05:00
Steven Miers
9a38b63376
VRFS-2823:Update link on landing page to properly set filter parameters.
2015-03-15 18:43:08 -05:00
Steven Miers
782357ce4e
VRFS-2823 : Accomplishes a number of items
...
* Ability to set filter settings from URL
* Ability to expand and collapse; hiding the items mentioned in spec.
* Misc styling and code cleanup.
2015-03-15 18:42:22 -05:00
Steven Miers
54e18ead66
VRFS-2823 : Up arrow image
2015-03-15 18:35:43 -05:00
Brian Smith
4a8dd75fa2
VRFS-2701 VRFS-2923 wip genre selector dialog
2015-03-15 11:58:20 -04:00
Brian Smith
888c4707b5
VRFS-2701 VRFS-2923 wip genre selector dialog
2015-03-15 11:26:54 -04:00
Brian Smith
b91bc09817
Merge branch 'develop' into feature/musician_profile_enhancements
2015-03-15 11:09:21 -04:00
Brian Smith
768f3a7ff0
VRFS-2701 VRFS-2923 wip genre selector dialog
2015-03-15 11:08:49 -04:00
Jonathan Kolyer
087ec9b1e0
VRFS-2916 online play query
2015-03-14 21:24:01 +00:00
Jonathan Kolyer
eff4453482
VRFS-2916 monthly queries
2015-03-14 20:53:03 +00:00
Seth Call
e82da2161d
* VRFS-2927 - mute both master/personal for own tracks
2015-03-14 15:00:11 -05:00
Seth Call
23488f8f7f
* wip
2015-03-14 14:36:34 -05:00
Jonathan Kolyer
caddee4f57
merging develop
2015-03-14 18:41:22 +00:00
Jonathan Kolyer
961af94e6c
VRFS-2795 cohorts first pass
2015-03-14 18:39:07 +00:00
Steven Miers
e509169864
VRFS-2822 : Use border_box_sizing in column style.
2015-03-13 14:46:31 -05:00
Steven Miers
63544de145
VRFS-2822 : Cleanup
2015-03-13 14:45:57 -05:00
Steven Miers
40a1ad137d
VRFS-2823 : Convert to coffee and clean up.
2015-03-13 14:45:38 -05:00
Seth Call
b0aac73732
* VRFS-2924 - show visual metronome option
2015-03-13 10:44:24 -05:00
Seth Call
1cd8288cc3
* wip
2015-03-13 10:28:27 -05:00
Seth Call
3c62d61aed
* bump for build
2015-03-13 09:12:52 -05:00
Seth Call
1b36fb812f
wip
2015-03-13 09:12:33 -05:00
Jonathan Kolyer
b38370589f
VRFS-2916 cohort model/table
2015-03-13 07:10:39 +00:00
Brian Smith
3d9e80f719
VRFS-2701 use profileUtils for preselecting genres on experience screen
2015-03-13 02:48:09 -04:00
Brian Smith
4e456bce41
VRFS-2701 wip current interests editing
2015-03-13 02:26:09 -04:00
Seth Call
7c73e2ab5c
* VRFS-2922 - show spinner for pending metronome
2015-03-12 21:53:23 -05:00
Brian Smith
948174f19a
VRFS-2701 musical experience bug fix
2015-03-12 21:34:20 -04:00
Seth Call
a1c929aeb1
* wip
2015-03-12 18:15:32 -05:00
Seth Call
f9e02c5707
Merge branch 'develop' into feature/jam_track_ui_2
...
Conflicts:
admin/app/admin/jam_tracks.rb
admin/app/views/admin/jam_tracks/_form.html.slim
admin/app/views/admin/jam_tracks/_jam_track_track_fields.html.slim
admin/config/initializers/jam_tracks.rb
db/manifest
ruby/lib/jam_ruby.rb
ruby/lib/jam_ruby/app/uploaders/jam_track_track_uploader.rb
ruby/lib/jam_ruby/jam_tracks_manager.rb
ruby/lib/jam_ruby/models/jam_track.rb
ruby/lib/jam_ruby/models/jam_track_right.rb
ruby/lib/jam_ruby/models/jam_track_track.rb
ruby/spec/jam_ruby/models/jam_track_right_spec.rb
ruby/spec/jam_ruby/models/jam_track_track_spec.rb
ruby/spec/jam_ruby/resque/jam_tracks_builder_spec.rb
web/app/assets/javascripts/download_jamtrack.js.coffee
web/app/assets/javascripts/globals.js
web/app/assets/javascripts/jam_rest.js
web/app/assets/javascripts/order.js
web/app/assets/javascripts/playbackControls.js
web/app/assets/javascripts/session.js
web/app/assets/stylesheets/client/session.css.scss
web/app/controllers/api_jam_tracks_controller.rb
web/app/controllers/api_recurly_controller.rb
web/spec/controllers/api_jam_tracks_controller_spec.rb
2015-03-12 08:51:52 -05:00
Jonathan Kolyer
3330a09128
Merge branch 'feature/musician_profile_enhancements' into feature/musician_search2
2015-03-12 04:40:39 +00:00
Jonathan Kolyer
41626860a9
VRFS-2795 replacing musician page with new search filter
2015-03-12 04:39:20 +00:00
Seth Call
9c2a0c79f6
* VRFS-2866 - making listing of JamTracks not require a logged in user
2015-03-11 21:30:56 -05:00
Seth Call
f2b453ea19
* VRFS-2917 - shopping cart can be anonymous
2015-03-11 20:55:11 -05:00
Seth Call
5fa37abfb3
* VRFS-2916 - adding redeemed boolean
2015-03-11 17:02:03 -05:00
Seth Call
972c25c69d
* fix path to shopping for JamTracks
2015-03-11 16:59:09 -05:00
Seth Call
d6df68a8ff
* VRFS-2913 - allow /client to be accessed without being logged in
2015-03-11 16:53:37 -05:00
Seth Call
477df086b0
Revert "* VRFS-2913 - allow /client to be accessed without being logged in"
...
This reverts commit 0a869e91e3 .
2015-03-11 16:53:12 -05:00
Seth Call
0a869e91e3
* VRFS-2913 - allow /client to be accessed without being logged in
2015-03-11 16:44:22 -05:00
Steven Miers
fae67907b1
VRFS-2823 : Fix availability filtering
2015-03-11 16:36:42 -05:00
Steven Miers
7ac7e0810e
VRFS-2823 : Tweak styling/layout.
2015-03-11 16:08:29 -05:00
Steven Miers
dcd15fee38
VRFS-2823 : Cleanup and hamlize
2015-03-11 15:53:59 -05:00
Steven Miers
9e588eae4d
VRFS-2823 : Remove "what is" link.
2015-03-11 15:40:54 -05:00
Steven Miers
4ebbff42cc
VRFS-2823 : Jam Tracks shopping page updates
...
* Remove individual labels from search and show a “Filter JamTracks”
label.
* Style
* Add filter box for artist & populate
* Bind events in JS and pass through to api
* Tweak api park from “artist_name” to “artist”
2015-03-11 15:40:12 -05:00
Seth Call
6c82e00d00
* VRFS-2876 cleaning up preview downloadability in jam-admin
2015-03-11 09:20:45 -05:00
Seth Call
9279d88d8d
* VRFS-2876 - pro licensing added and 20 second snippet
2015-03-10 22:10:22 -05:00
Seth Call
631491c4a2
* VRFS-2829 - signup and downoad page changes for jam tracks release
2015-03-10 10:29:40 -05:00
Brian Smith
f10bdc18f4
VRFS-2701 wip saving musical experience working
2015-03-10 02:02:59 -04:00
Jonathan Kolyer
b998d28c37
VRFS-2795 merging with feature/musician_profile_enhancements
2015-03-10 04:33:37 +00:00
Brian Smith
d865d0a1fa
Merge branch 'develop' into feature/musician_profile_enhancements
2015-03-09 20:25:28 -04:00
Seth Call
882f2267cf
* fixing urls getting messed with my mount uploader
2015-03-09 16:35:39 -05:00
Steven Miers
d1108c3070
VRFS-2822 : Jam Track landing page view stuff
2015-03-09 10:13:20 -05:00
Steven Miers
e91ee68d58
VRFS-2822 : Add options to query for both filtering on artist and grouping on artist (to get a list of artists through existing query infrastructure).
2015-03-09 10:11:47 -05:00
Seth Call
28ebbe893c
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2015-03-09 09:49:21 -05:00
Seth Call
a10705c163
* VRFS-2909 - jam tracks importer
2015-03-09 09:44:12 -05:00
Jonathan Kolyer
02b310cbfa
Merge branch 'feature/musician_profile_enhancements' into feature/musician_search2
2015-03-09 06:14:36 +00:00
Jonathan Kolyer
33f10e3197
VRFS-2795 fixing search specs
2015-03-09 06:13:56 +00:00
Brian Smith
f29d370f2b
VRFS-2701 wip edit musical experience
2015-03-09 01:36:49 -04:00
Jonathan Kolyer
21c5a212b2
Merge branch 'feature/musician_profile_enhancements' into feature/musician_search2
2015-03-09 05:16:41 +00:00
Jonathan Kolyer
d3f0bad602
VRFS-2795 filter tests
2015-03-09 05:15:15 +00:00
Brian Smith
f1808560ce
VRFS-2701 added shells for all new edit screens
2015-03-08 22:57:19 -04:00
Jonathan Kolyer
1cb887b696
VRFS-2795 spec testing
2015-03-08 08:17:36 +00:00
Jonathan Kolyer
03490e06ab
Merge branch 'feature/musician_profile_enhancements' into feature/musician_search2
2015-03-08 06:14:28 +00:00
Jonathan Kolyer
8bbfdbc013
VRFS-2795 instrument selection; json posting
2015-03-08 06:13:29 +00:00
Jonathan Kolyer
23ccc855d5
VRFS-2795 instrument selection; json posting
2015-03-08 06:07:30 +00:00
Jonathan Kolyer
03321a8166
VRFS-2795 instrument json
2015-03-07 06:19:14 +00:00
Brian Smith
6b16ab3701
Merge branch 'develop' into feature/musician_profile_enhancements
2015-03-06 23:27:42 -05:00
Brian Smith
fb3ed71957
VRFS-2854 more session widget feed fixes
2015-03-06 23:18:29 -05:00
Brian Smith
36a9f1f6a3
VRFS-2854 more session widget feed fixes
2015-03-06 23:16:27 -05:00
Jonathan Kolyer
3549ea117c
VRFS-2795 generating json from filter settings
2015-03-06 07:20:14 +00:00
Jonathan Kolyer
2b9bebb438
VRFS-2795 generate JSON from filter settings
2015-03-06 07:03:30 +00:00
Jonathan Kolyer
15559f593f
VRFS-2795 sortorder, refactoring
2015-03-06 06:33:38 +00:00
Jonathan Kolyer
3810aecb00
merging feature/musician_profile_enhancements
2015-03-06 05:12:13 +00:00
Jonathan Kolyer
81df46e7a2
VRFS-2795 tweaks
2015-03-06 05:10:29 +00:00
Seth Call
be97555f1a
* VRFS-2885 - check mixers from both modes
2015-03-05 09:47:33 -06:00
Brian Smith
e658e6f4b5
Merge branch 'develop' into feature/musician_profile_enhancements
2015-03-05 02:18:55 -05:00
Brian Smith
6fa59bf76f
VRFS-2854 fixed bug with hovering over private sessions in feed
2015-03-05 02:18:05 -05:00
Brian Smith
58324f35a5
VRFS-2854 fixed bug with hovering over private sessions in feed
2015-03-05 02:16:32 -05:00
Jonathan Kolyer
2e24b58e12
VRFS-2795 instrument selector
2015-03-05 06:49:44 +00:00
Jonathan Kolyer
2380c50779
VRFS-2795 interests and ages selectors
2015-03-05 06:30:20 +00:00
Jonathan Kolyer
d514a67be5
VRFS-2795 changed gig/studio vals to match profile enhancements branch
2015-03-05 05:51:26 +00:00
Jonathan Kolyer
02e22ba7f3
VRFS-2795 add interests, studios selectors; some refactoring
2015-03-05 05:50:10 +00:00
Steven Miers
07f688fc91
Fix test: make rabl file match controller action name.
2015-03-04 17:27:43 -06:00
Steven Miers
c6497c8457
Kill puts.
2015-03-04 16:31:03 -06:00
Steven Miers
003b06cae0
VRFS-2782 : Fix error found by test.
2015-03-04 16:14:26 -06:00
Steven Miers
a34031728e
Cleanup
2015-03-04 16:14:01 -06:00
Steven Miers
ead2921e84
VRFS-2782 : Add api controller test for multiple bitrates. Fix bug found as a result.
2015-03-04 16:13:58 -06:00
Steven Miers
f935b8c7e9
VRFS-2782 : Multiple bitrates in admin UI.
2015-03-04 16:13:54 -06:00
Steven Miers
d526f98367
VRFS-2782 : Add a jam tracks builder spec to more directly exercise building, in addition to specific tests for 48kHz vs 44kHz
2015-03-04 16:13:45 -06:00
Steven Miers
ff6848430f
Merge
2015-03-04 16:13:36 -06:00
Steven Miers
63c45e0a6e
VRFS-2782 : Support multiple bitrates throughout models, managers, up loaders and builders.
2015-03-04 16:03:57 -06:00
Steven Miers
2004d48fa1
Merge
2015-03-04 16:03:28 -06:00
Brian Smith
98bf25e360
VRFS-2701 edit profile basics
2015-03-04 02:27:32 -05:00
Brian Smith
cba51df5e9
VRFS-2701 edit profile basics
2015-03-04 02:17:12 -05:00
Brian Smith
12b610d2cb
Merge branch 'develop' into feature/musician_profile_enhancements
2015-03-04 02:03:22 -05:00
Brian Smith
b40e1c6a40
VRFS-2701 edit profile basics
2015-03-04 02:02:48 -05:00
Steven Miers
c8059e9c00
VRFS-2822 : Create a jam track landing page, a coffee script to control it, and styles.
...
Link from main client view. Link TO current (browse) page.
2015-03-03 23:14:24 -06:00
Brian Smith
02f606971b
formatting changes
2015-03-03 23:16:13 -05:00
Brian Smith
aba65a82bd
let caller decide what to display if no genres are found
2015-03-03 21:29:10 -05:00
Seth Call
aba4546e44
Squashed commit of the following:
...
* VRFS-2881 use backend audio source info in metronome
* VRFS-2832 add metronome play controls with mode control
* VRFS-2873 straighten out metronome names in frontend
* VRFS-2782 use getMyNetworkState for ntp_stable determination
* VRFS-2864 allow 'cluster' test, a new metronome mode
* VRFS-2861 metronome sounds not always matching frontend
* VRFS-2852 relax idea that only one person can open metronome
* VRFS-2865 metronome sounds not always matching frontend(dup)
* VRFS-2847 metronome volume now moves master and personal both
* VRFS-2835 metronome 'prevent' message is now dialog, not notify
* VRFS-2833 anyone can control volume/mute of metronome
* VRFS-2850 don't prevent metronome if solo session
2015-03-03 19:06:55 -06:00
Steven Miers
c8ad1d3856
VRFS-2805 : Use jquery.payment to make the credit card and verification more user-friendly. Also use jquery.payment for validation.
2015-03-02 13:30:45 -06:00
Jonathan Kolyer
930166b213
Merge branch 'feature/musician_profile_enhancements' into feature/musician_search2
2015-03-02 12:00:39 +00:00
Jonathan Kolyer
dd651f02bb
VRFS-2795 populate skill and gigs
2015-03-02 11:59:39 +00:00
Jonathan Kolyer
b3009ec8c0
VRFS-2795 skill drop down
2015-03-02 11:26:15 +00:00
Jonathan Kolyer
1c93f4ef80
Merge branch 'feature/musician_profile_enhancements' into feature/musician_search2
2015-03-02 09:44:05 +00:00
Jonathan Kolyer
0e9f78ccdd
VRFS-2795 search filter front end start
2015-03-02 09:41:53 +00:00
Brian Smith
5f2b0b9745
VRFS-2701 added performance sample listings
2015-03-01 13:52:06 -05:00
Jonathan Kolyer
bfd3f3fac6
VRFS-2795 filled out JSON_SCHEMA
2015-02-28 22:45:43 +00:00
Jonathan Kolyer
171dcb04f0
VRFS-2795 interests filter
2015-02-28 21:18:43 +00:00
Jonathan Kolyer
88315fcc40
VRFS-2795 instrument and genre filtering tests
2015-02-28 20:37:15 +00:00
Jonathan Kolyer
d95279e694
VRFS-2795 merging feature/musician_profile_enhancements
2015-02-28 20:18:56 +00:00
Jonathan Kolyer
2ca3ec6d91
VRFS-2795 merging feature/musician_profile_enhancements
2015-02-28 20:17:16 +00:00
Brian Smith
fa7ec522c5
VRFS-2701 refactor / added action links to each section
2015-02-28 02:52:03 -05:00
Brian Smith
4d133e0043
merge develop
2015-02-28 02:24:23 -05:00
Brian Smith
a2e28cfe75
VRFS-2701 display online presences on about tab
2015-02-28 02:21:38 -05:00
Jonathan Kolyer
2d8748d4ee
VRFS-2795 iterating on tests
2015-02-28 04:24:53 +00:00
Steven Miers
5396e66c67
Merge with develop
2015-02-27 11:51:45 -06:00
Steven Miers
d314c3327c
VRFS-2782 : Fix error found by test.
2015-02-27 11:38:40 -06:00
Seth Call
9415593244
* merged
2015-02-27 08:41:49 -06:00
Seth Call
8205b5ea58
* VRFS-2841 - load jmep into the backend
2015-02-27 08:37:12 -06:00
Brian Smith
4f9d440f7d
merge develop
2015-02-26 22:36:21 -05:00
Brian Smith
80e942d69e
VRFS-2701 wip musician profile enhancements
2015-02-26 22:33:53 -05:00
Steven Miers
2823645a60
Merge with develop & fix manifest.
2015-02-26 17:49:10 -06:00
Steven Miers
718e43df5d
Cleanup
2015-02-26 17:43:30 -06:00
Steven Miers
030fa1a351
VRFS-2782 : Add api controller test for multiple bitrates. Fix bug found as a result.
2015-02-26 17:43:22 -06:00
Steven Miers
81f288f4f7
VRFS-2782 : Multiple bitrates in admin UI.
2015-02-26 17:01:53 -06:00
Steven Miers
e6c49a18b2
VRFS-2782 : Add a jam tracks builder spec to more directly exercise building, in addition to specific tests for 48kHz vs 44kHz
2015-02-26 17:01:44 -06:00
Steven Miers
a2f681d0b4
VRFS-2782 : Multiple bitrates in controllers
2015-02-26 17:00:53 -06:00
Steven Miers
bd08b40e71
VRFS-2782 : Support multiple bitrates throughout models, managers, up loaders and builders.
2015-02-26 17:00:01 -06:00
Seth Call
3abe9108cd
* fix typo
2015-02-26 10:04:59 -06:00
Seth Call
671151b460
* VRFS-2804 - widen authorization token
2015-02-26 10:00:21 -06:00
Seth Call
6107622f79
* VRFS-2839 - add check to admin
2015-02-25 22:05:18 -06:00
Seth Call
a02f7c2dfb
* VRFS-2839 - add check to admin
2015-02-25 22:04:58 -06:00
Brian Smith
0c599ca023
Merge branch 'develop' into feature/musician_profile_enhancements
2015-02-25 21:55:57 -05:00
Seth Call
471f590ef7
* update doc of teaspoon tests; really just a fake bump for dev build
2015-02-25 19:57:01 -06:00
Seth Call
4a7d6925da
* wip
2015-02-25 19:56:26 -06:00
Steven Miers
ef287187ba
VRFS-2782 : Support multiple bit rates for jam tracks: migration, model and test updates.
2015-02-25 17:19:03 -06:00
Seth Call
6b795695ee
* VRFS-2753 - assign volume left over volume right to ensure both mono and stereo backend inputs get the data they need
2015-02-25 16:15:41 -06:00
Seth Call
ca9e3706c7
* wip
2015-02-25 16:13:04 -06:00
Seth Call
dbaeb8d996
merged
2015-02-25 10:43:21 -06:00
Seth Call
947d649f5f
* VRFS-2831 - metronome showing
2015-02-24 17:16:12 -06:00
Steven Miers
49018f056a
Merge branch 'develop' into feature/jam_track_ui_2
2015-02-24 12:16:08 -06:00
Steven Miers
7f851c66cb
VRFS-2797 : New shopping cart icon. Also a transparent small version to use as icon.
2015-02-24 10:12:32 -06:00
Steven Miers
2cb6fe8652
Merge branch 'feature/jam_tracks_refund' into feature/jam_track_ui_2
2015-02-24 08:11:41 -06:00
Steven Miers
9c9c01b2fd
VRFS-2785 : Make id fields accessible for admin UI.
2015-02-25 09:41:51 -06:00
Steven Miers
1de7c86e29
VRFS-2785 : Fields for new purchased jam track.
2015-02-25 09:41:03 -06:00
Jonathan Kolyer
2ea1259060
merging feature/musician_profile_enhancements
2015-02-24 06:08:33 +00:00
Jonathan Kolyer
a2ef5e9859
VRFS-2795 gig and studio tests
2015-02-24 06:06:40 +00:00
Seth Call
a7824249a8
* VRFS-2826 - fix regression where remote peers couldn't see tracks
2015-02-23 22:29:28 -06:00
Brian Smith
19fdc2ac9d
Merge branch 'develop' into feature/musician_profile_enhancements
2015-02-23 23:13:12 -05:00
Seth Call
c5b77a02fa
* check shopping cart on leave of shopping cart screen
2015-02-23 17:30:06 -06:00
Seth Call
4841e56dce
* VRFS-2634 - add version check to jamtrack packages
2015-02-23 16:56:21 -06:00
Seth Call
c8752fd830
* VRFS-2634 - add version check to jamtrack packages
2015-02-23 16:55:19 -06:00
Seth Call
0795791909
* move displayCartIcon method to init logic
2015-02-23 16:03:44 -06:00
Seth Call
78ed25ea82
* actually init the shopping cart
2015-02-23 16:00:30 -06:00
Seth Call
be4627d51f
* move around shopping cart init
2015-02-23 15:55:02 -06:00
Seth Call
d89e2f8e56
* VRFS-2818 - mute and volume faders control both mixer/personal simultaneously. more work required for moving of input tracks affecting backing tracks personal mix
2015-02-23 15:00:57 -06:00
Seth Call
ae920c5a1a
* stop play issued before close of backing track
2015-02-23 10:56:22 -06:00
Seth Call
1dbfdf0546
* VRFS-2811 - read loop state when drawing track
2015-02-23 10:45:10 -06:00
Seth Call
9dbf1a3e56
* VRFS-2634 adding version to jamtrack
2015-02-23 09:12:34 -06:00
Jonathan Kolyer
0f756ba17e
VRFS-2795 json_store table
2015-02-23 06:25:04 +00:00
Jonathan Kolyer
83f3d56238
VRFS-2795 musician search first draft
2015-02-23 06:21:36 +00:00
Brian Smith
52c2128721
VRFS-2701 user website should be included for online presence check
2015-02-22 22:52:25 -05:00
Brian Smith
c961c1fdc5
fix test
2015-02-22 22:36:15 -05:00
Brian Smith
6667a33e67
VRFS-2701 wip musician profile enhancements
2015-02-22 22:23:59 -05:00
Brian Smith
20ac47a2e1
Merge branch 'develop' into feature/musician_profile_enhancements
2015-02-21 23:36:06 -05:00
Brian Smith
71543d8c15
VRFS-2701 wip for musician profile UI enhancements
2015-02-21 23:35:12 -05:00
Brian Smith
3e473a9ec3
VRFS-2701 wip for musician profile UI enhancements
2015-02-21 23:26:08 -05:00
Brian Smith
6657c810ed
Merge branch 'feature/musician_profile_enhancements' of bitbucket.org:jamkazam/jam-cloud into feature/musician_profile_enhancements
2015-02-21 09:20:26 -05:00
Brian Smith
20baeb8bd3
VRFS-2701 wip UI changes for musician profile enhancements
2015-02-21 09:20:11 -05:00
Steven Miers
dcf3706099
VRFS-2798 : Hide/show shopping cart icon depending on contents.
2015-02-20 17:53:18 -06:00
Steven Miers
00d8244c6a
VRFS-2786 : Change disabled text for jam track to say "Purchased". Update unit test as well.
2015-02-20 16:40:23 -06:00
Steven Miers
fbb61f6180
Merge branch 'develop' into feature/jam_tracks_refund
2015-02-20 13:16:18 -06:00
Seth Call
0472d6bc79
* VRFS-2686 - jamtrack sliders work
2015-02-20 11:55:49 -06:00
Steven Miers
40eea6319e
Add recurly dependency.
2015-02-20 10:40:23 -06:00
Seth Call
ea482da0dc
* VRFS-2808 - prevent duplicate attempt to open recording
2015-02-20 10:01:11 -06:00
Seth Call
9d70400e91
* VRFS-2806 - disallow concurrent open of dialog
2015-02-20 09:50:03 -06:00
Brian Smith
500af2bc05
merge develop (had lots of migration issues)
2015-02-20 08:35:59 -05:00
Steven Miers
e662c95fba
VRFS-2785 : Add Jam Track Right (purchased jam track) to admin ui. Hook up a refund action.
2015-02-19 16:41:09 -06:00
Steven Miers
bcd3785b45
VRFS-2785 : Update recurly client with refund functionality. Unit test to verify.
2015-02-19 16:40:19 -06:00
Seth Call
38849a1c44
VRFS-2804 - fix code to find the jamtrack ID correctly based on recent client changes
2015-02-19 15:56:42 -06:00
Seth Call
9345d65f06
* merged
2015-02-19 14:31:00 -06:00
Seth Call
7493726e14
* fix test
2015-02-19 13:40:00 -06:00
Seth Call
2b227912cb
* take out hard-coded jamtrack id
2015-02-19 11:29:13 -06:00
Seth Call
d151101567
* VRFS-2803 - remove visually duplicated fader gain bar
2015-02-19 10:44:20 -06:00
Seth Call
85ffa2ec21
* VRFS-2802 - moving media files mixers in personal mode actually affect master mode now
2015-02-19 09:31:30 -06:00
Steven Miers
0907c1acd1
VRFS-2785 : Factory recurly client into ruby project. Fix references and specs as appropriate.
2015-02-19 01:06:50 -06:00
Seth Call
65a8cb5ca4
* VRFS-2800 - cleanup metronome and backing track info on active music session on leave of session
2015-02-18 16:22:24 -06:00
Seth Call
23c7307c6f
* VRFS-2796 - hide X for non openers
2015-02-18 15:41:51 -06:00
Seth Call
b5a70b8ec1
* skip master track types
2015-02-18 10:33:10 -06:00
Seth Call
04cce7ef98
* skip master track types
2015-02-18 10:27:17 -06:00
Seth Call
b09825d188
* VRFS-2791 - unique-ify recorded backing track and backing track IDs
2015-02-18 10:16:47 -06:00
Seth Call
bf0f1345ed
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2015-02-18 03:44:38 -06:00
Seth Call
c30d42c9dd
* VRFS-2777 use SetSessionControlState to update loop info
2015-02-18 03:43:33 -06:00
Jonathan Kolyer
232873819e
VRFS-2700 cleaned up broken tests
2015-02-18 06:33:06 +00:00
Seth Call
39415cdf22
* remove BPM from jam_tracks
2015-02-17 10:41:49 -06:00
Seth Call
6d839f8efa
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2015-02-17 09:45:44 -06:00
Seth Call
2b7ebe1ce1
* use preview recording
2015-02-17 09:45:18 -06:00
Seth Call
51689e3d61
* make backing tracks show on/off and fix migration
2015-02-16 14:59:58 -06:00
Seth Call
b46dce5c29
Merge branch 'feature/backing_tracks' into develop
2015-02-16 10:35:46 -06:00
Seth Call
bfc03fba48
* VRFS-2780 - finish styling loop checkbox
2015-02-16 10:32:23 -06:00
Seth Call
bdc1b898b4
* VRFS-2780 - styling complete; needs testing
2015-02-15 22:15:41 -06:00
Seth Call
e40c964d97
* merged
2015-02-15 22:15:34 -06:00
Seth Call
afe9f65709
* merged
2015-02-15 22:14:30 -06:00
Seth Call
42a2abe99c
* merged
2015-02-15 22:01:06 -06:00
Seth Call
503e46ed74
*wip
2015-02-15 21:52:28 -06:00
Seth Call
c4c05c67d6
* working on sync rework VRFS-2661
2015-02-15 21:52:28 -06:00
Jonathan Kolyer
6a46ad5910
Merge branch 'develop' into feature/recording_selector
2015-02-16 02:20:38 +00:00
Jonathan Kolyer
2c7d35b0bc
VRFS-2700 css fixes
2015-02-16 02:20:05 +00:00
Jonathan Kolyer
c5bd550597
VRFS-2700 got tests running, except adding
2015-02-16 01:59:43 +00:00
Jonathan Kolyer
c44c94671a
VRFS-2700 refactored attemptAdd
2015-02-16 01:59:16 +00:00
Brian Smith
3ca304b612
Merge branch 'develop' into feature/musician_profile_enhancements
2015-02-15 20:57:14 -05:00
Steven Miers
e71b82b15b
VRFS-1846 : Add video gear option to avatar menu, linked to new video page in account section.
2015-02-15 19:35:49 -06:00
Steven Miers
366ba06e89
VRFS-1845 : Webcam settings included in account page. Script uses same WebcamViewer object as the flue.
2015-02-15 19:28:13 -06:00
Jonathan Kolyer
6ff4d197ef
VRFS-2700 recording source jasmine tests
2015-02-15 23:10:29 +00:00
Steven Miers
a35874fa23
VRFS-1844 : Video gear - refactor to allow for non-embedded webcam preview. Add reusable view to a _webcam partial and reference where necessary.
2015-02-15 16:23:47 -06:00
Steven Miers
8a737b3556
VRFS-2473 : Add metronome feature tests.
2015-02-15 14:44:38 -06:00
Steven Miers
c52c429e96
VRFS-2473 : Check ntp clock stability of all session participants before opening metronome.
2015-02-15 14:00:36 -06:00
Seth Call
5c8ee6c96e
* don't obscure
2015-02-15 11:20:42 -06:00
Jonathan Kolyer
40b4537b04
Merge branch 'develop' into feature/recording_selector
2015-02-15 13:57:16 +00:00
Jonathan Kolyer
d745d7c3ca
VRFS-2968 added twitter specs
2015-02-15 13:56:38 +00:00
Jonathan Kolyer
708e842bcc
VRFS-2700 refactored url site test; added deferred state() test
2015-02-15 13:31:45 +00:00
Brian Smith
09b4ed09a4
VRFS-2696 edit musician profile API enhancements
2015-02-15 08:23:26 -05:00
Jonathan Kolyer
f533e4273d
VRFS-2700 url site type tests with ajax mock
2015-02-15 12:51:16 +00:00
Jonathan Kolyer
78321ce374
VRFS-2700 added state deferred call; RecordingSource subclass
2015-02-15 12:27:48 +00:00
Jonathan Kolyer
4aa845cfc8
VRFS-2700 fixed spec stylesheet fixture loading within teaspoon; minor refactoring in site_validator.js
2015-02-15 07:50:04 +00:00
Brian Smith
4b97807fc8
fix syntax error
2015-02-14 21:14:13 -05:00
Brian Smith
c167f9d09a
Merge branch 'develop' into feature/musician_profile_enhancements
2015-02-14 21:04:28 -05:00
Brian Smith
0a1837c4e6
VRFS-2695 VRFS-2696 wip get/update musician profile API changes
2015-02-14 21:02:26 -05:00
Seth Call
bbae4a7bf6
* yaka (yet another kickstarter ad
2015-02-14 16:56:21 -06:00
Seth Call
1c7518c3dd
* adding another kickstarter ad
2015-02-14 16:26:01 -06:00
Seth Call
2c3ed6beea
* check in new ad for kickstarter
2015-02-14 14:25:27 -06:00
Brian Smith
a778eaef28
VRFS-2695 wip get user profile API
2015-02-13 22:45:19 -05:00
Brian Smith
a09894b974
VRFS-2692 add genre_type to genre_players table
2015-02-13 22:27:12 -05:00
Brian Smith
8d1d1b3f16
Merge branch 'develop' into feature/musician_profile_enhancements
2015-02-13 21:42:40 -05:00
Steven Miers
40368deb83
Fix test "for real".
2015-02-13 16:43:52 -06:00
Steven Miers
93ecdd6c86
Fix test: verify on a non-ellipsised attribute, i.e., not text.
2015-02-13 15:34:30 -06:00
Steven Miers
5af190871c
bump
2015-02-13 19:54:18 +00:00
Steven Miers
bbce83984b
VRFS-2498 : Fix spec.
2015-02-13 11:36:03 -06:00
Brian Smith
28ff54b000
VRFS-2695 wip new profile API
2015-02-13 03:16:48 -05:00
Brian Smith
8bd311647a
VRFS-2693 performance model/tests
2015-02-13 01:32:55 -05:00
Seth Call
6007033a15
* explain comment out
2015-02-13 00:00:45 -06:00
Brian Smith
675dc70f23
Merge branch 'develop' into feature/musician_profile_enhancements
2015-02-13 00:49:44 -05:00
Seth Call
72de73f1f9
* remove double-init of external links
2015-02-12 22:25:46 -06:00
Seth Call
f7b4502d70
* tweak text again
2015-02-12 20:59:11 -06:00
Seth Call
b83ba7b863
* tweak text
2015-02-12 20:49:54 -06:00
Seth Call
8d60f161f5
* add new landing ad for kickstarter
2015-02-12 20:46:39 -06:00
Steven Miers
b7b401cf59
VRFS-2498 : Add metronome callback to fake client for tests.
2015-02-12 18:51:07 -06:00
Steven Miers
064b553e31
VRFS-1845 : Add video account section.
2015-02-12 14:33:34 -06:00
Steven Miers
aedcbde1f3
Merge with develop
2015-02-12 14:32:12 -06:00
Steven Miers
81dcd9bddc
VRFS-2498 : Hook up new metronome sounds. Check group_id in lieu of media_type as it is not set for metronomes.
2015-02-12 14:05:25 -06:00
Jonathan Kolyer
889de25a9f
VRFS-2700 fixed error detection for recording sources
2015-02-12 08:31:37 +00:00
Jonathan Kolyer
5e6a63db2e
VRFS-2700 added rec_* site types to site validation
2015-02-12 08:16:54 +00:00
Brian Smith
3096ccaecc
Merge branch 'develop' into feature/musician_profile_enhancements
2015-02-11 22:33:54 -05:00
Brian Smith
895fb92365
VRFS-2693 VRFS-2694 performance sample model wip
2015-02-11 22:33:10 -05:00
Steven Miers
1081efffdd
VRFS-1844 : A webcam component to initialize, and manage the state of, the webcam setup pane. Since this is accessed in several places, this javascript needed generifying.
2015-02-11 11:10:25 -06:00
Brian Smith
e3f27eeebc
VRFS-2694 user presence model tests
2015-02-10 02:44:16 -05:00
Jonathan Kolyer
72477e0840
VRFS-2698 tweaking teaspoon tests
2015-02-10 07:15:56 +00:00
Jonathan Kolyer
463e7d3bbd
VRFS-2698 fixed error in renderErrors
2015-02-10 05:47:07 +00:00
Jonathan Kolyer
febca766e7
VRFS-2698 fixture loading
2015-02-10 05:26:56 +00:00
Jonathan Kolyer
1c367faaa0
VRFS-2698 refactoring file name references
2015-02-10 03:32:18 +00:00
Jonathan Kolyer
fa25e87659
Merge branch 'develop' into feature/site_validator
2015-02-10 03:17:33 +00:00
Seth Call
589faa8071
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2015-02-09 18:08:05 -06:00
Seth Call
df60a43404
* adding gear dump
2015-02-09 18:07:49 -06:00
Steven Miers
17b4b1aeca
VRFS-1844 : Fake jam client calls for video APIS to enable faster iterations
2015-02-09 09:43:23 -06:00
Anthony Davis
249209677e
VRFS-905 - updating this spec
2015-02-08 23:06:56 -06:00
Anthony Davis
f3bae8a97b
VRFS-1967 - clear up error message to assist user
2015-02-08 21:15:20 -06:00
Anthony Davis
d70ec7ac0e
VRFS-850 additional tests
2015-02-08 21:01:57 -06:00
Anthony Davis
558db2c37b
VRFS-850 - adding test for VRFS-2266
2015-02-08 20:25:55 -06:00
Seth Call
0e01e9cc52
* shortening kickstarter URL
2015-02-08 15:06:17 -06:00
Jonathan Kolyer
486a3d62e8
Merge branch 'develop' into feature/site_validator
2015-02-08 07:24:11 +00:00
Jonathan Kolyer
9acef48678
VRFS-2698 add spec tests for valid/invalid site types
2015-02-08 07:23:08 +00:00
Jonathan Kolyer
e466ca0f5a
VRFS-2698 implemented site_validator
2015-02-08 06:10:31 +00:00
Brian Smith
9ede0912a1
Merge branch 'develop' into feature/musician_profile_enhancements
2015-02-07 23:22:48 -05:00
Seth Call
108a89aa9e
* VRFS-2750 - fix test for changing in landing page
2015-02-07 15:11:02 -06:00
Seth Call
8c001eb839
* VRFS-2750 - update /landing/wo to look good for kickstarter
2015-02-07 14:12:31 -06:00
Seth Call
66bfbd875c
* comment out failing test checks for follow buttons for now, and update jamblaster link for styling suggestions
2015-02-07 08:53:30 -06:00
Seth Call
b89e6e9475
* VRFS-2748, VRFS-2749 - update styling for / page and home page
2015-02-06 22:04:37 -06:00
Seth Call
3563e6e08a
* VRFS-2747 - incorporating welcome message from David; made headers white
2015-02-06 17:07:18 -06:00
Jonathan Kolyer
90f3d9efe1
VRFS-2698 refactoring
2015-02-06 07:43:24 +00:00
Jonathan Kolyer
9f27ef8429
VRFS-2698 renamed url_validator to site_validator
2015-02-06 07:43:24 +00:00
Jonathan Kolyer
1d42b7b662
VRFS-2698 refactoring validator interface
2015-02-06 07:43:24 +00:00
Jonathan Kolyer
d52f5b2372
VRFS-2698 repurposed urls into usernames
2015-02-06 07:43:24 +00:00
Jonathan Kolyer
ed47441f67
VRFS-2698 refactoring website_validate to url_validate
2015-02-06 07:43:24 +00:00
Steven Miers
0d9773297c
VRFS-1844 : Styling and layout for video gear page.
2015-02-05 13:36:34 -06:00
Steven Miers
3c3681964d
Don't render unused view.
2015-02-05 09:00:58 -06:00
Brian Smith
33aef8a380
VRFS-2694 user presence model
2015-02-05 03:34:25 -05:00
Steven Miers
e8375b920e
VRFS-1844 : Logic and UI to insert video page on gear wizard - Incremental.
2015-02-04 13:00:19 -06:00
Brian Smith
3cdcadda94
merge develop
2015-02-03 23:39:21 -05:00
Brian Smith
05ba1ea5d3
VRFS-2694 wip user presence model and spec
2015-02-03 23:37:20 -05:00
Seth Call
a0e486aed7
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2015-02-03 09:49:34 -06:00
Seth Call
768c9e2024
VRFS-2739 - remove aggressive check for bad session info and add some basic tests to catch errors in the future
2015-02-03 09:49:19 -06:00
Jonathan Kolyer
f0f130caae
Merge branch 'develop' into VRFS-2697
2015-02-03 06:39:12 +00:00
Jonathan Kolyer
14f6e835d1
VRFS-2697 trying to get the test to work... feeling pretty much lost getting nowhere
2015-02-03 06:37:41 +00:00
Anthony Davis
45fc643f9d
Mark failing scenario pending
2015-02-02 18:42:09 -06:00
Brian Smith
80305c05aa
Merge branch 'develop' into feature/musician_profile_enhancements
2015-02-02 19:22:33 -05:00
Brian Smith
97368b8ed4
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2015-02-02 19:19:58 -05:00
Jonathan Kolyer
75b8be7a85
VRFS-2697 spec tests
2015-02-02 07:45:52 +00:00
Jonathan Kolyer
e7bb30f730
Merge branch 'develop' into VRFS-2697
2015-02-02 05:44:42 +00:00
Anthony Davis
413bea651b
VRFS-2193 - remove seemingly unnecessary waits
2015-02-01 21:43:11 -06:00
Anthony Davis
f1b826fbaf
VRFS-2193 - test musician display on Feed view according to new spec
2015-02-01 21:40:23 -06:00
Anthony Davis
4f08e26490
helper - request to join session
2015-02-01 20:38:21 -06:00
Anthony Davis
1b2a2f481a
VRFS-850 - refactor in_session helper for controlling access
2015-02-01 20:20:39 -06:00
Steven Miers
f80e9358f0
Fix unit tests.
2015-02-01 19:29:21 -06:00
Steven Miers
957ecf6735
VRFS-2730 : Better styling for backing tracks loop checkbox.
2015-02-01 18:22:07 -06:00
Brian Smith
e516983aa5
VRFS-1985 detect browser / invalid config when starting a session from the future sessions section
2015-02-01 19:14:39 -05:00
Steven Miers
eff19235c3
VRFS-2730 : Hook up jamtrack looping.
2015-02-01 17:59:43 -06:00
Steven Miers
2abd597610
VRFS-2717 : Show length and type on backing track dialog - UI.
2015-02-01 17:59:43 -06:00
Steven Miers
a10078260a
VRFS-2722 : Styling and logic necessary to display long labels on backing and other tracks.
2015-02-01 17:59:43 -06:00
Steven Miers
e12cbe783c
VRFS-2717 : Show type (extension) and file length in MB.
2015-02-01 17:59:43 -06:00
Brian Smith
cce2ce2ffc
minor change to ensure current instance session id is used
2015-02-01 17:15:01 -05:00
Seth Call
e9d2df58df
* VRFS-2726 - media_type is not set for develop builds of the client; so null means Recording in develop branch
2015-02-01 14:15:37 -06:00
Seth Call
8234c4c510
* VRFS-2726 - media_type is not set for develop builds of the client; so null means Recording in develop branch
2015-02-01 14:15:17 -06:00
Brian Smith
79507f5f06
VRFS-2693 VRFS-2694 wip new musician profile models and specs
2015-02-01 08:42:44 -05:00
Jonathan Kolyer
082edc7075
VRFS-2697 css styling
2015-02-01 03:43:58 +00:00
Steven Miers
d8c000c7f7
VRFS-2716 : Compare proper string for backing track type. Change a few client calls to correct function names.
2015-01-31 17:57:54 -06:00
Seth Call
cb63439219
* VRFS-2716 - reference to .path in SessionOpenBackingTrack changed to .name
2015-01-31 15:28:53 -06:00
Seth Call
ac1271634d
* VRFS-2716 - changes to deal with new getBackingList format, VRFS-2661 - accepting backing_track info in Track.sync (wip)
2015-01-31 15:20:48 -06:00
Brian Smith
8d19e4510e
VRFS-2693 VRFS-2694 wip new musician profile models
2015-01-31 16:07:34 -05:00
Jonathan Kolyer
9e777a84aa
VRFS-2697 display errors from server-side site check
2015-01-31 18:45:10 +00:00
Jonathan Kolyer
9086fac76a
VRFS-2697 enhanced error handling; crop url length
2015-01-31 18:07:51 +00:00
Jonathan Kolyer
abb5c3afb2
VRFS-2697 fixed js typo
2015-01-31 08:59:25 +00:00
Jonathan Kolyer
fdcc77ae80
VRFS-2697 url format and site validation
2015-01-31 08:41:56 +00:00
Jonathan Kolyer
6069399a55
VRFS-2697 initial url validation
2015-01-31 05:22:58 +00:00
Jonathan Kolyer
16092ba816
VRFS-2697 website validator initial commit
2015-01-31 04:50:05 +00:00
Seth Call
7352fa9b19
* VRFS-2613 - optimizing hourly cleanup by moving it to the score report routine
2015-01-30 10:46:02 -06:00
Seth Call
96bc9487c4
* merged
2015-01-29 16:13:40 -06:00
Steven Miers
a4d8ea5f60
VRFS-2498 : Fix tempo and sound strings for initial metronome opening.
2015-01-29 16:12:26 -06:00
Steven Miers
d9d3e67fc5
VRFS-2582 : Hook up to client rather than stubbed API to list backing tracks. Implement in fakeJamClient for easy testing.
2015-01-29 16:11:57 -06:00
Seth Call
3496aa999f
* wip
2015-01-29 14:17:55 -06:00
Steven Miers
33177ddae6
Merge with develop.
2015-01-29 10:55:10 -06:00
Steven Miers
aec1419e6e
Check for nil - fix intermittent test failure.
2015-01-29 10:53:30 -06:00
Steven Miers
5ed67cc8f6
VRFS-2667, VRFS-2668 : Fix broken spec.
2015-01-29 09:50:13 -06:00
Brian Smith
f521f3ba4c
VRFS-2689 new ruby models supporting db schema updates
2015-01-29 00:48:24 -05:00
Brian Smith
5a2fbab21c
VRFS-2689 user model changes for musician profile enhancements
2015-01-29 00:45:47 -05:00
Steven Miers
63574f5a25
VRFS-2667, VRFS-2668 : list_uploads and list_downloads implementation and tests.
2015-01-28 19:22:36 -06:00
Steven Miers
d7fc313d5f
VRFS-2665, VRFS-2666 : Create models and relationships for two new tables: backing_tracks and recorded_backing_tracks
2015-01-28 19:22:36 -06:00
Steven Miers
aa20f77eaf
*Bump
2015-01-28 16:08:47 +00:00
Steven Miers
9ae7b425ad
Restore missing tags.
2015-01-27 14:58:59 -06:00
Seth Call
43b9fd0559
* fix test
2015-01-27 07:25:19 -06:00
Seth Call
6de64a1005
Merge branch 'develop' into feature/session_jamtracks
2015-01-26 21:22:59 -06:00
Seth Call
f53c5c9612
*wip
2015-01-26 21:22:44 -06:00
Steven Miers
23d4c88f46
Convert session partial to slim.
2015-01-26 14:24:15 -06:00
Steven Miers
6f8113b374
Merge branch 'develop' into feature/backing_tracks
2015-01-26 12:11:57 -06:00
Seth Call
c86aa6a5d7
* fake to bounce jenkins
2015-01-23 17:11:49 -06:00
Seth Call
8556aaac13
* make dynamic registrations confgurable, in case server crashes again: VRFS-2645
2015-01-23 16:51:59 -06:00
Seth Call
65f1f0fe79
* VRFS-2640 - double-check if jobs are concurrent safe
2015-01-23 14:50:09 -06:00
Seth Call
ac204782b3
* fixing tests
2015-01-23 14:30:52 -06:00
Seth Call
9c9a42c2a5
* merged
2015-01-23 13:56:10 -06:00
Seth Call
7844f2ffad
* wip
2015-01-23 13:55:15 -06:00
Seth Call
372444ebd1
* wip
2015-01-23 10:50:58 -06:00
Brian Smith
3f2be132bd
VRFS-2539 protect against error during notification load if the related session is missing / clean up the notifications of nonexistent sessions
2015-01-21 22:40:31 -05:00
Steven Miers
0d9bd33eb7
Clean up and adjust session UI to display metronome tempos and click sound. Update client.
...
Style updates to fit selects and default to 120 bpm.
2015-01-21 20:16:52 -06:00
Seth Call
f43061b8ac
* remove unused stuff
2015-01-21 15:24:42 -06:00
Seth Call
698f4ba648
* wip
2015-01-21 15:22:31 -06:00
Steven Miers
4741312294
Fix test, cleanup
2015-01-21 15:10:02 -06:00
Steven Miers
c70a5ee2bb
Merge branch 'develop' into feature/backing_tracks
2015-01-21 14:16:04 -06:00
Steven Miers
ff95fe1c35
VRFS-2498, VRFS-2499 : Mesh out backing track/metronome track support at necessary layers rest/api/UI/etc. Implement necessary methods in fakeJamClient for quicker iterating.
2015-01-20 22:14:48 -06:00
Brian Smith
f80b0e4f66
VRFS-2193 show only active musicians in each feed item detail view for in-progress sessions
2015-01-20 02:21:25 -05:00
Steven Miers
fe64995f54
Merge branch 'develop' into feature/backing_tracks
2015-01-19 17:10:28 -06:00
Steven Miers
cefce67e89
Merge branch 'develop' into feature/backing_tracks
2015-01-19 15:21:13 -06:00
Seth Call
8f9e49ccf1
* VRFS-2660 - fixing dead links in welcome email and some corp pages
2015-01-19 15:07:52 -06:00
Seth Call
f8b3d8cc7d
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2015-01-19 10:25:53 -06:00
Seth Call
6880aec9ef
* VRFS-2658 - adding commints
2015-01-19 10:24:23 -06:00
Seth Call
48b2f5b965
* add value = 1 to series
2015-01-19 10:24:18 -06:00
Seth Call
8a6a9b224b
* VRFS-2658 - track if audio was established
2015-01-19 10:24:11 -06:00
Steven Miers
5f9f8a0cdd
Cleanup; upgrade deprecated gem. Attempt to fix intermittently failing test.
2015-01-16 18:00:44 -06:00
Seth Call
c5af644a38
* do not accept latency above 10000ms on user model
2015-01-16 17:20:07 -06:00
Steven Miers
3fb45c0dd0
VRFS-2499 - Incremental, nearly done.
2015-01-15 20:28:34 -06:00
Steven Miers
4f94444429
VRFS-2498, VRFS-2618 : API, routes and specs for backing tracks/metronomes.
2015-01-13 10:15:46 -06:00
Brian Smith
b0bf4b4a48
VRFS-2465 added script to migrate text messages in notifications table to the new text_messages table
2015-01-12 22:53:55 -05:00
Brian Smith
2017fed9ce
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2015-01-12 22:37:28 -05:00
Brian Smith
54d0f36319
VRFS-2465 use new table for text messages
2015-01-12 22:37:07 -05:00
Steven Miers
c6f03a91b8
VRFS-2498, VRFS-2618 More coherent data model and logic for backing tracks and metronome re: active_music_session_spec.
2015-01-12 17:44:20 -06:00
Seth Call
5b17c50f83
* make reconnect messages warn
2015-01-12 14:10:26 -06:00
Seth Call
5f9986b30e
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2015-01-12 13:40:38 -06:00
Seth Call
9718cc7cca
* remove dynamic registration code
2015-01-12 13:37:50 -06:00
Steven Miers
babd9d7d90
VRFS-2540 : Don't send welcome email if recaptcha fails. Spec to verify.
2015-01-12 12:41:44 -06:00
Brian Smith
825a293c30
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2015-01-12 02:08:09 -05:00
Brian Smith
73e8f9ac6f
VRFS-2465 wip text message changes
2015-01-12 01:26:27 -05:00
Brian Smith
21f25e51d0
VRFS-1985 VRFS-2252 added tests
2015-01-12 01:20:19 -05:00
Seth Call
edbd28d357
* remove extra close bracket in listen link fi
2015-01-11 20:46:45 -06:00
Seth Call
5b1cb4527f
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2015-01-11 20:43:55 -06:00
Seth Call
46ae56e7e8
* fix listen link
2015-01-11 20:43:15 -06:00
Brian Smith
a07728ffa3
Merge branch 'feature/find_session_start_session' into develop
2015-01-11 21:22:59 -05:00
Steven Miers
a900087d87
VRFS-2540 : Fix. Remove usage of recaptcha; refactor nocaptcha check in google_client (was youtube_client). Fix and add tests.
2015-01-11 19:17:18 -06:00
Seth Call
d139966445
VRFS-2643 - run eventmachine in it's own thread
2015-01-11 16:41:49 -06:00
Seth Call
2c8a4b8483
* VRFS-2642 - reconnect at start of each job
2015-01-11 15:43:42 -06:00
Seth Call
4d8a7a9bc1
* wip
2015-01-11 15:42:12 -06:00
Steven Miers
d0c0c6d01e
VRFS-2498, VRFS-2499 : Validations.
2015-01-11 14:15:47 -06:00
Steven Miers
f6111516fd
VRFS-2499 : Metronome schema changes.
2015-01-11 13:42:42 -06:00
Steven Miers
0c1abfba22
VRFS-2499 : Schema changes for backing tracks.
2015-01-11 13:05:55 -06:00
Brian Smith
50ede5bd9e
VRFS-1985 VRFS-2252 allow only session creator to start session with TBD date/time
2015-01-10 15:09:06 -05:00
Seth Call
7e0ba4ed44
* fix bad code introcude into jamtrack download method by me
2015-01-09 16:13:04 -06:00
Seth Call
5ac69fc646
* wip
2015-01-09 16:11:04 -06:00
Seth Call
72ef14a87d
* remove spurious log
2015-01-09 15:20:32 -06:00
Seth Call
0ab7686205
* VRFS-2484 - wip pausing point; the code should not affect stability because it's mostly jamtrack only related
2015-01-09 15:15:12 -06:00
Seth Call
e8ffb9c27d
Merge branch 'develop' into feature/session_jamtracks
2015-01-09 11:24:03 -06:00
Seth Call
2c798e8860
* VRFS-2629 - one can follow the progression of a jam track being signed with detail
2015-01-09 11:23:20 -06:00
Brian Smith
4e0d2cd1cf
Merge branch 'develop' into feature/find_session_start_session
2015-01-09 07:08:41 -05:00
Steven Miers
34d7985762
VRFS-2498, VRFS-2499 : Incremental
2015-01-09 02:47:46 -06:00
Brian Smith
aeabfcafc8
VRFS-1985 VRFS-2252 only show start button for RSVP / invited user if there is less than 15 minutes left to sesession start time
2015-01-09 03:08:03 -05:00
Brian Smith
9643fe1187
fixed javascript error on session detail screen
2015-01-09 02:38:38 -05:00
Brian Smith
47293afee4
VRFS-1985 VRFS-2252 allow RSVP and invited users to start session from Find Session screen
2015-01-09 02:10:44 -05:00
Seth Call
cc3bf2ce1f
* wip
2015-01-08 20:35:39 -06:00
Seth Call
b5c446dd04
* VRFS-2625 - adding bpm and tap_in_count to tap in row, and remove tap_in from jamtracks
2015-01-08 11:38:46 -06:00
Steven Miers
9dc364ea20
VRFS-2498 : Metronome graphic, made transparent. Session UI for metronome.
2015-01-08 11:14:02 -06:00
Seth Call
e28db48e94
* resolving VRFS-2624 - if nil recording_ids, just exit early
2015-01-08 10:25:54 -06:00
Brian Smith
79eec652d1
VRFS-1985 wip start session from Find Session screen
2015-01-07 23:18:07 -05:00
Seth Call
3fb5ab89d9
* typo in user wipe to fix test
2015-01-07 18:24:48 -06:00
Seth Call
ef03b8886a
* missed merge conflict
2015-01-07 17:45:47 -06:00
Seth Call
e9e9962c42
Conflicts:
...
db/manifest
ruby/spec/jam_ruby/models/email_batch_spec.rb
2015-01-07 17:44:56 -06:00
Seth Call
99f5e46ff6
* another quick fix for broken databasecleaner transaction cleanup
2015-01-07 16:57:25 -06:00
Seth Call
d58cf2a048
* VRFS-2617 - allow only purchased jamtracks to be returned by list method. (reuse existing API)
2015-01-07 16:16:57 -06:00
Steven Miers
3028e421fb
VRFS-2614 : Allow jam track to be hidden to non-admin users by setting available=false.
...
Model, controller, admin UI, web UI, and spec to verify non-available
jam_tracks can only be seen by admin users.
2015-01-07 12:33:49 -06:00
Steven Miers
81ad2c89b5
VRFS-2610 : Fix bad API call that was throwing exception in console.
2015-01-07 11:27:21 -06:00
Seth Call
405c155c71
* VRFS-2606 get offset time into MM:SS:MLS format
2015-01-07 11:07:26 -06:00
Seth Call
2ff30946e8
* VRFS-2606 - add new tap in fields, support them in activeadmin
2015-01-07 09:30:05 -06:00
Seth Call
b4fed74b50
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2015-01-07 08:55:16 -06:00
Seth Call
585f307747
* add missing icon_folder.png
2015-01-07 08:54:28 -06:00
Brian Smith
67b1132d24
VRFS-2554 fixed notification for scheduled session with TBD date/time
2015-01-06 21:20:41 -05:00
Seth Call
98c99c9a12
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2015-01-06 16:52:24 -06:00
Seth Call
af83a4f6a1
* VRFS-2608 - refactor and slight cleanup of UI towards new spec
2015-01-06 16:51:19 -06:00
Steven Miers
7a9e5ec9a9
VRFS-2609 : Put cancel button next to create account button.
2015-01-06 12:14:30 -06:00
Seth Call
1cb9f47f6c
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2015-01-06 09:41:53 -06:00
Seth Call
7df0258015
* VRFS-2600 - tracks saved as id.ext to expose metadata
2015-01-06 09:36:05 -06:00
Steven Miers
8540cd6b90
Merge branch 'feature/nocaptcha' into develop
2015-01-05 23:09:35 -06:00
Steven Miers
32dd3f272f
Touch
2015-01-06 03:45:39 +00:00
Steven Miers
9047e26aba
Bypass recaptcha for feature specs exercising the signup mechanism.
2015-01-05 21:29:23 -06:00
Seth Call
eb26c33858
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2015-01-05 20:26:42 -06:00
Seth Call
4e6ca425d9
* trying to fix tests
2015-01-05 20:26:36 -06:00
Steven Miers
8009e309ea
Merge branch 'develop' into feature/nocaptcha
2015-01-05 19:04:57 -06:00
Steven Miers
18d06096b5
Revert "Fix spec that was magically passing sporadically."
...
This reverts commit 4cc70f2082 .
2015-01-05 19:04:08 -06:00
Steven Miers
f677714e9a
Revert change.
2015-01-05 19:03:28 -06:00
Steven Miers
02aef2fe17
Fix test failures for jam_track rights.
2015-01-05 19:02:48 -06:00
Steven Miers
eb990dd930
One more foxy
2015-01-05 18:27:14 -06:00
Steven Miers
4cc70f2082
Fix spec that was magically passing sporadically.
2015-01-05 17:47:27 -06:00
Steven Miers
16667a9ce3
Fix typo.
2015-01-05 17:25:43 -06:00
Steven Miers
6cfe5decbf
Merge branch 'develop' into feature/nocaptcha
2015-01-05 17:04:13 -06:00
Steven Miers
4d5b1c0ee1
VRFS-2540 : Add recaptcha tests to user manager spec that verify that system behaves properly for both the passed-in recaptcha flag AND the "recaptcha_enable" application config value.
2015-01-05 17:02:55 -06:00
Steven Miers
9d5d36f059
VRFS-2540 : Clean out some existing recaptcha scaffolding.
...
Current recaptcha gem only works within controllers, so pass flag down
the stack when recaptcha fails. Respect application config for
“recaptcha_enable” at all levels higher than user level. Allows usage
of existing mechanism for attribute validation and passing subsequent
errors back to the UI for reporting.
2015-01-05 17:01:28 -06:00
Steven Miers
13e6f226ea
VRFS-2540 : Recaptcha UI components
2015-01-05 16:57:49 -06:00
Seth Call
6906e4454a
* VRFS-2601 - REST API to return keys
2015-01-05 16:53:43 -06:00
Seth Call
d677b43c28
* VRFS-2603 private key now stored
2015-01-05 15:19:20 -06:00
Seth Call
7f18bff3fc
* VRFS-2602 - make it dead easy to parse out JamTrackId from URL
2015-01-05 14:48:46 -06:00
Seth Call
aabbd90b02
* VRFS-2602 change jka to jkz
2015-01-05 14:39:55 -06:00
Seth Call
356e9c657a
* bump to get a develop build out
2015-01-04 22:45:13 -06:00
Steven Miers
abbc01fc44
VRFS-2597 : Fix logging method in cleaner to fix spec.
2015-01-04 16:38:28 -06:00
Steven Miers
2853c77b7e
VRFS-2597 : Fix some broken tests:
...
* Naming issues
* Restore method that was caught by friendly fire in a cleanup session
* Add a few new specs to properly exercise controller methods to catch
errors sooner, i.e., not in feature specs.
* Restore deleted route
2015-01-04 16:24:31 -06:00
Seth Call
d3b613c2dc
* updating new JamTrack resque jobs for non-forking behavior, log corrections (a bad pattern I started), and extending from Stats-enabled base jobs
2015-01-04 14:18:25 -06:00
Seth Call
aed848c507
Merge branch 'develop' into feature/jam_tracks
...
Conflicts:
db/manifest
pb/src/client_container.proto
ruby/lib/jam_ruby.rb
web/config/environments/development.rb
web/config/environments/test.rb
2015-01-04 09:31:33 -06:00
Seth Call
77d62a4744
Merge branch 'feature/jam_tracks' of bitbucket.org:jamkazam/jam-cloud into feature/jam_tracks
...
Conflicts:
web/jt_metadata.json
web/spec/controllers/api_recurly_spec.rb
2015-01-04 09:02:04 -06:00
Seth Call
1f72d1cca4
* debug test that messes with websocket gateway
2015-01-04 09:00:50 -06:00
Steven Miers
3c719e3f97
Another puts.
2015-01-03 11:51:42 -06:00
Steven Miers
8eb7430d9a
One more stray puts.
2015-01-03 11:47:28 -06:00
Steven Miers
94480e1d88
Don't commit transient file.
2015-01-03 11:45:24 -06:00
Steven Miers
2c2a32e140
Remove stray puts.
2015-01-03 11:45:24 -06:00
Seth Call
1ede9574cd
VRFS-2547 - capitializing JAMTRACKS_DIR in ruby tests
2015-01-02 22:06:03 -06:00
Seth Call
3c1816492c
* fix event_spec test for the rename of broadcast wixget on session landing page
2015-01-02 16:32:33 -06:00
Seth Call
4873da6448
* make test not break randomly
2015-01-02 16:00:53 -06:00
Seth Call
5f14f73322
* some more fixes for broadcasting - VRFS-2523
2015-01-02 15:29:31 -06:00
Seth Call
82b7c005ec
* if promos is selected, then change text to 'Selected Sessions and Recordings' VRFS-2591
2015-01-02 11:18:39 -06:00
Seth Call
5758096f33
* fix bug in connection stats
2015-01-01 21:45:07 -06:00
Seth Call
0f288539cd
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2015-01-01 14:23:00 -06:00
Seth Call
9b1525715e
* fix a bug in broadcasting and also fix bad log refernce
2015-01-01 14:22:42 -06:00
Jonathan Kolyer
559d2d720d
VRFS-2552 update query to include users started scheduled sessions not yet finished
2015-01-01 19:29:18 +00:00
Jonathan Kolyer
e8fd6360aa
VRFS-2552 removed config.json_engine due to this error: undefined method key? JSON::Ext::Generator::State
2015-01-01 18:00:43 +00:00
Seth Call
8a84ff5609
* fix broken tests because of removal of diagnostics, and fix bad logging pattern
2014-12-31 23:17:47 -06:00
Seth Call
9ad521fa71
* comment two other noisy diagnostic reports
2014-12-31 20:47:36 -06:00
Seth Call
83396675e6
* remove a diagnostic from javascript
2014-12-31 20:44:51 -06:00
Seth Call
116cf8cfce
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-12-31 20:39:27 -06:00
Seth Call
71399dcaa7
* fixes for multiple issues: VRFS-2587 - no forking in resque, VRFS-2586 - fix influxdb client's shutdown behavior, VRFS-2585 - firefox cache busting
2014-12-31 20:39:22 -06:00
Steven Miers
83bd5b6c6e
VRFS-2588 : YouTube client, remove logging
...
Also, do some misc cleanup.
2014-12-31 19:35:20 -06:00
Seth Call
d901c3a498
* try to fix test again
2014-12-31 12:34:17 -06:00
Seth Call
2fc6edf579
* fix broken test
2014-12-30 21:14:36 -06:00
Seth Call
ed15eef3ac
* I'm not sure how I typo'ed this...
2014-12-30 21:06:56 -06:00
Seth Call
a3f40b2f99
* fix typo in write_point /write VRFS-2569
2014-12-30 17:15:28 -06:00
Seth Call
6058b1770a
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-12-30 17:12:44 -06:00
Seth Call
6fc32f1624
add influxdb support to Ruby/Javascript code, and instrument code as a starting point VRFS-2569
2014-12-30 17:12:24 -06:00
Seth Call
786486026b
* wip
2014-12-30 17:10:16 -06:00
Steven Miers
bb298dd6b9
VRFS-2548 : Config-ize location of jamtracks python tool
2014-12-29 15:05:19 -06:00
Brian Smith
a402e31633
VRFS-2102 dedup instruments for in session users
2014-12-28 00:19:25 -05:00
Brian Smith
9eb6870502
VRFS-2359 warn user when starting a TBD session
2014-12-23 01:50:07 -05:00
Steven Miers
bbee617c4b
VRFS-1960 : Jam Track Signed Notification, usage in notificationPanel, and spec.
2014-12-22 14:23:05 -06:00
Seth Call
aa1706f8ac
* adding diagnostic/user index
2014-12-22 09:53:49 -06:00
Seth Call
7ca3acb676
* wip
2014-12-22 09:50:59 -06:00
Seth Call
3edd37242b
* VRFS-2574 bring back public/private on recording if jamtracks is disabled
2014-12-20 14:11:36 -06:00
Seth Call
4a79f0c4ec
* wip
2014-12-20 14:05:31 -06:00
Seth Call
9876c00a7a
* VRFS-2456 - add listen function to find session page, and update of join/rsvp icons
2014-12-19 14:00:49 -06:00
Seth Call
3bac8252e9
* fixing websocket tests
2014-12-18 16:26:56 -06:00
Seth Call
08a266a203
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-12-18 16:08:29 -06:00
Seth Call
06906189d9
* VRFS-2229, VRFS-2523 broadcast fixes
2014-12-18 15:15:51 -06:00
Seth Call
01808e6dac
* VRFS-2523 - broadcast fixes
2014-12-18 15:14:23 -06:00
Seth Call
d83a632d0b
Conflicts:
...
db/manifest
web/app/assets/javascripts/jam_rest.js
2014-12-18 15:13:55 -06:00
Brian Smith
16fb200a2e
VRFS-2162 clear out friend text entry box after selection is made (fixes bug when tabbing out of friend selector list)
2014-12-17 22:43:36 -05:00
Steven Miers
34cb617f5f
VRFS-1960 : download API for JamTracks, including a new message type, rescue job that builds the JKZ, and specs that exercise it all.
2014-12-17 17:19:36 -06:00
Seth Call
566035348b
* VRFS-2562, VRFS-2561, VRFS-2560 - fixes for mute state and behavior for voice chat and my tracks
2014-12-17 09:08:45 -06:00
Brian Smith
08842ae243
VRFS-2426 do not divide by 2 when calculating full score for latency badge
2014-12-17 01:14:37 -05:00
Anthony Davis
39cae7e0a0
VRFS-2559 - button spacing
2014-12-16 21:35:52 -06:00
Steven Miers
795cb6f536
Dedicated spec for testing cleaner. Some cleanup/renaming.
2014-12-15 23:57:57 -06:00
Steven Miers
ff42a84598
VRFS-2482 : Jam Tracks cleanup and initial spec.
2014-12-15 20:30:46 -06:00
Steven Miers
361d88a0fa
VRFS-1959 : jam_tracks#list_downloads API and model methods, as well as associated tests to verify.
2014-12-15 19:21:27 -06:00
Steven Miers
8ac9d19e73
VRFS-2481 : Use jam_tracks object hierarchy to create jkz file, and upload to AWS. Meshed out spec to verify creation and upload, including a real ogg file (required by the python tool).
2014-12-15 18:02:51 -06:00
Steven Miers
1a7420ffb1
Whack files no longer needed.
2014-12-15 12:26:38 -06:00
Steven Miers
ab821ab7d4
Merge branch 'feature/jam_tracks_downloadable' into feature/jam_tracks_merge
2014-12-15 12:21:42 -06:00
Steven Miers
49ada397be
Remove silly file.
2014-12-15 12:20:30 -06:00
Steven Miers
6407d2f22a
Merge from working branch
2014-12-15 12:16:19 -06:00
Steven Miers
ac2daed4da
VRFS-2481 : Jam Tracks python layer and source.
2014-12-15 12:16:19 -06:00
Steven Miers
f6fef00ea5
VRFS-1952 : Schema changes for proper type and incremental code changes. WIP.
2014-12-15 12:16:19 -06:00
Steven Miers
6a758532dc
VRFS-2481 : Code and spec cleanup
2014-12-15 12:08:37 -06:00
Steven Miers
8be471fc99
Better error reporting. Test now currently fails as expected.
2014-12-15 11:59:07 -06:00
Steven Miers
4f161c44e3
VRFS-2481 : Better implementation of external script. Getting proper stdout and stderr, as well as a clean implicit shutdown.
2014-12-14 21:40:03 -06:00
Brian Smith
c71b9c8f0f
VRFS-2441 prevent long notation file names from overlaying buttons
2014-12-14 22:25:08 -05:00
Steven Miers
aae589944d
VRFS-2481 : Create test for JKZ method. Some cleanup.
2014-12-14 20:20:40 -06:00
Steven Miers
2206ba8593
VRFS-2481 : Use relative path to include jam_tracks.
2014-12-14 20:16:24 -06:00
Steven Miers
f11457f5ed
VRFS-2481 : Jam Tracks python layer and source.
2014-12-14 20:03:49 -06:00
Steven Miers
5c849f2faa
VRFS-1952 : Schema changes for proper type and incremental code changes. WIP.
2014-12-14 18:18:04 -06:00
Jonathan Kolyer
831fe68138
VRFS-2529 fixed broken test
2014-12-09 02:57:15 +00:00
Seth Call
977a83277d
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-12-08 15:37:38 -06:00
Seth Call
566598fffc
* fix for failing tests
2014-12-08 15:37:31 -06:00
Jonathan Kolyer
f193ca2f42
VRFS-2529 added create type for session creation
2014-12-08 06:31:45 +00:00
Jonathan Kolyer
93672844f2
VRFS-2529 remove quick-start scheduled sessions from account tab
2014-12-08 06:26:06 +00:00
Seth Call
2c6eab206e
* change approach to updating connections
2014-12-07 22:31:06 -06:00
Brian Smith
937695e829
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-12-07 21:35:36 -05:00
Brian Smith
605bdbcbf6
VRFS-2463 added tests for excluding currently viewed sessions/recordings
2014-12-07 21:35:30 -05:00
Steven Miers
70d58a53ec
Bump
2014-12-07 22:35:16 +00:00
Seth Call
486d97509a
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-12-07 16:05:07 -06:00
Seth Call
53ce955838
* VRFS-2530 - denormalize online for performance reasons
2014-12-07 16:04:10 -06:00
Jonathan Kolyer
d4055b7a1c
fixed broken band_spec tests
2014-12-07 17:10:25 +00:00
Steven Miers
8634d4f726
VRFS-1959 : change the primary key (id) to be a big int and to share the sequence used by mixes.id and recorded_tracks.id
...
Also modify references as necessary, both from other tables and various
code usages.
2014-12-06 19:55:59 -06:00
Seth Call
34f0aff328
* build poke
2014-12-06 15:47:20 -06:00
Steven Miers
207b7b9e20
VRFS-1890 : Mechanism to move track up/down, hook up in admin UI.
2014-12-06 14:04:31 -06:00
Brian Smith
354f6320fc
VRFS-2463 (1) prevent duplicate claimed recordings from showing in sidebar, (2) only show public recordings and sessions with fan_access=true, (3) exclude recording / session being shown on landing page in the sidebar
2014-12-06 09:34:30 -05:00
Jonathan Kolyer
d8057525bf
VRFS-2424 refactored band_genres to genre_players
2014-12-05 14:23:14 +00:00
Jonathan Kolyer
e53b9b3df8
VRFS-2424 added user genres
2014-12-05 08:16:49 +00:00
Jonathan Kolyer
9f60327d20
VRFS-2424 added user.genres; refactored band_genres to genre_players; incorporated editing of user genres in profile
2014-12-05 07:50:03 +00:00
Steven Miers
bac1f69c88
README.md edited online with Bitbucket
2014-12-04 00:32:46 +00:00
Steven Miers
b6850ccce4
VRFS-2481 : Cascading deletes for join table. Add s3 URL.
2014-12-03 16:12:47 -06:00
Steven Miers
0808ce04f9
Address test failure by actually creating the jam_track_right.
2014-12-03 13:48:14 -06:00
Jonathan Kolyer
e4e3121b31
VRFS-1442 cosmetic updates
2014-12-03 08:22:35 +00:00
Jonathan Kolyer
e834a1dfd6
VRFS-1442 refresh session band list each time entering step3
2014-12-03 08:22:35 +00:00
Jonathan Kolyer
868ca0b476
VRFS-1442 sessions band selection
2014-12-03 08:22:35 +00:00
Jonathan Kolyer
9bdddc22ff
VRFS-1442 band deletion; band member layout; invitations; band admin support
2014-12-03 08:22:35 +00:00
Jonathan Kolyer
220fd639e0
VRFS-1442 fixed layout of band social tab
2014-12-03 08:22:35 +00:00
Jonathan Kolyer
45542b7a1d
VRFS-1442 band profile, members editing; change notifyAlert to default to 1 button; added band_admin attribute to band members
2014-12-03 08:22:35 +00:00
Jonathan Kolyer
588f03a199
VRFS-1442 bands page updates
2014-12-03 08:22:35 +00:00
Jonathan Kolyer
465fd6fa94
VRFS-1442 prepend users bands to band search results
2014-12-03 08:22:34 +00:00
Seth Call
069fc6a664
* removing trailing close comment
2014-12-02 17:29:29 -06:00
Seth Call
e0688ac6f1
* VRFS-2520 - recordings can be cleaned up now
2014-12-02 17:13:47 -06:00
Seth Call
589a2f6cc6
* VRFS-2520 - recordings can be cleaned up now
2014-12-02 17:13:34 -06:00
Steven Miers
e85be7f0d5
README.md edited online with Bitbucket
2014-12-02 20:01:20 +00:00
Seth Call
0601e85e9d
* configurable hiding for tests of jamtracks
2014-12-02 07:49:18 -06:00
Seth Call
f6e0ebe910
* disabling shopping cart in view for now
2014-12-01 20:31:52 -06:00
Steven Miers
2e5b3add3c
VRFS-2480: Recurly specs to verify placing an order.
2014-12-01 18:46:05 -06:00
Steven Miers
41096f08ad
VRFS-2480: Additional back-end and UI functionality required for checking out.
2014-12-01 18:45:41 -06:00
Steven Miers
0ec65738f1
Kill another puts.
2014-12-01 11:59:15 -06:00
Steven Miers
a77cc46b4c
Remove puts. Disable tracing for billing test.
2014-12-01 11:52:13 -06:00
Steven Miers
76548b1af1
Merge branch 'develop' into feature/jam_tracks_merge
2014-12-01 11:45:54 -06:00
Steven Miers
adecb2c9ad
Remove stray puts.
2014-12-01 11:45:44 -06:00
Steven Miers
7f59067226
VRFS-2480 : Refactor and cleanup, incremental.
2014-11-25 14:35:05 -06:00
Steven Miers
300426e2c9
VRFS-2480 : Additional recurly config
2014-11-25 14:34:07 -06:00
Steven Miers
09163d2778
Fix javascript to get credit card expiration year from correct field.
2014-11-25 13:59:24 -06:00
Steven Miers
b3d80b3be6
VRFS-2480 : Fix UI problem where checkout button was obscured.
2014-11-24 15:07:55 -06:00
Steven Miers
9e95f75e2e
VRFS-2480 : Card number was getting whacked from submittal due to a bad javascript assignment.
2014-11-24 15:06:45 -06:00
Steven Miers
b35f3ef9ef
Fix fat finger.
2014-11-24 15:05:38 -06:00
Seth Call
4c6d95d4fe
* move comment out of unused tests causing failures on build server
2014-11-23 09:17:50 -06:00
Seth Call
4cc10631dd
* commit out unused tests
2014-11-23 08:13:36 -06:00
Steven Miers
0b5d85f4f2
VRFS-2480 : Extract recurly logic from controller for cleaner, easier-to-test code.
2014-11-21 17:34:30 -06:00
Seth Call
6ad844035d
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-11-21 17:16:21 -06:00
Seth Call
eedc5ae970
* VRFS-1491 - finishing up dealing with refactor of monitor vs master tracks
2014-11-21 17:16:00 -06:00
Brian Smith
55c5167e36
fix bug with deduping instruments in recording hover
2014-11-21 08:15:59 -05:00
Brian Smith
f0b60f28e4
VRFS-2467 dedup users and instruments on session hover bubble
2014-11-21 01:20:27 -05:00
Steven Miers
7f88a7550c
VRFS-2480 : Incremental
2014-11-17 21:24:39 -06:00
Seth Call
76adc44a50
* wip
2014-11-17 17:16:30 -06:00
Seth Call
b780b4a462
* merged
2014-11-17 13:32:13 -06:00
Seth Call
d1d059b4c5
* disable score_histories for now
2014-11-17 13:28:43 -06:00
Seth Call
6ea19f35aa
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-11-16 21:40:50 -06:00
Seth Call
6b5cd42432
* VRFS-2097 - move around hover hookups
2014-11-16 21:40:21 -06:00
Steven Miers
2d3bbd2a47
VRFS-2480 : Recurly specs, fixes and new implementation.
2014-11-16 20:20:54 -06:00
Steven Miers
696cdc0283
VRFS-2476 : Field size and length to improve JamTracks Admin UI.
2014-11-16 17:30:49 -06:00
Steven Miers
220195ef5c
Friendlier development environment for active admin UI.
2014-11-16 17:00:31 -06:00
Steven Miers
3484f169ba
VRFS-2475 - Disallow blank option for Time Signature, Status, Type, Licensor, Pro, Genre and Sales Region fields.
2014-11-16 16:59:54 -06:00
Steven Miers
ab2b4fb5da
VRFS-2473 - Disallow blank options on jam_track track instrument field, as well as type field.
2014-11-16 16:58:53 -06:00
Steven Miers
4f5466948c
Merge branch 'develop' into feature/jam_tracks_merge
2014-11-16 16:26:28 -06:00
Steven Miers
de1d709621
Fix fat finger.
2014-11-16 16:24:43 -06:00
Steven Miers
497ac657ad
VRFS-2351 : JamTracks admin - merge from feature/jam_tracks_merge.
2014-11-16 16:24:00 -06:00
Steven Miers
b01b3ecd7d
VRFS-2352 : JamTracks - merge from feature/jam_tracks_merge.
2014-11-16 16:23:31 -06:00
Steven Miers
bf33578fdb
VRFS-2494 : Option to turn on jam tracks tile. Off in all configuration files for now.
...
Change config.jam_tracks_available=true to enable.
2014-11-16 16:03:56 -06:00
Jonathan Kolyer
38bf21ad6b
VRFS-2125 prevent duplicate clicks from create band button
2014-11-16 05:40:24 +00:00
Jonathan Kolyer
da4dfda654
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-11-15 22:59:43 +00:00
Jonathan Kolyer
aac1b3d4f1
VRFS-2132 added :crash_dump to skip api_signed_in_user, allowing unauthenicated dump uploads
2014-11-15 22:59:35 +00:00
Seth Call
f27673eb31
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-11-15 15:10:43 -06:00
Seth Call
94efaf8a8e
* use hover events (js) instead of CSS to detect if hovering VRFS-2097
2014-11-15 15:07:13 -06:00
Brian Smith
719aa2b411
fix getInstrumentId logic
2014-11-15 13:05:01 -05:00
Brian Smith
d65358cea6
VRFS-2442 suppress "Recurs once..." text for non-recurring sessions
2014-11-15 13:01:28 -05:00
Brian Smith
1c23f095ab
fix null instrument tooltips
2014-11-15 13:00:13 -05:00
Brian Smith
3c18d7cf65
VRFS-2442 suppress "Recurs once..." text for non-recurring sessions
2014-11-15 12:24:37 -05:00
Brian Smith
118ed7c39c
undo last change re: other instrument id
2014-11-15 11:59:51 -05:00
Brian Smith
12ca12f3cf
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-11-15 11:33:43 -05:00
Brian Smith
8707bb2f16
set instrument ID for unstructured rsvp
2014-11-15 11:33:26 -05:00
Brian Smith
a46664acfe
VRFS-2489 scheduled session with is_unstructured_rsvp=true should not prompt user to add slots when approving
2014-11-15 11:05:12 -05:00
Brian Smith
e87ab392e6
fix instrument icon wrapping on session and recording landing pages
2014-11-15 10:59:04 -05:00
Seth Call
92b617898f
* VRFS-2485 - allow user to tweak to lower framesizes if they experience bad i/o or audio quality
2014-11-14 20:47:56 -06:00
Steven Miers
0b4742a591
Merge branch 'feature/jam_tracks_merge' of bitbucket.org:jamkazam/jam-cloud into feature/jam_tracks_merge
2014-11-14 19:56:54 -06:00
Steven Miers
3d654a063e
VRFS-2352 : Fix another intermittent test failure.
2014-11-14 19:56:26 -06:00
Steven Miers
6b206cfa4a
VRFS-2478 : Fix JS timing error causing intermittent test failure.
2014-11-14 16:25:58 -06:00
Steven Miers
be2bb30425
VRFS-2478 : Fix JS timing error causing intermittent test failure.
2014-11-14 13:09:19 -06:00
Steven Miers
c068619d4d
Lock guard gem version to avoid warning.
2014-11-13 11:06:03 -06:00
Steven Miers
9cd9f5d58a
VRFS-2478 : Fix a few more tests.
2014-11-13 11:05:29 -06:00
Seth Call
3fc0329e79
* wip
2014-11-13 09:20:08 -06:00
Steven Miers
b282a69927
VRFS-2477 : Re-add google email config -- required for oauth functionality and specs.
...
This should address a few more tests.
2014-11-12 13:08:08 -06:00
Steven Miers
16d0342b1f
Recurly subdomains for development and production.
2014-11-12 11:52:52 -06:00
Steven Miers
c742a13da9
Fix a few specs.
2014-11-12 11:02:38 -06:00
Seth Call
26ec97f7af
*wip
2014-11-12 08:46:21 -06:00
Seth Call
ae30cedcb1
* add has-mix to non-ajax recordings
2014-11-11 20:41:19 -06:00
Seth Call
27800d17fd
wip
2014-11-11 20:39:46 -06:00
Seth Call
ec37e630c7
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-11-11 16:24:48 -06:00
Seth Call
6277708bb4
VRFS-1491 - create personal/master mix toggle, and beef up user.mods
2014-11-11 16:21:46 -06:00
Seth Call
c3cd742c17
* wip
2014-11-11 16:21:29 -06:00
Steven Miers
c2b2a7c6ef
More test fixes.
2014-11-11 13:17:33 -06:00
Steven Miers
6c825db79f
Merge update
2014-11-10 17:10:01 -06:00
Jonathan Kolyer
2c3fab9b34
VRFS-2362 replaced class selector with id selector
2014-11-10 14:59:30 +00:00
Seth Call
f0b70b1bb7
* fix issues with music session 'other count' and tests
2014-11-09 10:59:31 -06:00
Seth Call
8a5a40db9c
* fix check for existence in array
2014-11-09 10:52:25 -06:00
Seth Call
485b7d35c1
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-11-09 09:52:23 -06:00
Seth Call
948eaecc23
* VRFS-2468 - fix record others count
2014-11-09 09:50:28 -06:00
Seth Call
3c53eab168
*wip
2014-11-09 09:13:22 -06:00
Brian Smith
5d78939002
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-11-08 21:32:09 -05:00
Brian Smith
9c30becc11
VRFS-1712 fix issue with wrapping buttons on musician hover bubble
2014-11-08 21:32:04 -05:00
Seth Call
4e00863de6
* merged
2014-11-07 16:16:25 -06:00
Seth Call
8cad33a303
* recording file/manager fixes and aging of recordings
2014-11-07 16:12:36 -06:00
Brian Smith
c6bfd59999
VRFS-2462 fixed session count on musician hover bubble
2014-11-07 13:05:07 -05:00
Brian Smith
7071177f3f
VRFS-2297 show instrument tooltips in session and recording hover bubbles
2014-11-07 12:39:45 -05:00
Brian Smith
0732216a0d
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-11-06 21:18:30 -05:00
Brian Smith
a7cabbe924
VRFS-2311 fix bug
2014-11-06 21:15:04 -05:00
Brian Smith
f9d23f77fa
VRFS-2426 one more try at latency badge on hover bubble
2014-11-06 20:43:47 -05:00
Steven Miers
7dc80c10ce
VRFS-1849: Check for google authorization using AJAX and show/hide the google login button / "signed in" label as appropriate:
2014-11-06 13:16:58 -06:00
Seth Call
164fe8db61
* recording cleanup logic VRFS-2393
2014-11-06 11:26:13 -06:00
Brian Smith
415805c4eb
VRFS-2256 allow invited and approved RSVP users to join approval_required sessions without having to send a join request
2014-11-05 21:54:08 -05:00
Seth Call
ea601711fa
* make desk keys configurable
2014-11-05 20:32:37 -06:00
Steven Miers
f1b32336cd
VRFS-1849 : Hide UI for youtube upload until the rest of feature implemented.
2014-11-04 15:55:50 -06:00
Steven Miers
5ee531d944
More resilient reference to image.
2014-11-04 14:59:53 -06:00
Steven Miers
433fe0be74
Initial merge and manual conflict and fix for tests.
2014-11-04 14:55:12 -06:00
Steven Miers
cbb1a71ffa
Check current_user for nil, as this dialog is included at a higher level than originally expected.
2014-11-04 13:28:04 -06:00
Steven Miers
34695c716b
VRFS-1849 : Show google login link beside the "Upload to Youtube" link.
2014-11-04 12:31:38 -06:00
Steven Miers
df9352d608
One more merge artifact.
2014-11-03 18:38:06 -06:00
Steven Miers
2400a8869e
Remove them for real.
2014-11-03 18:32:45 -06:00
Steven Miers
c24b5df66d
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-11-03 18:31:57 -06:00
Steven Miers
9222ac5843
Remove merge artifacts.
2014-11-03 18:31:42 -06:00
Steven Miers
8c2fe619ea
Remove screenshot files.
2014-11-03 18:29:14 -06:00
Steven Miers
b2219da522
Merge feature/video_mvp to develop and resolve conflicts.
2014-11-03 18:28:28 -06:00
Steven Miers
fe9bd594b4
Merge feature/video_mvp to develop and resolve conflicts.
2014-11-03 18:25:33 -06:00
Seth Call
c11ae11c99
* fix my sorry teaspoon tests
2014-11-03 15:45:29 -06:00
Seth Call
4f9bdb2c5c
* VRFS-2404 There are cases where a session can incorrectly get stuck in a 'I'm still recording' state
2014-11-03 15:24:46 -06:00
Steven Miers
b2441ec7d6
Fix test; re-enable factory.
2014-11-03 14:17:20 -06:00
Steven Miers
608b0337c6
This is now unnecessary as it is done at a lower level.
2014-11-03 14:16:58 -06:00
Steven Miers
19a19a57a7
Whack thin as we no longer need it.
2014-11-03 14:16:36 -06:00
Steven Miers
0172f1c370
Better lining up of checkbox labels.
2014-11-03 14:15:36 -06:00
Steven Miers
fdf42259f1
Convert to HAML.
2014-11-03 14:15:23 -06:00
Seth Call
f402f630e1
* added test for VRFS-2432 notification of steram mix and share dialog
2014-11-03 10:29:22 -06:00
Seth Call
fc4d55ba84
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-11-03 10:02:40 -06:00
Seth Call
ace7ac15c8
* VRFS-2432 notify when stream mix is done
2014-11-03 10:00:42 -06:00
Steven Miers
dde5a75a45
VRFS-1849 : Add checkboxes for upload_to_youtube and save_to_computer.
2014-11-02 23:07:11 -06:00
Steven Miers
809e5e7443
Hook tested youtube client library to recording api controller. Completes: (VRFS-2030, VRFS-2031, VRFS-2032)
2014-11-02 23:00:37 -06:00
Steven Miers
83de0b920e
VRFS-2031 : Verify upload when complete and mark fully_uploaded. Spec to verify.
2014-11-02 22:34:02 -06:00
Brian Smith
c629f3d8bf
fix typo
2014-11-02 21:20:44 -05:00
Brian Smith
baf976e1b6
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-11-02 21:18:36 -05:00
Brian Smith
2688bba63e
VRFS-2296 ensure hover bubble is displayed fully on screen
2014-11-02 21:18:30 -05:00
Seth Call
1327229048
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-11-02 20:08:12 -06:00
Steven Miers
5c281c11c5
Proper status check of uploaded file and working spec to verify. (VRFS-2030, VRFS-2031, VRFS-2032)
2014-11-02 19:49:53 -06:00
Brian Smith
0007930936
VRFS-2401 revert to inline styles for email links for now, need to revisit better solution
2014-11-02 16:43:56 -05:00
Seth Call
66c708a347
* fix getting started test
2014-11-02 13:50:59 -06:00
Brian Smith
ae20d53d3d
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-11-02 14:27:07 -05:00
Brian Smith
33a431f822
VRFS-2427 fixed broken test
2014-11-02 14:26:56 -05:00
Seth Call
e654aba980
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-11-02 13:16:12 -06:00
Seth Call
daecbd8a2d
* VRFS-2440 - open FTUE immediately after dialog
2014-11-02 13:15:56 -06:00
Brian Smith
6f3075a3ba
VRFS-2297 added tool tip to instruments on session info web page
2014-11-02 13:25:52 -05:00
Brian Smith
eb56be97dd
VRFS-2427 fix sorting / paging issue on Feeds screen
2014-11-02 12:57:43 -05:00
Brian Smith
ba80b25727
VRFS-2297 added tool tip to band tab of musician profile, couple of other bug fixes
2014-11-01 23:56:52 -04:00
Brian Smith
6b01415484
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-11-01 23:35:27 -04:00
Brian Smith
bdb57e6d54
VRFS-2297 added tool tips to session and recording hover bubbles
2014-11-01 23:35:17 -04:00
Brian Smith
1bfd3f653c
VRFS-2297 create help bubbles / tool tips for all instrument and friends/followers/recordings/sessions icons throughout app
2014-11-01 23:03:20 -04:00
Seth Call
5f8953011c
* VRFS-2439 fix spurious -i argument in normalize-ogg and mp3 command
2014-11-01 21:21:42 -05:00
Seth Call
f0d675c10d
* fix typo in exist check
2014-11-01 21:10:12 -05:00
Steven Miers
0f1c436f60
Merge
2014-11-01 10:43:33 -05:00
Steven Miers
38cc681817
Further develop test.
2014-10-31 13:13:47 -05:00
Jonathan Kolyer
e7b8d05f6d
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-10-31 05:05:05 +00:00
Jonathan Kolyer
6f28ca7874
VRFS-2132 modified crash_dumps to accept dump files and upload them to aws
2014-10-31 05:04:48 +00:00
Steven Miers
80be3c572f
Enable spec fo and fix youtube upload signing function. VRFS-2032
2014-10-30 20:47:28 -05:00
Steven Miers
47415c27d3
Additional note in writeup.
2014-10-30 19:51:06 -05:00
Steven Miers
cc0d33e6da
Set new user and test server.
2014-10-30 19:05:06 -05:00
Steven Miers
d7f6d089d8
Use new test user account and port for build server.
2014-10-30 19:03:29 -05:00
Steven Miers
41314f6892
Turns out we *need* the email in several places where the official docs call for the client_id. Weird. (VRFS-2030, VRFS-2031, VRFS-2032).
2014-10-30 18:39:58 -05:00
Steven Miers
0d1baacff7
Preliminary oauth testing documentation - will put on wiki.
2014-10-30 18:39:39 -05:00
Steven Miers
062740422a
Incremental -- Tests exposed a few bugs in client - fix those. Use one-time code to obtain access_token. (VRFS-2030, VRFS-2031, VRFS-2032).
2014-10-30 18:38:00 -05:00
Steven Miers
bcd0e7ebef
Proper restoration of run_server attribute, so spec plays nice with others. (VRFS-2030, VRFS-2031, VRFS-2032).
2014-10-30 12:35:59 -05:00
Brian Smith
3898857dbf
VRFS-2128 use recording owner for displaying name and hover in feed to ensure it matches avatar
2014-10-29 23:33:48 -04:00
Steven Miers
7b6e90007a
Build server doesn't like webkit driver. Switch it back for now.
2014-10-29 20:19:25 -05:00
Brian Smith
a310c46288
Merge branch 'develop' into feature/rsvp_slot_conflict
2014-10-29 20:41:05 -04:00
Steven Miers
907d1afbea
Youtube spec and fixture - incremental (VRFS-2030, VRFS-2031, VRFS-2032).
2014-10-29 16:33:54 -05:00
Steven Miers
b482253a46
Should play nicer with other specs.
2014-10-29 16:24:02 -05:00
Steven Miers
f9f5fe2bd1
Mechanism to not startup server but still use JS.
2014-10-29 16:23:43 -05:00
Seth Call
4ee75adcf2
* make intermediary mp3 higher bitrate
2014-10-29 13:51:33 -05:00
Steven Miers
71ac39f837
Remove stray puts.
2014-10-29 13:39:09 -05:00
Steven Miers
d9df0fa57e
Login cleanup and assert selector before within call.
2014-10-29 13:11:48 -05:00
Steven Miers
737ad5a122
Allow blank current_driver to assume poltergeist.
2014-10-29 13:10:34 -05:00
Steven Miers
2a49ac3573
Settings for oauth spec.
2014-10-29 13:09:47 -05:00
Steven Miers
3e1f9734db
More reliable web server for oauth client test.
2014-10-29 13:09:20 -05:00
Steven Miers
94c205fd0f
Merge - incremental
2014-10-29 13:04:48 -05:00
Seth Call
62833198b3
* VRFS-2431 - run normalize-ogg and normalize-mp3 to bump up master mix
2014-10-29 11:28:13 -05:00
Seth Call
149967f877
* VRFS-2375 - share button works now in master mix complete msg
2014-10-29 10:27:29 -05:00
Seth Call
28e752629a
* show private recording on recording landing page to someone who was in the session
2014-10-29 07:22:45 -05:00
Brian Smith
9f3c5f36a6
Merge branch 'develop' into feature/rsvp_slot_conflict
2014-10-29 07:13:08 -04:00
Brian Smith
6d8ec70087
VRFS-2401 text links in emails should be yellow
2014-10-29 07:12:43 -04:00
Seth Call
eb5c84c5bc
* VRFS-1344 - adding a spec test for it
2014-10-28 22:25:55 -05:00
Seth Call
92956c4ee7
* VRFS-2429 - remove empty session; VRFS-1344 - prompt when joining session that is currently recording
2014-10-28 22:08:22 -05:00
Seth Call
dac2910008
* VRFS-2400 - show retry button only in the correct conditions
...
* VRFS-2425 - make sure threads don't die on exception, but report up
2014-10-28 21:16:54 -05:00
Steven Miers
b68ae7e420
Incremental API and test cleanup (VRFS-2030, VRFS-2031, VRFS-2032).
2014-10-28 15:13:19 -05:00
Steven Miers
2b8596607c
Rename goog_auth to google_auth.
2014-10-28 14:10:55 -05:00
Steven Miers
7265379101
Update gems for google/oauth/youtube stuff and testing thereof. (VRFS-2030, VRFS-2031, VRFS-2032).
2014-10-28 14:09:44 -05:00
Steven Miers
c5d0703643
Spec that logs into a real youtube/gmail account and verifies access token. (VRFS-2030, VRFS-2031, VRFS-2032).
2014-10-28 14:08:27 -05:00
Steven Miers
c6ee3d01b0
A util method for testing that opens the google oauth web UI and logs in using a username password, logs in and approves. Uses our youtube client to intercept the auth token and add it to the user_authorizations. This allows us to use and test youtube API functionality as a real user. (VRFS-2030, VRFS-2031, VRFS-2032).
2014-10-28 14:07:54 -05:00
Steven Miers
d3cd51d76d
Other drivers, such as webkit don't have these options, so check the driver first:
2014-10-28 13:57:47 -05:00
Steven Miers
e4452a5e95
Youtube client, with several methods to assist with logging in, starting and checking uploads, etc. Even contains an internal web server to intercept the callback from google for self-contained or feature testing. (VRFS-2030, VRFS-2031, VRFS-2032).
2014-10-28 13:57:06 -05:00
Seth Call
84ee43cdb8
* VRFS-2409 - detect if the mix is discarded in case of a virtual mix
2014-10-28 10:17:28 -05:00
Seth Call
2c66aceea8
* VRFS-2407 - show discarded correctly instead of unknown
2014-10-28 09:39:39 -05:00
Brian Smith
300bc2cd82
Merge branch 'develop' into feature/rsvp_slot_conflict
2014-10-27 21:37:28 -04:00
Brian Smith
8bff2f2692
VRFS-2337 fix latency calculation for hover bubble
2014-10-27 21:35:18 -04:00
Brian Smith
cf4827ba4a
VRFS-2337 fix latency calculation for hover bubble
2014-10-27 21:20:42 -04:00
Seth Call
53706aec71
* VRFS-2405 - cleanup more files in audiomixer, and input/output files in quickmixer
2014-10-27 17:52:56 -05:00
Seth Call
004674c562
* VRFS-2405 - cleanup files after successful audiomix
2014-10-27 17:49:14 -05:00
Seth Call
e26f870e18
* VRFS-2406 prevent export while in session
2014-10-27 17:21:52 -05:00
Seth Call
fb36b8e380
* VRFS-2408 - remove dup tracks from interfrace
2014-10-27 17:14:40 -05:00
Seth Call
5f87fdab00
* bah adding junk to AudioMixer file
2014-10-27 13:51:29 -05:00
Seth Call
bbff3ccab5
* remove debug print
2014-10-27 13:50:44 -05:00
Seth Call
a12e6335eb
* VRFS-2403 and VRFS-2403 - deal with leaving a session while joining, and with sync track info while joining
2014-10-27 13:26:04 -05:00
Seth Call
970401374b
* VRFS-2399 - fixed recording sync track issue
2014-10-27 12:42:30 -05:00
Brian Smith
555b1ac510
Merge branch 'develop' into feature/rsvp_slot_conflict
2014-10-26 20:48:23 -04:00
Brian Smith
f6f79acddd
VRFS-2358 fixed notation upload and display issues
2014-10-26 19:45:29 -04:00
Seth Call
7e2b894548
* bring the play button back even if private, in private view VRFS-2383
2014-10-26 11:46:33 -05:00
Brian Smith
e9ae934ab9
Merge branch 'feature/rsvp_slot_conflict' of bitbucket.org:jamkazam/jam-cloud into feature/rsvp_slot_conflict
2014-10-26 12:41:51 -04:00
Brian Smith
709150edac
Merge branch 'develop' into feature/rsvp_slot_conflict
2014-10-26 12:41:17 -04:00
Anthony Davis
20d5eb8648
VRFS-2373 - adding white space to statement
2014-10-26 09:57:25 -05:00
Anthony Davis
01f2847f60
Merged develop into feature/rsvp_slot_conflict
2014-10-26 09:26:54 -05:00
Seth Call
cce7430649
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-10-26 08:06:09 -05:00
Seth Call
1552f72192
* pin down rabl until fix for cache key is present (VRFS-2369 and VRFS-2374)
2014-10-26 08:05:33 -05:00
Brian Smith
c57ea372ac
VRFS-2311 allow session creator to add and approve slots on the fly when there are no available slots
2014-10-25 22:23:52 -04:00
Anthony Davis
cc3347b257
VRFS-2378 - fixing styling on sign up and account update password prompt
2014-10-25 18:47:19 -05:00
Seth Call
88ac2c3fb5
* remove debug statement about jquery bt
2014-10-25 16:17:08 -05:00
Seth Call
68b9008ba8
* fix wrong class name in AudioMixerRetry
2014-10-25 11:35:59 -05:00
Seth Call
dc590a95c2
* VRFS-2368 - close prodBubbles on session transition, open dialog, close dialog
2014-10-25 10:04:28 -05:00
Seth Call
48dea5688e
* commit out fault audiomixer tests
2014-10-25 09:07:20 -05:00
Seth Call
bcfc2def9e
* VRFS-2367 - create api to discover websocket location, and fix tests
2014-10-24 21:50:40 -05:00
Seth Call
0bda6384e7
* try to fix broken tests
2014-10-24 12:49:34 -05:00
Seth Call
58d96fc171
* VRFS-2192 - export recording button added to file sync dialog
2014-10-23 16:45:25 -05:00
Seth Call
fe7edbba5d
* many recording features/improvements: VRFS-2151, VRFS-1551, VRFS-2360, VRFS-2290, VRFS-2002, VRFS-2181
2014-10-22 23:10:49 -05:00
Jonathan Kolyer
b9b1fbb313
VRFS-2232 VRFS-2233 handle notification files so they only can be viewed if can_join?; otherwise throw 403 and handle appropriately
2014-10-22 07:01:11 +00:00
Brian Smith
d8a8a0d33b
remove byebug reference
2014-10-21 19:51:55 -04:00
Jonathan Kolyer
af2159fe72
VRFS-1945 added create_type to music_sessions; filtering session search based on create_type
2014-10-21 07:27:26 +00:00
Brian Smith
d17d4ede99
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-10-20 21:33:32 -04:00
Brian Smith
447c391324
VRFS-2337 fix calculation of default audio latency
2014-10-20 21:33:23 -04:00
Jonathan Kolyer
85fa427f02
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-10-20 03:29:36 +00:00
Brian Smith
9ef7d2474f
revert accidental modifications to musician view
2014-10-19 21:22:31 -04:00
Brian Smith
d6c269fec1
VRFS-2337 fix bug
2014-10-19 21:19:23 -04:00
Brian Smith
a8987efaa1
VRFS-2337 added latency badge to musician hover bubble
2014-10-19 21:18:05 -04:00
Jonathan Kolyer
2e679246cf
VRFS-2340 renamed ukulele image to use correct spelling
2014-10-19 23:07:16 +00:00
Jonathan Kolyer
7d5d88fa38
VRFS-1470 pass in $feedItem to call of stopSessionPlay
2014-10-19 22:59:43 +00:00
Brian Smith
dd95558d17
VRFS-2322 change color to black for instrument text on signup page
2014-10-18 16:47:45 -04:00
Brian Smith
87170b9134
VRFS-2322 changed all input fields to render black text
2014-10-18 14:43:22 -04:00
Steven Miers
6019aced8d
Routes and controller stubs for video upload web service. (VRFS-2030, VRFS-2031, VRFS-2032).
2014-10-15 18:20:32 -05:00
Steven Miers
62d12497d8
VRFS-2029 : Fix issue where a nil (instead of false)
...
is causing claimed_recording not to save properly.
2014-10-15 18:17:14 -05:00
Steven Miers
cce9fc1577
VRFS-2029 : Fix issue where a nil (instead of false)
...
is causing claimed_recording not to save properly.
2014-10-15 17:59:59 -05:00
Steven Miers
e3dadf9c4b
VRFS-2032 : Youtube test account app name/developer key.
2014-10-15 15:17:03 -05:00
Steven Miers
c1f2a2083f
VRFS-2029 : Update REST API ApiRecordingsController#claim
...
to accept and distribute upload_to_youtube flag as appropriate. Spec
to verify.
2014-10-15 13:54:10 -05:00
Steven Miers
d95a063648
VRFS-2029 : Rails model attribute for upload_to_youtube flag
...
Also includes Rails validation.
2014-10-15 13:45:30 -05:00
Steven Miers
dacd702bd8
VRFS-2029 : Migration/manifest for upload_to_youtube
...
On claimed_recordings table.
2014-10-15 13:44:31 -05:00
Steven Miers
ece7cf2d56
VRFS-2033 : Spec and fixes for google_oauth2 provider-type
...
user_authentications. These are named “google_login” in our app.
2014-10-15 13:41:49 -05:00
Steven Miers
077d3f4253
VRFS-2033 - YouTube client library
2014-10-15 12:25:05 -05:00
Steven Miers
10c5a66f24
VRFS-2033 - Youtube developer keys for test and dev environments
2014-10-15 12:24:58 -05:00
Steven Miers
5691fbc51f
Require new scheduled_music_session_cleaner at class level.
...
Fixes broken unit test.
2014-10-14 14:54:18 -05:00
Jonathan Kolyer
959d68833d
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-10-14 07:33:34 +00:00
Jonathan Kolyer
2ac03a912c
VRFS-2217 fixed spec test; cleanup profile feeds issue
2014-10-14 07:33:08 +00:00
Jonathan Kolyer
ac57463415
Merge branch 'develop' into VRFS-2217
2014-10-14 06:21:38 +00:00
Brian Smith
3641521740
VRFS-2244 handle duplicate friend requests better
2014-10-14 02:12:33 -04:00
Brian Smith
bb33421e4a
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-10-14 01:43:58 -04:00
Brian Smith
d2a8ff242e
VRFS-2330 resolve several issues with session details screen including RSVP cancel dialog and showing/hiding of 3 action buttons at top
2014-10-14 01:43:48 -04:00
Jonathan Kolyer
70aef73c64
Merge branch 'develop' into VRFS-2282
2014-10-14 04:09:50 +00:00
Brian Smith
9e7dc1f354
VRFS-2329 changed radio button on RSVP cancel dialog to fix Qt bug
2014-10-14 00:00:02 -04:00
Jonathan Kolyer
649027cda7
VRFS-2282 tests and music session time queries
2014-10-14 03:54:58 +00:00
Brian Smith
ab66504532
VRFS-2344 show musician hover on pages 2-n on Find Session screen
2014-10-13 20:58:30 -04:00
Jonathan Kolyer
6f27455b02
Merge branch 'develop' into VRFS-2282
2014-10-13 16:18:47 +00:00
Jonathan Kolyer
38631cabde
VRFS-2217 enabling feeds to work in both profile and feed screen
2014-10-13 16:18:20 +00:00
Seth Call
1673d88760
* fix broken mixer behavior
2014-10-13 09:49:52 -05:00
Seth Call
078de098ce
* fix test
2014-10-13 09:48:34 -05:00
Jonathan Kolyer
d5274554f0
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-10-13 06:30:45 +00:00
Brian Smith
257421a1d0
VRFS-2318 show JOIN button for non-scheduled (future) session
2014-10-13 08:40:10 -04:00
Brian Smith
275fb34d52
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-10-13 08:15:59 -04:00
Jonathan Kolyer
7b7a803f10
VRFS-2217 marked "between users" test pending until profile feed issues worked out
2014-10-13 06:29:39 +00:00
Jonathan Kolyer
80fc8596b1
VRFS-2217 clearResults sets didLoadAllFeeds = false
2014-10-13 03:45:45 +00:00
Jonathan Kolyer
9f869f200f
VRFS-2282 added resque schedule cleaner test
2014-10-13 02:32:45 +00:00
Jonathan Kolyer
95b26e9c00
Merge branch 'develop' into VRFS-2282
2014-10-13 02:15:01 +00:00
Jonathan Kolyer
2ce8382a1c
VRFS-2217 fixed tests broken by scrolling changes
2014-10-13 02:02:53 +00:00
Brian Smith
4d050ce689
change Edit Bio text to all caps for consistency
2014-10-12 21:53:13 -04:00
Jonathan Kolyer
aef2b873f2
VRFS-1430 changed db default sender back to noreply; changed text for batch mails to FFFFFF from AAAAAA
2014-10-13 00:51:13 +00:00
Jonathan Kolyer
3fc3d4c67b
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-10-12 23:03:55 +00:00
Jonathan Kolyer
4f15045005
VRFS-2217 replace infinite-scroll with simple jquery solution; lowered batch size to 10
2014-10-12 23:03:18 +00:00
Jonathan Kolyer
26b124dde8
VRFS-2282 first pass purging stale sessions
2014-10-12 07:49:31 +00:00
Brian Smith
4b8d464616
remove debug
2014-10-11 13:58:13 -04:00
Brian Smith
c2c157a0ba
VRFS-2124 fix feed issue when session switches from fan_access=true to fan_access=false
2014-10-11 13:57:05 -04:00
Jonathan Kolyer
55957e7551
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-10-11 15:41:08 +00:00
Jonathan Kolyer
cf4355bdd2
VRFS-2317 fixed tests to be compatible with default musician access selection
2014-10-11 15:39:52 +00:00
Brian Smith
bdd8c6db5a
VRFS-2219 activate session in feed when the active_music_session record is created
2014-10-11 08:53:26 -04:00
Jonathan Kolyer
a18cd57510
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-10-11 06:32:15 +00:00
Jonathan Kolyer
9fb08ced15
VRFS-2317 changed session-musician-access default to be "join at will"
2014-10-10 19:40:02 +00:00
Jonathan Kolyer
5564fd2cf7
VRFS-2263 added special handling for attempts to join session multiple times
2014-10-10 19:16:25 +00:00
Steven Miers
4d08359ef1
Fixes VRFS-2334 : re-add filter for users
...
Includes spec to reproduce, and additional specs that uncovered a
problem with setting the client_video_source_id.
2014-10-10 11:07:36 -05:00
Seth Call
0fb721b8ed
* fix upgrade path: VRFS-2331
2014-10-09 16:45:48 -05:00
Brian Smith
d08475c34e
VRFS-2321 comment out session join email notification
2014-10-08 20:27:28 -04:00
Seth Call
69477c5a86
* VRFS-2323 - add new support article for unreachable condition
2014-10-08 14:24:51 -05:00
Seth Call
ce8c218054
* pinning devise in adming
2014-10-08 09:29:45 -05:00
Jonathan Kolyer
f06ef0c716
VRFS-1430 fixed broken tests
2014-10-08 03:48:05 +00:00
Jonathan Kolyer
7ab6d4d1fb
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-10-08 03:22:12 +00:00
Brian Smith
b30d71de6a
VRFS-2320 use from_user_mailer template for session comment
2014-10-07 21:16:56 -04:00
Brian Smith
eddd8a526c
VRFS-2320 include from user info in session comment emails
2014-10-07 20:39:13 -04:00
Steven Miers
9473ffa352
Merge branch 'feature/video_mvp' into develop
2014-10-07 17:37:06 -05:00
Steven Miers
e26c254d36
VRFS-2028 : Tests for verifying both types are there and have expected attributes in the hash.
...
I.E., type is “recorded_track” or “recorded_video” as appropriate, and
videos have client_video_source_id attribute. Also test pagination.
2014-10-07 15:36:16 -05:00
Steven Miers
94963f2ad1
VRFS-2028 : Add videos to list_uploads, in addition to tracks.
...
This is accomplished using a SQL union via arel.
2014-10-07 15:34:05 -05:00
Steven Miers
160108a217
Merge video_mvp branch
2014-10-07 11:33:34 -05:00
Brian Smith
bffba5fcbc
VRFS-2219 changes based on Seth code review
2014-10-06 21:03:19 -04:00
Brian Smith
d4655cd65a
renamed file with .sql extension
2014-10-06 19:26:06 -04:00
Steven Miers
e25e3b16a9
VRFS-2027: Create video recordings from source in ApiRecordingsController#start
...
Also includes spec.
2014-10-06 18:17:08 -05:00
Steven Miers
8ec75bb4e7
VRFS-2025 : Specs for video_sources park.
2014-10-06 17:02:33 -05:00
Steven Miers
1ce0ac34ef
VRFS-2025 : Add video_sources to join_the_session and its callers.
...
Creates and attaches video_sources just as it does tracks.
2014-10-06 17:02:10 -05:00
Seth Call
57ddb86379
* fixing .sql/.rb in manifest
2014-10-06 16:45:14 -05:00
Seth Call
71f6b7edc6
* VRFS-2304 - create scoring timeout when doing a network test
2014-10-06 16:44:30 -05:00
Steven Miers
47490ea3d9
VRFS-2025 Incremental
2014-10-06 16:17:46 -05:00
Steven Miers
dffdb78f71
Merge develop into this branch.
2014-10-06 16:17:36 -05:00
Seth Call
2d71a12a79
* pinning back oj for now
2014-10-06 14:53:50 -05:00
Seth Call
d5eeb03bd3
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-10-06 09:37:04 -05:00
Seth Call
993074b136
* pinning back devise
2014-10-06 09:36:55 -05:00
Brian Smith
7856e43f1e
VRFS-2219 active sessions should sort to top of Feed
2014-10-06 09:20:31 -04:00
Jonathan Kolyer
3595b46106
VRFS-1486 paginated scrolling of notifications; adjusting notification layout
2014-10-06 04:51:19 +00:00
Brian Smith
14c9a5b469
VRFS-2278 show tooltip for instrument icons on Find Session and Session Detail screens, show user friendly error when unable to approve RSVP
2014-10-05 22:12:50 -04:00
Seth Call
49170d31a0
* instrument hover
2014-10-05 16:48:54 -05:00
Brian Smith
e7a220fe00
VRFS-2278 action buttons should not wrap on Session Details screen
2014-10-05 15:31:43 -04:00
Brian Smith
a719670add
VRFS-2278 show correct hover bubble in Session Musicians section of Session Details screen; avatars should link to profile page
2014-10-05 15:14:35 -04:00
Steven Miers
66feb39de8
VRFS-2023 - Migration, models and spec for recorded_video, a video analog to recorded_track.
2014-10-03 14:12:09 -05:00
Steven Miers
5135fe7faf
VRFS-2024 - Migration, model and spec for video source.
2014-10-03 13:36:51 -05:00
Seth Call
2d6f2e606d
* remove console.trace; IE 10 breaks on it
2014-10-03 11:31:29 -05:00
Seth Call
0fdb932db1
* VRFS-2298 - tack on JamKazam Staff to username in vanilla forums if admin
2014-10-02 14:04:36 -05:00
Jonathan Kolyer
20d4fa2a01
VRFS-2262 removed dialog.min-height style constraint; tested on several dialogs, nobody needs it
2014-10-02 06:40:06 +00:00
Jonathan Kolyer
3080a92096
VRFS-1430 merge conflict correction
2014-10-01 22:12:48 +00:00
Jonathan Kolyer
5d524cd7b0
VRFS-1430 added email from alias to JamKazam <{noreply,support}@jamkazam.com>; updated link colors to be 588C98
2014-10-01 22:10:54 +00:00
Seth Call
40506afaa0
* fix score tests
2014-10-01 09:55:51 -05:00
Seth Call
b5aeb87bda
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-10-01 09:32:29 -05:00
Seth Call
e63369d072
* fix discard scores
2014-10-01 09:32:17 -05:00
Anthony Davis
f58a410233
VRFS-2289 - reclaim 21px
2014-09-30 22:32:55 -05:00
Seth Call
a75546a5be
* fix order of migrations
2014-09-30 16:37:47 -05:00
Seth Call
8889b8ce42
* merge in faster score searches (VRFS-2202)
2014-09-30 10:51:23 -05:00
Brian Smith
6442674c91
VRFS-2216 fix tests; include pending RSVPs and invites for session details screen
2014-09-28 22:37:52 -04:00
Brian Smith
e7a719ffd1
VRFS-2278 added spinner while retrieving session details
2014-09-28 21:29:37 -04:00
Seth Call
0e274e8687
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-09-28 13:14:16 -05:00
Seth Call
3d169d083e
* rename to geoiplocation
2014-09-28 13:14:06 -05:00
Brian Smith
5622966918
fix test
2014-09-28 13:39:56 -04:00
Brian Smith
5159480eb8
VRFS-2265 include alert.js in web.js and landing.js
2014-09-28 12:35:22 -04:00
Brian Smith
a07fdfe2a8
Merge branch 'develop' into feature/sprint_12_work
2014-09-28 12:00:32 -04:00
Brian Smith
38b336c707
VRFS-2216 fix issue with sms_index function
2014-09-28 11:59:59 -04:00
Seth Call
83b1777e65
* ga tracker code for display/remarketing VRFS-2242
2014-09-26 17:13:04 -05:00
Seth Call
3e8008224e
* changing test ports all around for websocket-gateway
2014-09-26 14:09:25 -05:00
Seth Call
cdf9579ada
* fix port clash on tests
2014-09-26 12:57:37 -05:00
Seth Call
74a27e14cf
* fix websocket tests
2014-09-26 09:20:35 -05:00
Seth Call
39ed460d14
* VRFS-2280 - fix locations getting invalidated, and VRFS-1806 fixed by detecting no login data
2014-09-25 23:13:34 -05:00
Seth Call
f4ef6b2360
* websocket-gateway GATEWAY_NAME fixes
2014-09-25 20:40:31 -05:00
Brian Smith
da771acdaf
merge develop
2014-09-25 09:09:44 -04:00
Brian Smith
2a2445bcba
VRFS-2067 fix bug where latency badge was missing for in session users
2014-09-25 09:08:01 -04:00
Seth Call
9442e34297
* adding default for connection gateway name
2014-09-24 21:52:07 -05:00
Seth Call
cf70cb4109
* remove chatty debug
2014-09-24 21:40:07 -05:00
Seth Call
0b85d00825
* fixing some package issues with websocket-gateway
2014-09-24 20:52:09 -05:00
Seth Call
b87ff571ce
* VRFS-1073 - support multiple websocket gateways
2014-09-24 14:27:56 -05:00
Seth Call
350f7ae19a
* poke for build
2014-09-24 09:15:52 -05:00
Brian Smith
0c31299b7d
temporarily mark test as pending
2014-09-23 22:20:14 -04:00
Seth Call
e0796de694
* adding connect with musicians video
2014-09-23 21:17:10 -05:00
Brian Smith
665da60b08
VRFS-2216 include only approved RSVPs / exclude invited users when calculating average session latency
2014-09-23 22:04:17 -04:00
Brian Smith
3f1eb86684
Merge branch 'develop' into feature/sprint_12_work
2014-09-23 21:27:52 -04:00
Seth Call
14043f164e
* VRFS-2225 - fix for profile whacking
2014-09-22 20:35:23 -05:00
Seth Call
63425fe1ff
* make prod bubble show up if 0 or 1 profiles
2014-09-22 15:58:14 -05:00
Seth Call
84e1846e75
* fixing help template text
2014-09-22 15:57:35 -05:00
Seth Call
51b5923022
* fix broken tests
2014-09-22 15:55:02 -05:00
Seth Call
be218c4e9c
* merged
2014-09-22 14:26:09 -05:00
Seth Call
7645acac72
* VRFS-2249 - protect against less than 1
2014-09-22 14:24:44 -05:00
Seth Call
61f0bd2aa0
* merged
2014-09-22 14:20:58 -05:00
Seth Call
6f463b7b6c
* adding steven to dev users
2014-09-20 21:25:57 -05:00
Brian Smith
4b0834e3cf
Merge branch 'develop' into feature/sprint_12_work
2014-09-20 16:27:16 -04:00
Brian Smith
d90114dbbb
session name text should link to session landing / info pages
2014-09-20 16:22:52 -04:00
Anthony Davis
ab03418380
mark broken test pending
2014-09-20 17:44:21 +00:00
Brian Smith
2c7c43c3aa
VRFS-2118 hide play button for private recordings
2014-09-19 01:17:56 -04:00
Brian Smith
7bcdf23caa
VRFS-2185 default session landing to pause icon
2014-09-19 01:14:44 -04:00
Brian Smith
f4327a7746
fix tests
2014-09-19 01:12:22 -04:00
Brian Smith
096c43c0e4
Merge branch 'develop' into feature/sprint_12_work
2014-09-19 00:25:20 -04:00
Brian Smith
1858e0da49
VRFS-2218 VRFS-2197 allow unstarted scheduled sessions to be listed up to 12 hours after start time; allow completed sessions to be listed up 2 to hours after completion time
2014-09-19 00:24:38 -04:00
Brian Smith
37be35275b
hide end of list message while searching
2014-09-19 00:20:45 -04:00
Seth Call
cc6b8ae35b
* pinning capybara-screenshot; it just released a breaking version (1.0.0)
2014-09-18 09:46:14 -05:00
Seth Call
d901336b27
* VRFS-2204 - udp_reachable showing now
2014-09-18 09:46:09 -05:00
Seth Call
f1d7dcdb82
* VRFS-2016 - potential fix for flapping connections
2014-09-18 09:46:03 -05:00
Seth Call
8a4038e7ce
* pinning capybara-screenshot; it just released a breaking version (1.0.0)
2014-09-17 20:57:49 -05:00
Seth Call
a396671f8b
* VRFS-2223 typo in music_session
2014-09-17 20:38:33 -05:00
Brian Smith
9ae3fb1f45
Merge branch 'develop' into feature/sprint_12_work
2014-09-17 21:32:48 -04:00
Brian Smith
ee38e8f2cc
VRFS-2067 fix issues with RSVP expand / collapse
2014-09-17 21:32:16 -04:00
Seth Call
609846c295
* VRFS-2204 - udp_reachable showing now
2014-09-17 20:31:58 -05:00
Seth Call
f9c751605c
* VRFS-2016 - potential fix for flapping connections
2014-09-17 17:19:35 -05:00
Seth Call
a1d3793ef4
* poke
2014-09-17 15:44:48 -05:00
Brian Smith
1f99ebef89
VRFS-2067 expand / collapse RSVP musicians and latencies when there are more than 3
2014-09-17 12:49:58 -04:00
Seth Call
9b6715d101
* remove debugging heartbeat
2014-09-17 10:43:52 -05:00
Seth Call
6f9dff6473
* remove debugging heartbeat
2014-09-17 10:43:10 -05:00
Seth Call
5df675f98b
* remove puts
2014-09-17 10:28:29 -05:00
Seth Call
d2729798a2
* fix reconnect path again
2014-09-17 10:27:58 -05:00
Seth Call
0b1ba57e1e
* remove puts
2014-09-17 10:27:31 -05:00
Seth Call
a273808865
* fix reconnect path again
2014-09-17 10:26:58 -05:00
Seth Call
0db38e17d6
* adding tests for VRFS-2221
2014-09-17 10:22:05 -05:00
Seth Call
6b96bdcd05
* VRFS-2221 - fix bad reconnect path
2014-09-17 10:22:00 -05:00
Seth Call
16373db827
* adding tests for VRFS-2221
2014-09-17 10:21:42 -05:00
Seth Call
2cae3b935c
* VRFS-2221 - fix bad reconnect path
2014-09-17 10:09:53 -05:00
Brian Smith
692416e27f
VRFS-2067 VRFS-2163 expand / collapse open slots, add All Languages option to language filter
2014-09-17 03:14:43 -04:00
Seth Call
4793ea701a
* VRFS-2209 - fix progress bar by fixing the update size variable. also show countdown
2014-09-16 21:14:16 -05:00
Seth Call
8338a7ecb7
* VRFS-2209 - fix progress bar by fixing the update size variable. also show countdown
2014-09-16 21:13:36 -05:00
Seth Call
169f97fdc3
* fix bad support blurp
2014-09-16 21:47:59 -04:00
Seth Call
74ac15c8a1
* make better alert about no network server
2014-09-16 21:47:39 -04:00
Seth Call
468be9da4e
* fix bad support blurp
2014-09-16 15:22:35 -05:00
Seth Call
74a509c97d
* make better alert about no network server
2014-09-16 13:50:00 -05:00
Seth Call
d3b31e4ab0
Merge commit '7c3530a4035ce46dadf431510946f935237e2949'
2014-09-16 13:45:44 -05:00
Brian Smith
1203a26271
Merge branch 'develop' into feature/opt_out_notification_fix
2014-09-15 23:02:53 -04:00
Seth Call
7c3530a403
* fix how we check if udpReachable
2014-09-15 14:09:49 -05:00
Seth Call
d2cd527f10
* fix preferences window not showing
2014-09-15 07:45:17 -05:00
Seth Call
35dd53469d
* VRFS-2164 - fix for missing tracks on record
2014-09-14 21:55:43 -05:00
Brian Smith
99ad394633
VRFS-2066 fix tests
2014-09-14 21:54:12 -04:00
Brian Smith
4ddd4e4c13
VRFS-2066 fixed some issues with session landing and feed
2014-09-14 19:17:16 -04:00
Brian Smith
03fe5e8a1e
VRFS-2066 consolidate users if they are listed multiple times in MSUH for the same session
2014-09-14 15:52:17 -04:00
Brian Smith
f296932f27
fix more session join/leave bugs
2014-09-14 15:12:25 -04:00
Brian Smith
e5a6ad862b
fix notification bugs - active_music_session vs. music_session confusion
2014-09-14 14:41:32 -04:00
Brian Smith
7290188681
refactored code related to joining a session (Terms / Join Request dialog display logic) into SessionUtils
2014-09-14 14:16:48 -04:00
Brian Smith
072f3101c7
VRFS-2179 minor refactor of offline notifications to prevent a second loop from executing
2014-09-13 08:04:40 -04:00
Seth Call
773e4dfca5
* VRFS-2159 - adding json maintanece page to jam-web
2014-09-12 22:49:23 -05:00
Seth Call
9824fa2c61
* VRFS-2159 - rewriting some expectations for build server
2014-09-12 22:45:07 -05:00
Seth Call
2bd189b697
* VRFS-2159 merge
2014-09-12 22:30:51 -05:00
Brian Smith
d8d987e21f
VRFS-2179 send email to friends/followers when user joins a session
2014-09-12 22:57:03 -04:00
Brian Smith
cf22e0957e
Merge branch 'develop' into feature/opt_out_notification_fix
2014-09-12 22:35:46 -04:00
Brian Smith
a47ffea5ad
VRFS-2136 added tests
2014-09-12 22:34:59 -04:00
Seth Call
770d0acd42
* VRFS-1505 - adding sorting to genres in controller
2014-09-12 06:29:10 -05:00
Seth Call
b603d7d253
* VRFS-1505 - fix typo in punk
2014-09-12 06:27:20 -05:00
Brian Smith
4bdcf103ce
VRFS-2136 only return recordings that have at least 1 claimed recording
2014-09-11 21:52:26 -04:00
Brian Smith
c55413d349
added more tests, minor refactor, only send scheduled session notifications if target user is online
2014-09-11 21:29:48 -04:00
Anthony Davis
eabd58add7
VRFS-2001 use separate user for websocket test
2014-09-11 17:02:43 -05:00
Anthony Davis
606c2031fb
VRFS-2001 - order-dependent :=3
2014-09-11 16:35:13 -05:00
Anthony Davis
7baa18b054
VRFS-2001 - debug
2014-09-11 16:20:22 -05:00
Anthony Davis
1651f5e2cb
VRFS-2001 debug
2014-09-11 16:09:36 -05:00
Anthony Davis
926add8d65
VRFS-2001 debugging websocket issue
2014-09-11 15:45:07 -05:00
Anthony Davis
acdb0b6f9b
VRFS-2001 - sigh
2014-09-11 15:20:54 -05:00
Anthony Davis
8e621517b2
VRFS-2001 - oops
2014-09-11 14:55:46 -05:00
Anthony Davis
a2897d78c3
VRFS-2001 - fixing test for www
2014-09-11 14:49:54 -05:00
Anthony Davis
446108e9f4
VRFS-2001 - making test less fail-prone
2014-09-11 13:29:41 -05:00
Anthony Davis
54d31a2b34
VRFS-2001 - user-agent header was not set when switching Capybara sessions
2014-09-11 12:39:36 -05:00
Brian Smith
632d806825
remove debug statement
2014-09-11 09:04:14 -04:00
Brian Smith
abc8f18c00
VRFS-2140 added more tests, fixed bug in band recording notification
2014-09-11 09:03:32 -04:00
Brian Smith
71487d989b
Merge branch 'develop' into feature/opt_out_notification_fix
2014-09-11 08:38:56 -04:00
Brian Smith
0b1f9d0c97
VRFS-2140 added more tests, fixed bug found in recording notification
2014-09-11 08:38:26 -04:00
Seth Call
251049bca2
* VRFS-1505 - fix tests now thaht there is also Alternative Rock
2014-09-10 11:27:55 -05:00
Seth Call
7761c2e9a8
* VRFS-2155 fix passing of yellow
2014-09-10 09:25:43 -05:00
Seth Call
5b9987aa17
* fix broken artifacts path: VRFS-2153
2014-09-10 09:13:02 -05:00
Brian Smith
a7623aac26
VRFS-2140 do not send any email notifications if the user has opted out of receiving emails
2014-09-10 03:04:35 -04:00
Brian Smith
14960eb8ae
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-09-10 01:03:27 -04:00
Brian Smith
32176aa879
VRFS-1505 added new genres to database
2014-09-10 01:03:11 -04:00
Seth Call
8c22d68b60
* sort by date, not the array VRFS-2130
2014-09-08 21:50:51 -05:00
Seth Call
cab20ba017
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-09-08 21:39:04 -05:00
Seth Call
406c86be29
* VRFS-2098 - protect against dup sessions showing up in daily email
2014-09-08 21:38:35 -05:00
Brian Smith
d547e4c2d6
VRFS-2094 fix tests
2014-09-08 22:23:35 -04:00
Brian Smith
850709e51a
VRFS-2094 include hour, minutes, seconds in filename to avoid overwriting files in S3 added on the same day for different sessions
2014-09-08 21:13:08 -04:00
Seth Call
75d50b8286
* make notations private bucket; only allow access if user has can_join? permissions for session
2014-09-08 16:51:28 -05:00
Brian Smith
07024a44a6
VRFS-2094 wip notation upload bug fixes
2014-09-08 09:13:20 -04:00
Brian Smith
cb7b42e761
fix issues
2014-09-07 17:42:31 -04:00
Brian Smith
74763d53f3
VRFS-2094 fixed issue with notation file upload and tying it to music session; still need to fix download issue
2014-09-06 03:30:29 -04:00
Brian Smith
6517a3b97d
VRFS-2121 hide CenturyLink promo in sidebar
2014-09-03 00:34:29 -04:00
Seth Call
c148b4a35e
* VRFS-2122 - fix for the update
2014-09-02 09:36:29 -04:00
Seth Call
82f5ac77ca
* VRFS-2122 - fix for the update
2014-09-02 09:35:30 -04:00
Seth Call
fc489af02e
* merged
2014-09-01 09:38:39 -05:00
Seth Call
f0304f2ca3
* VRFS-1981 - delete old scores
2014-08-31 22:24:11 -05:00
Seth Call
cf061aa055
* fix typos in network test fix
2014-08-31 20:35:51 -05:00
Seth Call
42b5144d72
* VRFS-2109 - you can toggle between profiles fine now
2014-08-31 16:13:53 -05:00
Seth Call
182b047fba
* VRFS-2111 - fixed issue with dead drag/drop
2014-08-31 15:48:35 -05:00
Seth Call
0132fa38b0
* guard against undefined SessionRemoveAllPlayTracks
2014-08-31 15:23:42 -05:00
Seth Call
e503287400
* VRFS-2110 - add simple guard to protect against xtra callbacks
2014-08-31 15:02:49 -05:00
Seth Call
c35cfcf0f9
* VRFS-2104 make sure APP_CONFIG exists in websocket-gateway
2014-08-31 14:45:48 -05:00
Seth Call
1430fb1923
* more wording tweaks
2014-08-31 12:01:02 -05:00
Seth Call
d0e63684b9
* open up downloads in browser
2014-08-31 11:58:37 -05:00
Seth Call
de64c17b59
* updating warning banner
2014-08-31 11:57:59 -05:00
Seth Call
b736be5c7f
* check if ClientUpdate dialog is null before calling it
2014-08-31 11:00:20 -05:00
Seth Call
5f85908c79
* VRFS-2104 - client update dialog happens when it needs to; not just on startup
2014-08-31 10:30:59 -05:00
Seth Call
4dcbd34d9e
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-08-29 10:02:46 -05:00
Seth Call
7d6b104cbd
* VRFS-2103 - guarding against new backend calls
2014-08-29 09:59:12 -05:00
Brian Smith
860d76db86
VRFS-2095 fix tests
2014-08-29 09:17:22 -04:00
Brian Smith
d6fc76728f
show musician hover bubbles on Find Session results, clicking musician avatar should take user to musician profile screen
2014-08-29 00:44:42 -04:00
Brian Smith
2db1de8e3c
VRFS-2095 add orange spinner to Find Session screen
2014-08-29 00:23:36 -04:00
Seth Call
09787a513c
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-08-28 21:28:12 -05:00
Seth Call
2e226f28dd
* implementing autostart, which also requires frontend control of audio
...
* VRFS-2087, VRFS-2080, VRFS-2079, VRFS-2065
2014-08-28 21:11:25 -05:00
Brian Smith
7d5cfa4cd2
VRFS-2093 fixed formatting and band URL issues with band search and hover bubble
2014-08-28 00:31:22 -04:00
Brian Smith
f39312662d
VRFS-2091 modified email regular expression to prevent 2 consecutive periods after the @
2014-08-27 23:36:57 -04:00
Brian Smith
4621a6474d
VRFS-1617 added band website to "about" section of band profile
2014-08-25 00:47:38 -04:00
Brian Smith
fabfa1675b
VRFS-2048 wire up "more" link in notifications sidebar
2014-08-24 23:22:57 -04:00
Brian Smith
82090f5f55
VRFS-2072 copy all 1-time cancellations instead of just the first
2014-08-24 15:12:38 -04:00
Anthony Davis
6144cda136
VRFS-912 - can't even see it
2014-08-24 11:23:13 -05:00
Anthony Davis
8b8cd3585f
Example readability
2014-08-24 11:23:13 -05:00
Brian Smith
b1f4ede997
VRFS-2072 fix session scheduler bug where RSVP requests were not being carried forward
2014-08-22 02:14:07 -04:00
Seth Call
fbb1ffb7a3
* no more results element in find musician page needs to be hidden on new search
2014-08-21 15:03:02 -05:00
Seth Call
6a01a1c2d6
* VRFS-2076, VRFS-2071 - musicians only listed once, and added spinner to find musician page
2014-08-21 14:58:14 -05:00
Seth Call
9d46f07153
* VRFS-2070 - work current_scores into a better query, and update the entire site to use it correctly
2014-08-20 17:06:57 -05:00
Seth Call
d0ad17ecfb
* fixing bad test code I typoped
2014-08-19 21:24:29 -05:00
Seth Call
4a0919e1bc
Merge branch 'feature/latency_hover' into develop
2014-08-19 20:59:02 -05:00
Seth Call
554d100c31
* VRFS-1962, VRFS-2047, VRFS-2046, VRFS-2006 - score breakdown hover and score badges are all tested and working
2014-08-19 20:58:24 -05:00
Seth Call
591432d9d2
* adding sanitize gem to admin
2014-08-19 14:24:50 -05:00
Seth Call
e3406e7af0
* wip
2014-08-19 14:24:23 -05:00
Seth Call
9c4ab6418c
* wip
2014-08-19 14:23:41 -05:00
Seth Call
8f49a9ab66
Merge branch 'develop' into feature/latency_hover
2014-08-19 12:49:54 -05:00
Seth Call
0e8a549d9e
* fix invalid CSS that sass now catches
2014-08-19 12:48:31 -05:00
Seth Call
95cbb47978
* wip
2014-08-19 12:40:55 -05:00
Seth Call
c92bc8fdc1
Merge branch 'feature/social_buttons' into develop
2014-08-19 12:32:32 -05:00
Seth Call
3daedbd549
* wip
2014-08-19 10:07:21 -05:00
Seth Call
27f4adf772
* VRFS-2064 - stop cycle in network test; VRFS-2062 - don't store HTML in user-inputs
2014-08-18 20:41:44 -05:00
Seth Call
0c3a43a177
* wip
2014-08-18 10:37:55 -05:00
Seth Call
5ae975c097
* merged
2014-08-15 09:40:39 -05:00
Seth Call
80c7d5b049
* VRFS-2049 - more guards in jamServer.js against runaway clients
2014-08-15 09:40:04 -05:00
Seth Call
e1edeef7ae
Merge branch 'feature/runaway' into develop
2014-08-15 09:33:38 -05:00
Seth Call
e415083916
* wip
2014-08-15 09:32:47 -05:00
Brian Smith
25e3f23dcf
VRFS-1891 VRFS-2022 bug fixes / test additions
2014-08-15 00:32:45 -04:00
Brian Smith
af1a4596e0
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-08-14 23:57:51 -04:00
Seth Call
5bdbbc5875
* wip
2014-08-14 22:53:39 -05:00
Seth Call
d34929d70b
* landing pages in VRFS-2037
2014-08-14 22:23:22 -05:00
Seth Call
90f1c253dd
* VRFS-2037 - landing pages done
2014-08-14 22:21:34 -05:00
Seth Call
884a5bdc6e
* wip
2014-08-14 21:31:34 -05:00
Seth Call
b9a5c75ec5
* VRFS-2055 - escape keyword in hand-crafted SQL query\!
2014-08-14 21:28:30 -05:00
Seth Call
5f1952f08d
* VRFS-2054 - change primepump timeout time to 11 seconds
2014-08-14 18:52:19 -05:00
Seth Call
3e52a03604
* VRFS-2054 - be nicer when we fail the primePump phase
2014-08-14 17:24:46 -05:00
Seth Call
134826c1ff
* VRFS-2053 - fixed
2014-08-14 16:54:36 -05:00
Seth Call
e4a8ce3759
* fix broken admin test
2014-08-14 14:08:35 -05:00
Seth Call
30b2c1bb53
* VRFS-2045 - fixing tests that use websocket-gateway, pass in 20 instead of defaulting of 0 for max connections
2014-08-14 13:16:38 -05:00
Seth Call
5c9f0da222
* make it possible to only see diagnostic info in the admin feed, and further diagnostic info of a certain type
2014-08-14 12:44:46 -05:00
Seth Call
154e2954d2
* VRFS-2045 - remove debug log
2014-08-14 11:35:51 -05:00
Seth Call
776704fdf5
* VRFS-2045 - guard against too many concurrent connections
2014-08-14 11:35:17 -05:00
Seth Call
322cdad87d
* wip
2014-08-14 10:09:33 -05:00
Brian Smith
6a1d1daa9b
Merge branch 'develop' into hotfix/cancel_rsvp_flow
2014-08-14 02:14:08 -04:00
Brian Smith
4b93b23282
VRFS-2022 fix tests
2014-08-14 02:11:36 -04:00
Brian Smith
5691e6092f
VRFS-2022 show private sessions/recordings in the feed
2014-08-14 01:45:37 -04:00
Seth Call
90ec0b3f1a
* fix admin tests
2014-08-13 15:32:51 -05:00
Seth Call
1688bdb5cf
* landing page wip
2014-08-13 15:26:34 -05:00
Seth Call
edc805e442
* VRFS-2040 - pass in retry value to backend
2014-08-13 12:51:40 -05:00
Seth Call
4c85740597
* wip
2014-08-13 11:09:52 -05:00
Brian Smith
e8847280bc
VRFS-1995 do not send notifications to users with canceled RSVPs
2014-08-12 02:20:25 -04:00
root
d28301c974
Merge branch 'fix_sidebar_chart_height' into develop
2014-08-12 07:52:59 +02:00
Brian Smith
da12798d19
VRFS-1562 avatar within musician/band hover bubble should link to profile
2014-08-12 01:37:11 -04:00
Brian Smith
257e14ef5d
VRFS-1478 fix text
2014-08-12 00:46:05 -04:00
Brian Smith
dece2afc1b
VRFS-1478 fix bugs
2014-08-12 00:24:57 -04:00
Brian Smith
5483078f82
VRFS-2026 fix instrument wrapping of instrument icon in some cases on Find Session screen
2014-08-11 21:02:42 -04:00
Seth Call
b8c09b912e
* fake commit to poke jenkins
2014-08-10 09:29:23 -05:00
root
dcbdddde3c
fix sidebar height issue, request sent button issue
2014-08-10 08:30:47 +02:00
Brian Smith
cc26969f8a
VRFS-1891 cancel RSVP flow fix
2014-08-09 23:22:17 -04:00
Brian Smith
fd9893ca42
Merge branch 'develop' into hotfix/cancel_rsvp_flow
2014-08-09 18:35:23 -04:00
Brian Smith
75d1efffeb
VRFS-2019 updated News section
2014-08-09 18:34:16 -04:00
Seth Call
3b6225c539
* prune the log cache from the right direction in the array
2014-08-08 13:05:27 -05:00
Brian Smith
f97a416867
VRFS-1891 VRFS-2011 cancel RSVP flow / show proficiency in RSVP dialog
2014-08-08 02:22:32 -04:00
Brian Smith
d40b29a947
VRFS-1971 escape HTML before saving / unescape before rendering
2014-08-07 00:50:10 -04:00
Seth Call
18ac90d624
* VRFS-2010 - profile sees older session/recordings
2014-08-06 16:52:40 -05:00
Seth Call
38c4f4f022
* pass in numClientsToTest - 1
2014-08-06 16:41:27 -05:00
Seth Call
36043ec631
* make the packet size configurabel
2014-08-06 08:11:07 -05:00
Jonathan Kolyer
9249e99581
added method min_create_date
2014-08-05 12:09:12 +00:00
Brian Smith
199ef029bc
merge develop
2014-08-04 22:38:59 -04:00
Seth Call
ee442d803d
* merge
2014-08-03 21:40:27 -05:00
Seth Call
e871cc5390
fix latency presention - divide by 2 then round
2014-08-03 21:38:53 -05:00
root
f86d5aa495
fix #1977
2014-08-02 18:37:29 +02:00
Seth Call
6e55f3617a
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-08-01 16:18:07 -05:00
Seth Call
52cf9911de
* merged
2014-08-01 16:17:49 -05:00
Seth Call
aa863240b9
* VRFS-1992 finished (daily session email improvements)
2014-08-01 16:17:04 -05:00
Anthony Davis
e610e5f282
Improve debug output
2014-08-01 11:06:14 -05:00
Anthony Davis
1658736108
Fixing console output
2014-07-31 23:03:34 -05:00
Anthony Davis
737b815fbe
help readability of console output
2014-07-31 22:48:44 -05:00
Anthony Davis
34248474e7
This should fix the monitor job -- but it's about 4 times slower now
2014-07-31 21:49:07 -05:00
Seth Call
4ce9d5fd7c
* add prefix to form URL
2014-07-31 21:08:53 -05:00
Seth Call
8048c5012d
* wip
2014-07-31 21:06:06 -05:00
Seth Call
91399fd94e
* bumping max length
2014-07-31 20:21:49 -05:00
Seth Call
00dee99e17
* wip
2014-07-31 20:16:38 -05:00
Seth Call
1f19c9a4c3
* fix test
2014-07-31 15:30:42 -05:00
Seth Call
e248d7dea2
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-07-31 10:34:21 -05:00
Seth Call
6f79878f91
* VRFS-1975/VRFS-2003 - don't send two participant creates back-to-back
2014-07-31 10:32:20 -05:00
root
d4e2c88994
Merge branch 'develop' of https://bitbucket.org/jamkazam/jam-cloud into develop
2014-07-31 17:08:14 +02:00
root
18cb0d6473
account_spec
2014-07-31 16:54:51 +02:00
root
8e7a566125
birthday dropdown
2014-07-31 14:49:13 +02:00
Seth Call
9af30cdde2
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-07-31 01:02:12 -05:00
Seth Call
a1b9191402
* open profile from account session details page in same window
2014-07-31 01:00:01 -05:00
Anthony Davis
8deddd269e
Fixing intermittent test failure
2014-07-30 23:43:16 -05:00
Seth Call
39c9b4335a
* VRFS-1997 - click guard of create session
2014-07-30 21:55:40 -05:00
Seth Call
2cdafacd16
* adding more debugs for problem on server
2014-07-30 21:35:37 -05:00
Seth Call
ac13d97808
* VRFS-1996 - mixer-id added to wrong element
2014-07-30 21:28:14 -05:00
Seth Call
761e40e9e2
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-07-30 21:06:13 -05:00
Seth Call
9544e3d075
* rename new column because it's not working for reasons I can't understand on the build server
2014-07-30 21:05:59 -05:00
Anthony Davis
70da64a26e
VRFS-1328 - wire up faders to use audio taper curve instead of percentage
2014-07-30 20:05:04 -05:00
Anthony Davis
72155c7ea6
VRFS-1328 - built composite function resembling audio taper for DAW-like faders
2014-07-30 20:03:07 -05:00
Seth Call
2aab3c902d
* fixing test that failed on build server
2014-07-30 17:29:26 -05:00
Seth Call
a11ae44a90
* VRFS-1951 - make sure staging emails don't get sent from my machie
2014-07-30 16:39:59 -05:00
Seth Call
699e8a6c5d
* check for empty file for VRFS-1988
2014-07-30 15:44:46 -05:00
Seth Call
00993acfed
* VRFS-1988 set up infra to allow for scheduler.yml override file
2014-07-30 15:35:56 -05:00
Seth Call
0abb38d48a
* remove debugigng puts
2014-07-30 15:13:07 -05:00
Seth Call
8966a3fc2f
* VRFS-1992 - check open_rsvps for daily session email, VRFS-1991 - remove hardcoded 10 in audio latency on create/join, VRFS-1990 - only send update rsvp notification if scheduled start time changes
2014-07-30 15:11:03 -05:00
Seth Call
bb66a7ac9a
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-07-30 08:42:20 -05:00
Seth Call
45ef4d05e3
VRFS-1989 - update to ftue video links
2014-07-30 08:41:47 -05:00
root
95b2c3675c
fix #1632 , fix #1954
2014-07-30 07:37:14 +02:00
root
915bb4ad13
Merge branch 'develop' of https://bitbucket.org/jamkazam/jam-cloud into develop
2014-07-30 07:13:19 +02:00
Brian Smith
da0f596fc1
VRFS-1965 hide button if button text is empty
2014-07-30 00:46:10 -04:00
Brian Smith
2c7e4ec581
remove fan/band chat option to match Create Session
2014-07-30 00:39:33 -04:00
Seth Call
9e574b33e8
* VRFS-1916 - two tables were used instead of one
2014-07-29 23:04:28 -05:00
Brian Smith
ebd66846ce
remove Jamtracks option from update session screen
2014-07-30 00:02:17 -04:00
Brian Smith
fd49851815
VRFS-1979 fix test
2014-07-29 23:43:48 -04:00
Brian Smith
80d9d5ac28
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-07-29 23:29:52 -04:00
Seth Call
f3cc256293
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-07-29 22:30:15 -05:00
Brian Smith
e4a30c768a
VRFS-1979 show landing page for email confirmation
2014-07-29 23:29:42 -04:00
Seth Call
210510a5a4
* VRFS-1964 - any 'web' layout page does not show websocket coneciton wo
2014-07-29 22:25:04 -05:00
Seth Call
209b6f2d7e
* sort score histories by date desc
2014-07-29 22:13:38 -05:00
Brian Smith
93cef4e0cd
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-07-29 22:46:14 -04:00
Brian Smith
24eb53cc07
fix syntax error and tests
2014-07-29 22:46:07 -04:00
Seth Call
dd318a9b8a
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-07-29 21:43:44 -05:00
Seth Call
9013ff2e94
* VRFS-1987 fix stupid typo caused by refactor of MusicSession to ActiveMusicSession
2014-07-29 21:42:35 -05:00
Brian Smith
d3b22afe16
schedule sessions that are at least 4 hours old
2014-07-29 22:40:42 -04:00
Brian Smith
edf6cf554d
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-07-29 22:08:53 -04:00
Brian Smith
0a075da783
VRFS-1983 session organizer cancelling RSVP should send notification to RSVP requester
2014-07-29 22:07:46 -04:00
Seth Call
525a2b298b
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-07-29 20:56:12 -05:00
Seth Call
9797bd8e92
* put pending in it block. sigh
2014-07-29 20:55:43 -05:00
Brian Smith
19f36b7d1b
copy is_unstructured_rsvp flag on RsvpSlot
2014-07-29 21:52:08 -04:00
Brian Smith
12397069d3
handle correct event
2014-07-29 21:41:03 -04:00
Brian Smith
9815675bc2
reduce space between Still Needed and Invited sections in right sidebar
2014-07-29 21:35:22 -04:00
Brian Smith
fa7672c0e6
fix issue where Session Info page was not being refreshed after submitting or cancelling RSVPs
2014-07-29 21:32:13 -04:00
Brian Smith
051e7f8bde
VRFS-1972 show correct information under Still Needed section for sessions with unstructured RSVPs
2014-07-29 21:20:38 -04:00
Brian Smith
6aaddbbe50
VRFS-1478 allow multiple session invites to same user
2014-07-29 20:29:41 -04:00
Seth Call
4ecf7abb1e
* VRFS-1978 - state is now autopopulated again
2014-07-29 18:49:36 -05:00
Seth Call
027456105b
* VRFS-1968 - locids are now in score history
2014-07-29 18:11:00 -05:00
Seth Call
10fbf7584e
* marking time sensitive test as pending
2014-07-29 17:55:34 -05:00
Seth Call
c3461e82a7
* VRFS-1976 - fixed issue where UI always picks 1st scheduled session; VRFS-1962 - use 'full latency' instead of just internet latency in musician search, find session, and new musicians email
2014-07-29 17:52:20 -05:00
root
95dcea9ca7
fixed issue #1632 #1954
2014-07-29 18:15:23 +02:00
Seth Call
7e810809ac
* fixing up end time format in csv export
2014-07-28 23:15:39 -05:00
Seth Call
4d94f85421
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-07-28 23:06:41 -05:00
Seth Call
1e6524e534
* VRFS-1956 - fixes for musicians page
2014-07-28 23:04:56 -05:00
Anthony Davis
3136165076
VRFS-1933 - fixing Jenkins failures
2014-07-28 22:04:42 -05:00
Seth Call
e9a4f33420
* VRFS-1957 - use median instead of just most recent for current_scores
2014-07-28 17:37:47 -05:00
Seth Call
ef87d635e2
* fixing some admin pathing/url issues
2014-07-28 10:05:16 -05:00
Seth Call
50c611d729
* removing debugger gem from admin gemfile for now
2014-07-28 09:49:56 -05:00
Jonathan Kolyer
a1cb5baf52
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-07-27 23:39:36 +00:00
Anthony Davis
c28e932c2d
VRFS-1933 - integration tests for all ways of creating a session - might fail on Jenkins
2014-07-28 21:14:21 -05:00
Jonathan Kolyer
45a48daae0
VRFS-1939 VRFS-1936 fixed session and scheduled musician invite dialog
2014-07-27 23:39:11 +00:00
Seth Call
2f76a82bd3
* fix changes to resque-scheduler includes
2014-07-27 12:46:20 -05:00
Seth Call
750bceec2e
* turn on more debugging for build server
2014-07-27 12:23:15 -05:00
Seth Call
c65b05993b
* adding migrate script to admin
2014-07-27 12:22:35 -05:00
Seth Call
2716211b18
* VRFS-1496 fixing up help text and header text
2014-07-27 11:49:26 -05:00
Seth Call
4f7c1ef22e
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-07-27 11:46:38 -05:00
Seth Call
dbf7547625
Merge branch 'feature/score_export' into develop
2014-07-27 11:46:14 -05:00
Seth Call
44ba9ef441
* VRFS-1496 - export CSV
2014-07-27 11:45:46 -05:00
Jonathan Kolyer
f8de3f9ba7
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-07-26 19:31:29 +00:00
Seth Call
dc3fd38af1
* adding bart to dev_users
2014-07-26 14:19:48 -05:00
Seth Call
2dd6153ed8
* wip on score export
2014-07-26 14:18:17 -05:00
Jonathan Kolyer
e87ae50dfe
VRFS-1942 tuning admin view
2014-07-26 04:10:40 +00:00
Jonathan Kolyer
d28a65c5ff
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-07-26 03:59:11 +00:00
Jonathan Kolyer
ff73c170bd
VRFS-1942 refactoring scheduled session emails; new admin view into batch email data queries
2014-07-26 03:58:58 +00:00
Seth Call
c13bbb95c0
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-07-25 15:01:26 -05:00
Seth Call
adb0b15555
* fixing bad schedules on scheduler.yml, and wip on admin web reporting
2014-07-25 15:01:14 -05:00
Bert Owen
b09551548d
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-07-25 13:50:17 +02:00
Bert Owen
c4f0472438
VRFS-1940 fix, test fix
2014-07-25 13:50:00 +02:00
Seth Call
6a037d9987
* VRFS-1944 - user info added to scores and score_histories
2014-07-24 18:39:26 -05:00
Bert Owen
60d7013d42
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-07-25 00:05:40 +02:00
Bert Owen
c966ffb8f9
VRFS-1940 fix default duration
2014-07-25 00:05:21 +02:00
Seth Call
5080458914
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-07-24 15:56:37 -05:00
Seth Call
cafb216136
* false commit to poke jenkins
2014-07-24 15:56:16 -05:00
Bert Owen
f38896837b
VRFS-1940 start time/end time enhancement
2014-07-24 19:03:39 +02:00
Seth Call
d73cc3af2c
* VRFS-1871 and VRFS-1903 are both results of easydropdown dying if it has a select with no options. So I default an empty select to 1 option with content N/A
2014-07-23 22:50:15 -05:00
Seth Call
1ca709d945
* make sure URL doesn't change if you hit cancel in notification
2014-07-23 22:26:54 -05:00
Seth Call
04b71506b4
* VRFS-1896 - check client side and server side if client size is uploaded
2014-07-23 22:14:55 -05:00
Seth Call
27e6f7ce65
* fixing scoring test
2014-07-23 21:27:21 -05:00
Seth Call
2dda0d6db7
* false commit to poke Jenkins
2014-07-23 21:11:06 -05:00
Seth Call
1b01fc0a0d
* false commit to poke jenkins
2014-07-23 19:13:42 -05:00
Seth Call
5833da2618
* fixing test; marking one as pending while i work on it
2014-07-23 18:26:28 -05:00
Seth Call
b590548af5
* VRFS-1937 - centered text now left aligned on cerate session screen for scheduled sessions
2014-07-23 16:30:42 -05:00
Seth Call
3894b2cbd3
* VRFS-1916 - fix vertical alignment issues on find session page
2014-07-23 15:40:25 -05:00
Seth Call
cc6f3fe974
* VRFS-1934/VRFS-1936 - fix scrolling in sessions, VRFS-1938 - no dups in find session page
2014-07-23 15:11:02 -05:00
Seth Call
ce3ae06053
* VRFS-1935 - show sessions regardless if native or browser
2014-07-23 11:38:31 -05:00
Seth Call
fc57fd7011
* VRFS-1868 - bring back P2P messages in the app
2014-07-23 11:15:14 -05:00
Seth Call
0ebdc0ee7c
* fixing more time comparisons in tests
2014-07-22 14:57:34 -05:00
Seth Call
55e304e109
* try to fix millisecond sensitivity in rspec matcher
2014-07-22 14:46:26 -05:00
Seth Call
333e321877
* updating the last_jam info on user in 5 needed locations (login, registration, ftue, import, etc)
2014-07-22 14:36:45 -05:00
Seth Call
57728fbfe8
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-07-21 16:42:36 -05:00
Seth Call
6c4bcd98be
* VRFS-1924 - score_history added
2014-07-21 16:42:30 -05:00
Brian Smith
e22f3f32df
remove log statement
2014-07-21 01:54:06 -04:00
Brian Smith
1d96f1b981
VRFS-1608 remove check that bypasses call to changeScreen if the user is already on the screen with the same internal name
2014-07-21 01:53:20 -04:00
Brian Smith
838a3d4d13
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-07-21 01:37:09 -04:00
Brian Smith
08d8d86fc6
VRFS-1635 auto-select the FB checkbox after successfully signing in to Facebook
2014-07-21 01:36:57 -04:00
Jonathan Kolyer
ecf4b6f397
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-07-21 05:14:11 +00:00
Jonathan Kolyer
b4ab41637c
VRFS-1629 added UserAuthorization.goog_auth method to exclude auths past expiration
2014-07-21 05:14:05 +00:00
Jonathan Kolyer
25cff163dc
VRFS-1874 added query constraint to filter out users with last_jam_locidispid = NULL
2014-07-21 05:12:07 +00:00
Brian Smith
4aa359fc13
VRFS-1921 legal policy links are now specific to environment, fixed bug with legal policy link on Session Info page
2014-07-21 01:05:07 -04:00
Brian Smith
c8162f55ca
VRFS-1916 minor changes
2014-07-21 00:33:20 -04:00
Seth Call
433148cd55
* adding rubyzip to websocket-gateway and admin
2014-07-19 23:05:20 -05:00
Seth Call
00ab39d82b
* speeding up web tests
2014-07-19 22:53:33 -05:00
Seth Call
081d0ab0dc
* adding zip to gem
2014-07-19 21:58:57 -05:00
Seth Call
1e0e78c520
* adding rspec config
2014-07-19 21:39:43 -05:00
Seth Call
75b2f21823
* adding support for opting out of transaction cleaner for tests that make transactions
2014-07-19 21:35:48 -05:00
Seth Call
513a46067a
* merged
2014-07-19 21:12:11 -05:00
Seth Call
5f131f9407
* VRFS-1403 - maxmind single step import done
2014-07-19 21:11:16 -05:00
Anthony Davis
31872174e3
VRFS-1741 - this checks resque queues, will fail if any > 5
2014-07-17 20:35:12 -05:00
Anthony Davis
69aecb1016
VRFS-1929 - can monitor staging/www based on MONITOR_URL
2014-07-17 19:51:34 -05:00
Brian Smith
32a16c4dcb
fix test
2014-07-16 20:30:33 -04:00
Bert Owen
5027000c49
VRFS-1927 Session organizer needs to be prohibited from canceling their RSVP
2014-07-16 20:19:43 +02:00
Bert Owen
662b668d87
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-07-16 18:21:37 +02:00
Bert Owen
590e6d8028
VRFS-1926 fixed, fix scheduled session query
2014-07-16 18:21:21 +02:00
Brian Smith
8f62216dbe
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-07-16 01:21:12 -04:00
Brian Smith
7555d8b65a
VRFS-1892 refresh only the affected session row when updating RSVPs
2014-07-16 01:20:59 -04:00
Seth Call
5feb642c0f
* fixing admin tests
2014-07-14 17:43:07 -05:00
Seth Call
d5b019620b
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-07-14 17:41:51 -05:00
Seth Call
ca084dc1ec
* fixing websocket test
2014-07-14 17:41:42 -05:00
Bert Owen
7c6f5530b0
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-07-15 00:34:53 +02:00
Bert Owen
db06226cd9
VRFS-1923 Implement spinner when fetching scheduled sessions on create session screen
2014-07-15 00:34:36 +02:00
Seth Call
9b29189cc0
* VRFS-1922 - trying to fix test
2014-07-14 17:25:20 -05:00
Seth Call
ae8c3120aa
* wip
2014-07-14 17:22:49 -05:00
Seth Call
8441acacef
* VRFS-1922 - marking unscheduled sessions as started if activemusicsession is created, and added a migration to fix up old sessions
2014-07-14 16:43:46 -05:00
Seth Call
c2a5936720
* wip
2014-07-14 15:53:04 -05:00
Bert Owen
9209a8f8ac
VRFS-1918 Session Details Update Screen - once over with tests
2014-07-14 20:40:19 +02:00
Bert Owen
26f7d2755b
VRFS-1918 Session Details Update Screen - once over with tests
2014-07-14 20:40:00 +02:00
Brian Smith
34a6843616
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-07-13 22:02:59 -04:00
Brian Smith
f06018817f
VRFS-1916 Find Session formatting wip
2014-07-13 22:02:50 -04:00
Seth Call
cc7fb9e0ac
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-07-13 13:20:40 -05:00
Seth Call
0ea1ef49b8
* VRFS-1919 - guard against old clients and new RegisterShutdown callback
2014-07-13 13:20:30 -05:00
Brian Smith
6b00538436
miscellaneous formatting fixes
2014-07-13 13:36:56 -04:00
Seth Call
4b4a6606bf
VRFS-1882 - you can create (actually, join) a session multiple times...
2014-07-12 22:20:15 -05:00
Seth Call
e59bb6e68c
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-07-12 22:08:50 -05:00
Seth Call
f065a913a4
* VRFS-1895 - re-entering create session works
2014-07-12 21:59:07 -05:00
Brian Smith
2895ea1223
fix broken test
2014-07-12 20:03:24 -04:00
Brian Smith
1c32702bba
VRFS-1915 fixed Find Session bug where first session in each section was not being cleared out when refreshing the list resulting in duplicates
2014-07-12 18:34:06 -04:00
Brian Smith
a7621b0326
VRFS-1911 fixed date formatting in app / email notifications, added session name and start time to popup notification
2014-07-12 18:24:12 -04:00
Seth Call
6970edb44c
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-07-12 15:28:44 -05:00
Seth Call
0b138a3abc
* VRFS-1867 - default the timezone using jstz library; VRFS-1870 - cancel dialog styling fixes
2014-07-12 15:28:20 -05:00
Anthony Davis
63b2a30466
VRFS-1914 - invalid extensions are not uploaded
2014-07-12 15:16:07 -05:00
Seth Call
14dad29c59
* VRFS-1861 - show something useful in the session section of the account screen
2014-07-12 08:55:58 -05:00
Seth Call
68f253080c
* change from Session URL to Fan Page
2014-07-12 07:47:25 -05:00
Seth Call
ba4fa985bf
* VRFS-1877; list 4 hours old and newer sessions - also noticed that create session listed sessions were filtering TBD scheduled sessions; brought those back in
2014-07-11 22:44:49 -05:00
Seth Call
b7683a1931
* VRFS-1876 - added details to the sesison info page
2014-07-11 22:22:15 -05:00
Seth Call
32baa4ad7d
* VRFS-1911 mostly done exception for emails and notifications
2014-07-11 21:38:59 -05:00
Seth Call
d47218961e
* working on formatting still
2014-07-11 21:11:34 -05:00
Seth Call
b3db70b47c
* mark update testing pending for now
2014-07-11 20:57:35 -05:00
Seth Call
471a0d13a0
* VRFS-1917 - timezone set correctly
2014-07-11 20:54:54 -05:00
Seth Call
2923969e94
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-07-11 17:22:01 -05:00
Seth Call
014a423a3d
* VRFS-1860 - account screen lists by date; VRFS-1911 partially done (using proper date formatting)
2014-07-11 17:21:55 -05:00
Brian Smith
3bc94249ca
VRFS-1497 VRFS-1749 added resque job to clean stale sessions, added tests for session scheduler and session cleaner jobs
2014-07-11 02:23:10 -04:00
Seth Call
55aea1109f
* VRFS-1869 - use offset
2014-07-10 22:08:03 -05:00
Seth Call
74b2f19460
* VRFS-1897 - fix the creator getting approval notice
2014-07-10 16:37:48 -05:00
Seth Call
afa2fa58cf
* VRFS-1887 - make the RSVP text helpful as to the state of the session relative to the viewing user
2014-07-10 15:57:48 -05:00
Seth Call
f693470c63
* VRFS-1910 - approved_rsvps to handle null instruments on slots, as well as remove attr_accessors as holders on user model
2014-07-10 15:22:00 -05:00
Seth Call
3a5d146ef3
* change can_delete to can_cancel, and don't cehck for start_at anymore
2014-07-10 11:38:17 -05:00
Seth Call
f2975c8838
* VRFS-1908 - add more canceled checks
2014-07-10 11:27:26 -05:00
Seth Call
deff00292a
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-07-10 11:00:26 -05:00
Seth Call
131b397f80
* background log
2014-07-10 11:00:23 -05:00
Seth Call
ec467186dd
* VRFS-1907 fix for latency tester
2014-07-10 10:45:08 -05:00
Brian Smith
8c2842049c
fix tests broken in previous commit
2014-07-10 01:12:39 -04:00
Brian Smith
8c320683e2
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-07-10 00:39:54 -04:00
Brian Smith
0041562933
VRFS-1419 VRFS-1906 do not delete music session when canceling because it leaves dangling notifications / added paging support for Find Session screen
2014-07-10 00:39:38 -04:00
Scott Comer
3ebe43ef4b
function to produce summary report of scores information
2014-07-09 23:09:38 -05:00
Seth Call
9a9143bb8c
* fix profile_menu_spec test
2014-07-09 19:15:04 -05:00
Seth Call
e47d8c1abb
* VRFS-1832 - making dialogs work everywhere
2014-07-09 17:20:20 -05:00
Seth Call
73d2d537da
* VRFS-1832 - dialogs refactored to a very large degree; want to get all the file moves in now
2014-07-09 14:10:42 -05:00
Seth Call
c6094d2c88
* VRFS-1899 - make instructions box bigger on the left for step2 and step3
2014-07-09 11:19:49 -05:00
Seth Call
0000932789
* VRFS-1901 - hook up wired pth
2014-07-09 10:18:29 -05:00
Seth Call
93a2151337
* VRFS-1900 - add rel:external to link
2014-07-08 21:20:07 -05:00
Seth Call
c043cffc72
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-07-08 21:14:50 -05:00
Seth Call
2905372451
* VRFS-1809 - change to _default and copy instruments
2014-07-08 21:14:40 -05:00
Anthony Davis
b6fa32e764
VRFS-1878 - fixing file extension bug and updating error message
2014-07-08 20:15:04 -05:00
Seth Call
71737f3f5e
* VRFS-1879 - handle case of no instruments selected for others; VRFS-1894 - canceled RSVPs that have not been dealt with are not shown
2014-07-08 16:52:25 -05:00
Seth Call
e9cd2e14f9
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-07-08 13:34:07 -05:00
Seth Call
0020a8eb0d
* VRFS-1889 completed; VRFS-1879 - partially done
2014-07-08 13:34:03 -05:00
Bert Owen
2bad833e58
fix session detail spec, fix session detail approve/cancel rsvp request actions
2014-07-08 17:47:46 +02:00
Seth Call
27fe4f4ae9
* VRFS-1880 - fixed issue and added test
2014-07-07 16:08:36 -05:00
Seth Call
74b63c5aa5
* VRFS-1757 - just one, little, css rule gone bad
2014-07-07 10:25:54 -05:00
Seth Call
23547b26b4
* VRFS-1871 - stopping double-redraw of dropdown
2014-07-07 09:59:39 -05:00
Brian Smith
71c22417d4
VRFS-1823 allow anonymous users to view session info page
2014-07-06 23:07:58 -04:00
Brian Smith
627a403009
VRFS-1875 fix action button for RSVP notification
2014-07-06 16:15:39 -04:00
Brian Smith
4872c037ad
added field to approved_rsvps method per request from Bert
2014-07-05 21:51:45 -04:00
Brian Smith
1975233e57
VRFS-1858 show friendly message if date is not defined for future sessions
2014-07-05 21:13:35 -04:00
Bert Owen
f5e5c3c07f
Merge branch 'develop' of https://bitbucket.org/jamkazam/jam-cloud into develop
2014-07-05 17:22:35 +02:00
Bert Owen
eee37a5954
fix account session detail page
2014-07-05 17:21:55 +02:00
Seth Call
180b48fa13
* fixing session_info_spec tests
2014-07-04 10:48:51 -05:00
Seth Call
b96cc32d3c
* VRFS-1858 use open_rsvp instead of music_access for scheduled session
2014-07-04 08:26:46 -05:00
Seth Call
9cb702f9de
* VRFS-1858 - fix sessions with no scheduled_start time being filtered
2014-07-03 22:47:11 -05:00
Seth Call
eecc402744
* pin faker to 1.3.0
2014-07-03 20:52:36 -05:00
Seth Call
5b8fd14088
* pin jquery-ui-rails to 4.2.1
2014-07-03 20:39:26 -05:00
Seth Call
3f53cb9819
* removing jquery draggable from web and landing
2014-07-03 17:53:16 -05:00
Seth Call
2ceb50f7c2
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-07-03 16:27:00 -05:00
Seth Call
de1ca28623
* VRFS-1680 - incorporate LeaveSessionAndMinimize bridge call on 'background' selection
2014-07-03 16:26:53 -05:00
Brian Smith
4e1a68f344
VRFS-1855 fixed Create / Find Session issues related to open RSVPs
2014-07-03 00:51:54 -04:00
Bert Owen
af901f9241
merge
2014-07-02 22:48:02 +02:00
Bert Owen
c35b246a42
fix typo error
2014-07-02 22:44:22 +02:00
Seth Call
bd910abee9
* VRFS-1680 - working mostly... but the backgrounding isn't yet working when selected
2014-07-02 15:43:38 -05:00
Bert Owen
d6f26b6cd6
fix tests
2014-07-02 22:43:04 +02:00
Seth Call
13b1bffa70
* null protect scheduled_start field
2014-07-02 15:22:31 -05:00
Bert Owen
421d183ba3
Merge branch 'develop' of https://bitbucket.org/jamkazam/jam-cloud into develop
2014-07-02 15:57:55 +02:00
Bert Owen
2ced001f77
add account scheduled session properties page, add spec, fix detail page, create session flow
2014-07-02 15:57:18 +02:00
Seth Call
1e4e9bd90e
* VRFS-1804 - 'prime the pump' stage done
2014-07-01 21:01:47 -05:00
Seth Call
6cee38df70
* remove debug
2014-07-01 15:05:19 -05:00
Seth Call
c58cd234e7
* VRFS-1811 - use step 2's selected inputs to populate track assignments
2014-07-01 15:02:30 -05:00
Seth Call
64b25e4b5f
* VRFS-1810 - bring back in_session_spec test, VRFS-1834 - allow different genres to be used by GenreSelectorHelpor
2014-07-01 14:30:38 -05:00
Seth Call
6e31e3b06c
* VRFS-1830 - only dismiss launch-app on dialog close
2014-07-01 14:12:55 -05:00
Seth Call
7dcf205a6b
* VRFS-1821 - clarify error message on music notation fail
2014-07-01 13:58:58 -05:00
Seth Call
607c0a145d
* get rid of print
2014-07-01 13:26:27 -05:00
Seth Call
ba57c00dec
* VRFS-1429 - instruments stay selected, and tos stays selected
2014-07-01 13:19:33 -05:00
Seth Call
726122041d
* VRFS-1819 - datepicker has arrows back,and lighter theme
2014-07-01 11:48:56 -05:00
Seth Call
d4c78903ca
* VRFS-1813 - added in all the help links for the gear wizard
2014-07-01 11:07:49 -05:00
Jonathan Kolyer
932513a00b
added task users:fix_corrupted_country_codes
2014-06-30 12:26:46 +00:00
Brian Smith
631899007e
VRFS-1827 add Fan Page URL to session info page
2014-07-01 00:47:02 -04:00
Brian Smith
b0011137b9
VRFS-1827 add Fan Page URL to session info page
2014-07-01 00:44:10 -04:00
Brian Smith
0ece384569
VRFS-1828 VRFS-1829 add date/time info to Find Session screen, fix RSVP dialog issues
2014-07-01 00:36:06 -04:00
Seth Call
b033b84425
* fix test
2014-06-30 20:28:35 -05:00
Seth Call
8986797435
* fixing 3 tests
2014-06-30 18:54:16 -05:00
Seth Call
490172d3ad
* quick attempt to fix most chat test issue
2014-06-30 17:45:37 -05:00
Seth Call
2041b8b660
* VRFS-1814 - end time updated automatically to an hour after
2014-06-30 17:12:00 -05:00
Seth Call
4a2c61d678
* VRFS-1816 - white on white action fixed
2014-06-30 16:46:35 -05:00
Seth Call
eccd166a47
* VRFS-1815 - remove dead space from friends dialog
2014-06-30 16:34:00 -05:00
Seth Call
1e2aa7f552
* VRFS-1817 shortening names
2014-06-30 16:26:26 -05:00
Seth Call
2cdc1b87e3
VRFS-1817 remove jamtracks option
2014-06-30 16:24:56 -05:00
Seth Call
a9b7830e21
* VRFS-1818 - removed fans may listen, chat with the band option from create session and session details
2014-06-30 16:19:50 -05:00
Seth Call
7a10e67c76
* take out restriction for max 12 hours in the future for scheduled sessions
2014-06-30 16:14:01 -05:00
Seth Call
ede136cc89
* min-height the create-session-form to give nice button behavior on taller-than-necessary monitors
2014-06-30 15:49:41 -05:00
Seth Call
63dfb8929c
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-06-30 15:44:38 -05:00
Seth Call
cbe4bf1747
* VRFS-1757 - updated signin dialog to 'modern' standards; VRFS-1826 - 2/3 fixed
2014-06-30 15:44:28 -05:00
Jonathan Kolyer
c95bebef48
VRFS-1458 fixed location selection
2014-06-30 03:13:40 +00:00
Brian Smith
6c05fb5ad1
VRFS-1812 refactor latency indicators to retrieve them after a websocket connection has been established; fixes broken tests
2014-06-29 22:08:30 -04:00
Brian Smith
98febc2b4f
VRFS-1729 expose new JS function
2014-06-29 20:10:00 -04:00
Brian Smith
bf6bf3ac98
VRFS-1729 added JS function to support RSVP approve/decline on Session Details screen
2014-06-29 17:35:18 -04:00
Bert Owen
156095f3c8
Merge branch 'develop' of https://bitbucket.org/jamkazam/jam-cloud into develop
2014-06-29 15:55:18 +02:00
Bert Owen
07d96d7a57
VRFS-1667, VRFS-1729 implemented account session page, session detail page
2014-06-29 15:54:51 +02:00
Jonathan Kolyer
927532eeff
VRFS-1265 fixed broken test
2014-06-29 02:13:37 +00:00
Brian Smith
ed25bd5456
VRFS-1812 added latency indicators to the session info page
2014-06-28 13:21:32 -04:00
Brian Smith
287faa765c
VRFS-1812 added latency indicators to the session info page
2014-06-28 13:06:32 -04:00
Seth Call
aedd719b7f
* adding websocket connect on /
2014-06-27 14:25:26 -05:00
Seth Call
b130818011
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-06-27 14:18:09 -05:00
Seth Call
865b488f93
* VRFS-304 - user history (feed) tab
2014-06-27 14:17:56 -05:00
Brian Smith
c285b8347a
VRFS-1820 fix latency indicator alignment issues
2014-06-27 01:59:51 -04:00
Brian Smith
3b6a65eec2
VRFS-1820 fix latency indicator alignment issues
2014-06-27 01:53:33 -04:00
Brian Smith
79dc9c37c2
VRFS-1820 fixed aesthetic issues
2014-06-26 23:28:59 -04:00
Brian Smith
eb30ee3391
VRFS-1672 music notation file upload work
2014-06-26 23:07:48 -04:00
Seth Call
09364fc25b
* refactor feed logic into a 'helper', to prepare for VRFS-304
2014-06-26 07:23:27 -05:00
Brian Smith
15fca431ed
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-06-26 07:49:59 -04:00
Brian Smith
cfb65548da
fix test
2014-06-26 07:49:49 -04:00
Seth Call
3be30ad806
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-06-25 21:52:59 -05:00
Seth Call
f9ce995a8f
* tweak date offset logic
2014-06-25 21:50:20 -05:00
Brian Smith
8e335e28ca
VRFS-1669 VRFS-1672 bug fixes
2014-06-25 22:20:32 -04:00
Seth Call
20e4a39a61
* oopms. fixing something I just broke; you couldn't start a session that you were only scheduling
2014-06-25 17:44:14 -05:00
Seth Call
4a072e5cd2
* eek - removed something by accident in sign_in
2014-06-25 17:07:30 -05:00
Seth Call
8ad10a2ce0
* clean up negative finder
2014-06-25 16:57:57 -05:00
Seth Call
c7a0208804
* create session/find session 'what app' guard movement; * VRFS-1753 - network guard in place (and FTUE guard withit)
2014-06-25 16:54:31 -05:00
Jonathan Kolyer
5694e19eff
VRFS-1265 fixed country/region/city selection issues
2014-06-25 15:47:57 +00:00
Seth Call
d1288b3b71
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-06-25 10:21:52 -05:00
Seth Call
fe7c58bafc
* adding code to handled positive timezone
2014-06-25 10:21:36 -05:00
Jonathan Kolyer
31ec7ae6b1
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-06-25 14:49:44 +00:00
Jonathan Kolyer
05b3d855d7
VRFS-1458 cleaned up labels and selection issues with country/region/city selects
2014-06-25 14:49:33 +00:00
Brian Smith
67b7e40179
VRFS-1672 session settings dialog work
2014-06-25 02:26:36 -04:00
Brian Smith
1593482f11
VRFS-1669 fix language filter dropdown
2014-06-25 01:03:22 -04:00
Brian Smith
73ba842c6a
VRFS-1669 find session work
2014-06-25 00:30:56 -04:00
Seth Call
178bd52cd4
* fixing line wrap in firefox of select files button
2014-06-24 17:48:31 -05:00
Seth Call
393d7f7d8b
* not centering no sessions notice
2014-06-24 17:47:18 -05:00
Seth Call
6f2691ee10
* fixing manifest to make staging the authority
2014-06-24 17:40:20 -05:00
Seth Call
c34a197b9d
* VRFS-943 - warn user about read only volume
2014-06-24 17:17:50 -05:00
Seth Call
fcda915702
* partial work on VRFS-943
2014-06-24 15:58:17 -05:00
Seth Call
0dac0b21f1
Merge branch 'feature/scheduled_sessions' into develop
2014-06-24 13:51:25 -05:00
Seth Call
37dd1c0438
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-06-24 13:50:46 -05:00
Seth Call
ec6c4d010c
* fix Gemfile in admin-web
2014-06-24 11:33:56 -05:00
Seth Call
2df7ef2c61
* VRFS-1810 all tests fixed
2014-06-24 11:27:40 -05:00
Seth Call
464c595d6b
* fixing controller/request tests
2014-06-24 10:33:31 -05:00
Seth Call
bd53601b56
* fix scheduled_session helper
2014-06-23 23:03:04 -05:00
Anthony Davis
b897e088ce
VRFS-1809 - shouldn't be able to select 'default' instrument during FTUE
2014-06-23 22:28:38 -05:00
Seth Call
6d84241cae
* merged
2014-06-23 22:28:23 -05:00
Seth Call
5750584769
* VRFS-1803 - myriad create session styling fixes; some default behaviors added, UI behavors added; VRFS-1808; change up how upload files works
2014-06-23 22:26:27 -05:00
Brian Smith
c5d9f41242
fix merge
2014-06-23 01:56:44 -04:00
Brian Smith
e211871168
merge develop
2014-06-23 01:09:03 -04:00
Brian Smith
f4b4734c94
VRFS-1669 find session work
2014-06-23 00:58:37 -04:00
Bert Owen
49b84bcf2c
fix test
2014-06-23 01:43:17 +02:00
Bert Owen
e0aebe0751
Merge branch 'feature/scheduled_sessions' of https://bitbucket.org/jamkazam/jam-cloud into feature/scheduled_sessions
2014-06-23 01:28:02 +02:00
Bert Owen
00f84da610
VRFS-1807 Create session Step 1, option #1 throws JS error
2014-06-23 01:27:35 +02:00
Brian Smith
bc47a0a599
VRFS-1669 find session wip
2014-06-21 16:16:39 -04:00
Seth Call
6aa51e43b9
* fixing typo in istrumens_rsvp
2014-06-20 13:52:11 -05:00
Seth Call
d8aa88271e
* log
2014-06-20 12:50:31 -05:00
Bert Owen
e200747096
VRFS-1666 add test, finish
2014-06-20 18:52:36 +02:00
Seth Call
a787601ca8
* VRFS-1424 - fix UI of recording widget in session locations
2014-06-19 20:45:06 -05:00
Seth Call
9e92125b59
* VRFS-1653 - websocket reconnect wasn't working if no connect on initial connect
2014-06-19 18:51:47 -05:00
Seth Call
fafc7b218f
* oomps. forgot drag handle VRFS-1790
2014-06-19 16:24:55 -05:00
Seth Call
6096687b07
* railties is floating to 4.x; pinning
2014-06-19 15:46:38 -05:00
Seth Call
cbdd847848
* railties is floating to 4.x; pinning
2014-06-19 15:45:18 -05:00
Seth Call
762af63b09
* VRFS-1653 - fixing another startup problem for websocket connections
2014-06-19 14:52:08 -05:00
Seth Call
3d1c4f2488
* VRFS-1790 - drag handles added to configure tracks; VRFS-1653 - fixed bug where slow initial connect would cause loop; also log in on initail connect instead of extra login message
2014-06-19 14:05:33 -05:00
Bert Owen
b33108c54a
make create session flow spec as pending...
2014-06-20 02:49:53 +08:00
Bert Owen
af06127403
fix create session flow, rsvp
2014-06-20 02:43:21 +08:00
Brian Smith
8baebfd105
VRFS-1669 find session wip
2014-06-19 00:44:37 -04:00
Brian Smith
b4151c27e9
VRFS-1669 VRFS-1672 session settings dialog / find session work
2014-06-19 00:21:34 -04:00
Brian Smith
74d5053a8a
allow session organizer to create RSVP for self without having invitation
2014-06-18 22:32:21 -04:00
Seth Call
4425d66484
* VRFS-1574 - network test, audio test GA tracking; VRFS-1653 - fixed bug on initial connect timeout causing runaway connections
2014-06-18 20:59:52 -05:00
Bert Owen
7f6a5e75ff
Merge branch 'feature/scheduled_sessions' of https://bitbucket.org/jamkazam/jam-cloud into feature/scheduled_sessions
2014-06-19 00:16:24 +02:00
Bert Owen
f27ff725ef
fix create session flow errors.
2014-06-19 00:15:56 +02:00
Seth Call
a38174b6e4
* VRFS-1799 - video links in
2014-06-18 14:02:26 -05:00
Seth Call
3952ae51dd
* VRFS-1792 - fix instructions box size on voice chat step and network-dialog step
2014-06-18 11:46:56 -05:00
Seth Call
8efe5ee575
* adding name proxy method
2014-06-18 09:54:08 -05:00
Seth Call
e3d521e07a
* adding in session.name to show.rabl and history_show.rabl
2014-06-18 08:09:36 -05:00
Seth Call
0856232f9f
* VRFS-1798 - fixing 'backendguard' timer
2014-06-17 21:57:40 -05:00
Seth Call
a46180880e
* fixing a few web tests
2014-06-17 20:07:40 -05:00
Seth Call
83489723a3
Merge branch 'feature/scheduled_sessions' of bitbucket.org:jamkazam/jam-cloud into feature/scheduled_sessions
2014-06-17 17:16:55 -05:00
Seth Call
39a55f562c
* VRFS-1684 and VRFS-1684 (find session APIs) completede
2014-06-17 17:16:49 -05:00
Bert Owen
3f77864b70
Merge branch 'feature/scheduled_sessions' of https://bitbucket.org/jamkazam/jam-cloud into feature/scheduled_sessions
2014-06-18 04:58:39 +08:00
Bert Owen
aca8b86316
add session cancel feature
2014-06-18 04:57:48 +08:00
Seth Call
106222638f
* VRFS-1684 and VRFS-1686 - updating stored procs, added /api/sessions/nonactive/, adding a bunch of tests for sms_index
2014-06-17 14:10:24 -05:00
Seth Call
5ad6db90ef
* VRFS-1684 - approved RSVP'ed users now have scores as well
2014-06-16 18:14:04 -05:00
Seth Call
3ef4619872
* cleaning up minor things
2014-06-16 15:58:44 -05:00
Seth Call
8d16bdacfa
Merge branch 'feature/scheduled_sessions' of bitbucket.org:jamkazam/jam-cloud into feature/scheduled_sessions
2014-06-16 15:41:52 -05:00
Seth Call
f680fafaf3
* VRFS-1684 - adding latency to participants and approved_rsvps JSON response.
2014-06-16 15:41:37 -05:00
Brian Smith
35f630bdd7
VRFS-1690 add autoapprove option to RSVP creation
2014-06-16 08:11:05 -04:00
Brian Smith
87a74e235d
Merge branch 'feature/scheduled_sessions' of bitbucket.org:jamkazam/jam-cloud into feature/scheduled_sessions
2014-06-16 01:47:07 -04:00
Brian Smith
75b22ced5b
added ability to retrieve RSVP requests by approval status
2014-06-16 01:46:52 -04:00
Seth Call
b1f4357ac6
* no transmit wip
2014-06-15 22:32:56 -05:00
Brian Smith
69ed727775
mark failing test pending
2014-06-15 23:18:56 -04:00
Seth Call
f1bb30ea0d
* VRFS-1788 - adding simple 'loop detection' logic
2014-06-15 21:42:57 -05:00
Seth Call
526dc3a512
* null guarding timestamps for admin fed
2014-06-15 21:04:06 -05:00
Scott Comer
839605255d
Merge branch 'feature/scheduled_sessions' of bitbucket.org:jamkazam/jam-cloud into feature/scheduled_sessions
2014-06-15 19:56:44 -05:00
Scott Comer
d02e10def5
fix asm_index stored procedure to populate all users of active sessionsinto ams_users_tmp whether they have scores or not
2014-06-15 19:26:13 -05:00
Brian Smith
4c81fdc1eb
Merge branch 'feature/scheduled_sessions' of bitbucket.org:jamkazam/jam-cloud into feature/scheduled_sessions
2014-06-15 15:49:47 -04:00
Brian Smith
7f3f47c3e6
VRFS-1749 session info tests
2014-06-15 15:49:43 -04:00
Scott Comer
e3e9953768
update images per david
2014-06-15 13:22:33 -05:00
Scott Comer
740d48631a
added ams_users invocation to ams_index method of controller; fixed bug in spec relating to user id accessor of user object
2014-06-15 10:58:19 -05:00
Scott Comer
07c1a4c85d
added attribute accessors for music_session_id and latency; added access to ams_users_tmp via ams_users method in ActiveMusicSession; added test of same in the spec
2014-06-15 10:35:15 -05:00
Seth Call
2a04208fb5
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-06-15 10:07:13 -05:00
Bert Owen
ab2ad1b93c
Merge branch 'feature/scheduled_sessions' of https://bitbucket.org/jamkazam/jam-cloud into feature/scheduled_sessions
2014-06-15 15:12:07 +08:00
Bert Owen
418ec9d927
account sessions page initial
2014-06-15 15:11:34 +08:00
Bert Owen
db6d6fa315
fix tests, rsvp error
2014-06-15 15:10:44 +08:00
Seth Call
dbd4e8a823
* VRFS-1789 - loopback UI issues resolved
2014-06-14 22:20:13 -05:00
Scott Comer
ab5a7dc47a
Merge branch 'feature/scheduled_sessions' of bitbucket.org:jamkazam/jam-cloud into feature/scheduled_sessions
2014-06-14 21:27:43 -05:00
Scott Comer
3c3565893d
wire up live latency and tag; accessors for tag and latency; fix borked function def; ams_init function; ams transaction
2014-06-14 21:27:34 -05:00
Seth Call
62bf8eb0a0
* allow core dumps and a greater number of handes for the web processes
2014-06-14 13:06:37 -05:00
Brian Smith
a557e9966a
VRFS-1749 more session info tests / fix "deprecated" warnings
2014-06-14 13:13:45 -04:00
Bert Owen
07864a0f76
fix scheduled session
2014-06-14 23:03:39 +08:00
Bert Owen
03705547dd
fix music session - rsvp
2014-06-14 21:42:46 +08:00
Bert Owen
d4b467fd42
scheduled session - RSVP slot updated
2014-06-14 21:25:32 +08:00
Bert Owen
88a7ba197a
Merge branch 'feature/scheduled_sessions' of https://bitbucket.org/jamkazam/jam-cloud into feature/scheduled_sessions
2014-06-14 20:52:47 +08:00
Bert Owen
e336828d22
fix create session flow
2014-06-14 20:52:25 +08:00
Scott Comer
2799a6443e
added asm_index method to controller and fix a few issues with asm_index and included a simple test
2014-06-13 23:51:54 -05:00
Scott Comer
b918d24d32
reverse query ams_index to produce list of augmented music_sessions
2014-06-13 19:47:34 -05:00
Seth Call
e301792c36
* VRFS-1784 - change acceptable to fair to make text all fit
2014-06-13 17:01:11 -05:00
Seth Call
e5b4177d38
* remove logs from FTUE diagonstics
2014-06-13 15:53:30 -05:00
Seth Call
9edc3a5e24
* fixing bad reference to internet_service_provider
2014-06-13 15:10:47 -05:00
Seth Call
bcaad53466
* fixing typo in log statement
2014-06-13 15:07:17 -05:00
Seth Call
f00ac3b164
* VRFS-1777 fixing hoverOut issue; also adding some debugs for missing mixers
2014-06-13 15:03:48 -05:00
Seth Call
8b85d2fb7f
* resolving VRFS-1781
2014-06-13 12:51:03 -05:00
Scott Comer
beca3b5608
stub out active_music_sessions#ams_index
2014-06-13 12:38:36 -05:00
Scott Comer
ae6f82659a
Merge branch 'feature/scheduled_sessions' of bitbucket.org:jamkazam/jam-cloud into feature/scheduled_sessions
2014-06-13 10:22:44 -05:00
Scott Comer
691f0c1a65
first cut at ams_index stored procedure
2014-06-13 10:22:29 -05:00
Brian Smith
715442b745
VRFS-1749 session info tests wip
2014-06-13 03:58:32 -04:00
Brian Smith
bedb377be8
VRFS-1749 session info tests wip
2014-06-13 03:45:45 -04:00
Seth Call
1fe8a77b59
* prod the user that their output device doesn't work, in the case it only has 1 output
2014-06-12 15:30:22 -05:00
Seth Call
b93ff48a91
* fixing alert registration bug
2014-06-12 14:52:26 -05:00
Seth Call
8c92820275
* fix case where an invalid chat will make 'next' go disabled
2014-06-12 14:29:38 -05:00
Seth Call
942677a467
* oops. making constant available to callers
2014-06-12 13:40:08 -05:00
Seth Call
0d8875c00f
* VRFS-1774 handling voice chat failure scenarios better; delegating to gear_test for invalid audio notice
2014-06-12 13:36:51 -05:00
Seth Call
5c16d54291
* VRFS-1770 - showing banner when backend event happens after FTUE attempt
2014-06-11 21:47:56 -05:00
Seth Call
bc43837a19
* protect against events that happen while outside of session
2014-06-11 16:59:14 -05:00
Seth Call
7c3806821e
* moving backend alert initialization to early in frontend initialization, to prep for receiving bad device events (VRFS-1770)
2014-06-11 16:52:46 -05:00
Seth Call
a52f5a1ae4
* VRFS-1774 - trying to handle case where chat fails to apply
2014-06-11 15:37:15 -05:00
Seth Call
382515d5b2
* VRFS-1777 - let unassigned tracks also show all text on hover
2014-06-11 14:08:27 -05:00
Seth Call
51696b7c52
* fixing tests
2014-06-11 12:18:34 -05:00
Seth Call
c0a96b2468
& fixing user progression test
2014-06-11 11:47:39 -05:00
Seth Call
89cce8c881
* adding some gems to websocket gateway
2014-06-11 10:27:51 -05:00
Seth Call
03414bfeb2
* fix test sizes
2014-06-11 10:27:03 -05:00
Brian Smith
aa95dd783b
fix tests
2014-06-11 09:15:03 -04:00
Brian Smith
5fc9696d01
merge develop
2014-06-11 08:45:34 -04:00
Brian Smith
d1e4971526
marked failing tests as pending
2014-06-11 08:00:05 -04:00
Brian Smith
d8c39e87e4
VRFS-1749 session info page tests wip
2014-06-11 07:51:07 -04:00
Seth Call
d38e5d155a
* fix for bad reference to context.JK.EVENTS
2014-06-10 22:27:37 -05:00
Seth Call
ff96f8e199
* VRFS-1764 - fix case where a drag start changes scroll
2014-06-10 22:11:36 -05:00
Seth Call
145ae17ceb
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-06-10 22:07:49 -05:00
Seth Call
f644a12487
* VRFS-1777 hovering working for all but unassigned ports
2014-06-10 22:07:35 -05:00
Scott Comer
d220a00221
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-06-10 20:51:09 -05:00
Scott Comer
161f75a126
use current_scores instead of scores
2014-06-10 20:50:59 -05:00
Seth Call
cb0c8f2007
* switch back to left-to-right text in track assignment; and a little bit of padding VRFS-1777
2014-06-10 16:09:04 -05:00
Seth Call
02b85b3676
* reorg buttons and colors
2014-06-10 15:58:46 -05:00
Seth Call
5d926ee651
* fix 'Same as Input' problem VRFS-1768; also fixed yellow links on play button
2014-06-10 15:28:29 -05:00
Seth Call
c70a76cbbe
* VRFS-1768 - updated position and color of controlbuttons
2014-06-10 15:16:10 -05:00
Seth Call
5f889d5af6
* fix tests
2014-06-10 14:20:57 -05:00
Bert Owen
de7cb2d6ab
fix tests
2014-06-11 03:06:17 +08:00
Seth Call
e5b1aa0e6a
* VRFS-1771 - add no-selection-range in a larger area
2014-06-10 13:30:21 -05:00
Seth Call
dbc17a89c6
* VRFS-1775 - yellow links on success page
2014-06-10 13:26:14 -05:00
Seth Call
cad7044488
* deal with the None placeholder not showing in successive FTUE attempts
2014-06-10 10:12:24 -05:00
Seth Call
07fcef6844
* fix case where unassigned chat doesn't relinquish it
2014-06-10 09:44:50 -05:00
Seth Call
169c9b0ab1
* VRFS-1774 - de-dup channels repeated
...
* VRFS-1774 - filter out assigned channels
* VRFS-1773 - no pre-assignment on step 3 (configure tracks)
* VRFS-1774 - make radiobuttons appear more disabled; no more prod
* VRFS-1767 - probably gone; but there is a more fundamental issue
2014-06-10 09:02:51 -05:00
Brian Smith
7c058fd3e0
fix notification test
2014-06-10 01:38:11 -04:00
Brian Smith
4c758f3185
VRFS-1749 finished RsvpSlot model tests
2014-06-10 01:08:28 -04:00
Brian Smith
0fe76dae13
VRFS-1749 finished RsvpRequest model tests
2014-06-10 00:35:38 -04:00
Seth Call
60a1618c9b
* oops left in manual show of frame-buffers for VRFS-1772
2014-06-09 23:30:02 -05:00
Seth Call
4219b15815
* VRFS-1772 - prevent wrapping of frame-buffers
2014-06-09 23:28:31 -05:00
Bert Owen
11c7f87fa1
Merge branch 'feature/create_session_flow' into feature/scheduled_sessions
2014-06-10 06:16:01 +08:00
Bert Owen
3ed14be60f
finish basic create session flow
2014-06-10 06:13:54 +08:00
Seth Call
507eba6fbc
* VRFS-1759 - found another getOperatingMode that needed to be protected
2014-06-09 16:33:34 -05:00
Seth Call
4a603cbaa2
* VRFS-1764 - fix for content falling out of bounds; VRFS-1762 - tracking audio latency now; need to still make sure this works with new create session flow when it arrives
2014-06-09 15:43:16 -05:00
Seth Call
9421ded0da
* fix add new gear click handler
2014-06-09 08:42:14 -05:00
Jonathan Kolyer
5ed3a3de81
VRFS-1664 added test as if from queue
2014-06-09 05:40:25 +00:00
Jonathan Kolyer
e547ced63d
VRFS-1664 updating tests with date mgmt
2014-06-09 05:35:39 +00:00
Jonathan Kolyer
c0287cc224
VRFS-1664 enhancing tests
2014-06-09 05:12:29 +00:00
Seth Call
9368d2f045
* fix selector in test
2014-06-08 22:32:07 -05:00
Seth Call
653b03bea1
* VRFS-1754 - new configure tracks dialog
2014-06-08 22:26:50 -05:00
Bert Owen
f333f110b8
fix type error
2014-06-09 10:43:07 +08:00
Brian Smith
c66da4d945
VRFS-1749 RsvpRequest model tests wip
2014-06-07 16:37:50 -04:00
Brian Smith
02a0ea12ac
VRFS-1749 RsvpRequest model tests wip
2014-06-07 13:19:02 -04:00
Brian Smith
a09326470e
VRFS-1749 RsvpRequest model tests wip
2014-06-07 13:01:03 -04:00
Brian Smith
1339d8448f
VRFS-1669 find session work
2014-06-06 03:07:02 -04:00
Brian Smith
cff09fd4de
Merge branch 'feature/scheduled_sessions' of bitbucket.org:jamkazam/jam-cloud into feature/scheduled_sessions
2014-06-06 03:05:14 -04:00
Brian Smith
1a93b5f1f3
VRFS-1710 added scheduled session info to hover bubble / show session hover bubble for session-related notifications
2014-06-06 03:04:52 -04:00
Jonathan Kolyer
2932d02894
VRFS-1664 added periodical test
2014-06-06 06:09:35 +00:00
Jonathan Kolyer
eee0281c37
VRFS-1665 fixed typo
2014-06-06 06:08:53 +00:00
Jonathan Kolyer
98ede13fbc
VRFS-1664 fixed typo
2014-06-06 06:08:32 +00:00
Jonathan Kolyer
18167e898d
VRFS-1665 added large batch test
2014-06-06 05:31:53 +00:00
Jonathan Kolyer
0aa98146fe
VRFS-1664 reformatting code
2014-06-06 03:56:32 +00:00
Jonathan Kolyer
743bb1e0dd
Merge branch 'feature/scheduled_sessions' of bitbucket.org:jamkazam/jam-cloud into feature/scheduled_sessions
2014-06-05 16:29:09 +00:00
Jonathan Kolyer
a657236814
VRFS-1664 fixed large batch test
2014-06-05 16:29:01 +00:00
Jonathan Kolyer
e669205c64
VRFS-1664 added looping test
2014-06-05 15:42:23 +00:00
Brian Smith
1141f2bd2e
VRFS-1693 bug fixes
2014-06-05 00:55:15 -04:00
Brian Smith
8cc14b1ede
VRFS-1693 copy canceled RSVP for slot if none were chosen
2014-06-04 23:17:45 -04:00
Seth Call
60c72f29dd
* VRFS-1753 - mostly done aside from prompt with dialog on create/find session when appropriate
2014-06-04 14:47:05 -05:00
Bert Owen
60a004a252
integrating api, (without music_notations, start scheduled information)
2014-06-05 03:19:45 +08:00
Bert Owen
6a4be359c0
fix ui
2014-06-04 23:15:12 +08:00
Brian Smith
d07e649c7b
VRFS-1693 music session scheduler
2014-06-04 01:47:28 -04:00
Seth Call
84f1e79223
* pin admin tests
2014-06-03 17:45:48 -05:00
Seth Call
49e03a967c
* pinning rspec in web to fix tests
2014-06-03 16:57:13 -05:00
Seth Call
26f5006bc9
* pinning rspec to compatible version
2014-06-03 16:47:20 -05:00
Seth Call
7fbc48f61e
* VRFS-1579 - check if getOperatingMode exists before calling it
2014-06-03 16:29:09 -05:00
Seth Call
9c19167519
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-06-03 16:20:00 -05:00
Seth Call
a94c5b325b
* VRFS-1575 - reworking loopback
2014-06-03 16:19:39 -05:00
Brian Smith
50706e7858
Merge branch 'feature/scheduled_sessions' of bitbucket.org:jamkazam/jam-cloud into feature/scheduled_sessions
2014-06-03 01:10:39 -04:00
Brian Smith
a9b67a9a6b
VRFS-1693 resque job to schedule recurring music sessions
2014-06-03 01:10:25 -04:00
Jonathan Kolyer
84ed2949f6
VRFS-736 refactoring tests
2014-06-03 04:21:00 +00:00
Jonathan Kolyer
abc1044431
VRFS-1664 added another test
2014-06-03 04:03:02 +00:00
Jonathan Kolyer
8d35ea09e8
VRFS-1664 added another test
2014-06-03 04:01:48 +00:00
Jonathan Kolyer
d36ec17436
VRFS-1664 fixed mail sending test
2014-06-03 03:25:23 +00:00
Jonathan Kolyer
1f726df320
VRFS-1665 prevent session creator from getting notified of sessions
2014-06-02 06:17:31 +00:00
Jonathan Kolyer
bb03ebffaa
Merge branch 'feature/scheduled_sessions' of bitbucket.org:jamkazam/jam-cloud into feature/scheduled_sessions
2014-06-02 06:02:09 +00:00
Jonathan Kolyer
7ea659c71f
VRFS-1665 rewrote daily email queries and adding pagination; other tweaks
2014-06-02 06:01:55 +00:00
Brian Smith
b4baba3618
Merge branch 'feature/scheduled_sessions' of bitbucket.org:jamkazam/jam-cloud into feature/scheduled_sessions
2014-06-01 22:34:45 -04:00
Brian Smith
44392af1ad
renamed scheduled_session.js to session_info.js
2014-06-01 22:34:32 -04:00
Jonathan Kolyer
2719b35dee
VRFS-1664 added paging to fetc_recipients
2014-06-02 02:31:42 +00:00
Jonathan Kolyer
e35e318884
VRFS-1664 replace tmp tbl with subquery
2014-06-02 02:11:00 +00:00
Jonathan Kolyer
9c0afd6ccd
VRFS-1664 fixed var name
2014-06-02 01:56:26 +00:00
Scott Comer
1d19bf613c
removed users isp field, use last_jam_locidispid%1000000 instead; added fields for state and country codes.
2014-06-01 16:03:32 -05:00
Bert Owen
e49c98c659
Merge branch 'feature/scheduled_sessions' into feature/create_session_flow
2014-06-02 02:57:15 +08:00
Bert Owen
cb6742d06b
Create session flow (ui completed...)
2014-06-02 02:45:17 +08:00
Anthony Davis
da4fc4bcbd
Merge remote-tracking branch 'origin/develop' into develop
2014-05-31 20:40:41 -05:00
Anthony Davis
477fe5994a
VRFS-1103 - ruby coverage is now logged during web tests
2014-05-31 20:38:39 -05:00
Scott Comer
b5503afd0d
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-05-31 18:07:30 -05:00
Scott Comer
c0d08ebe27
scores integrated into display where i could, not exactly where david wanted. this finishes vrfs-1455
2014-05-31 18:07:25 -05:00
Jonathan Kolyer
215fb1807c
VRFS-1664 fixed broken tests
2014-05-31 21:52:28 +00:00
Jonathan Kolyer
0edacbe3e2
merging with develop
2014-05-31 21:07:18 +00:00
Jonathan Kolyer
4f5adf1340
VRFS-1664 fixing query
2014-05-31 20:41:48 +00:00
Jonathan Kolyer
aa44302517
VRFS-1664 tweaking query
2014-05-31 20:34:42 +00:00
Scott Comer
73594ea3fa
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-05-31 15:22:28 -05:00
Scott Comer
afa21de689
make score info available to template and make visible on the screen
2014-05-31 15:22:21 -05:00
Jonathan Kolyer
edbd3b1c6d
VRFS-1664 new musicians email
2014-05-31 19:09:18 +00:00
Jonathan Kolyer
689e0a8609
VRFS-1664 new musicians emailer
2014-05-31 09:36:10 +00:00
Brian Smith
ae79912dab
merge develop
2014-05-31 07:41:59 -04:00
Brian Smith
5b438ffaef
Merge branch 'feature/scheduled_sessions' of bitbucket.org:jamkazam/jam-cloud into feature/scheduled_sessions
2014-05-31 07:35:07 -04:00
Brian Smith
e1e89d55e8
VRFS-1672 session settings dialog work / other bug fixes
2014-05-31 07:34:52 -04:00
Jonathan Kolyer
30037bc967
VRFS-1698 removed sendgrid email error handling
2014-05-31 09:03:18 +00:00
Jonathan Kolyer
2009b9715f
VRFS-736 removed html from title in text-based emails
2014-05-31 08:47:26 +00:00
Jonathan Kolyer
b8736ff389
VRFS-1698 changed batch sending to one-at-a-time
2014-05-31 07:44:56 +00:00
Scott Comer
2fe78d84c2
add background transparency
2014-05-30 17:28:56 -05:00
Scott Comer
77fb55525b
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-05-30 15:55:07 -05:00
Scott Comer
43fce0df1d
commented attempt at adding scoring to display; images need transparent backgrounds; template tutorial required; look in erb file for todo scott
2014-05-30 15:55:00 -05:00
Seth Call
48aaf8bff0
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-05-30 15:29:05 -05:00
Seth Call
32decb2393
* VRFS-1575 - don't resync if minimum input/outputs aren't selected. also don't attempt score on refocus if minimum input/outputs aren't selected
2014-05-30 15:28:59 -05:00
Scott Comer
275c997591
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-05-30 14:12:35 -05:00
Scott Comer
14d5ddb23f
fix the correct musician search query for scoring
2014-05-30 14:12:27 -05:00
Seth Call
ac2253c49f
* re-orging any wizard into subfolders
2014-05-30 12:35:54 -05:00
Seth Call
572c8449b9
* VRFS-1575 - implemented isNetworkError
2014-05-30 12:25:47 -05:00
Seth Call
3a5fe7e615
* invalidating network score in certain scenarios; invalidating audio profile in certain scenarios VRFS-1575
2014-05-30 12:07:27 -05:00
Scott Comer
e9b77ff5b5
attempt to try to add scoring to musicians web page; add appropriate back-end filtering for score
2014-05-30 11:34:06 -05:00
Seth Call
6b71b54ca9
* VRFS-1575 - handle case that input is unset
2014-05-30 09:50:35 -05:00
Seth Call
2037d628fc
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-05-29 22:12:32 -05:00
Seth Call
cab835910a
* only reset selected gear if it's a completely new FTUE session
2014-05-29 22:10:53 -05:00
Anthony Davis
c752fdacd7
Merge remote-tracking branch 'origin/develop' into develop
...
Conflicts:
web/app/views/shared/_ga.html.erb
2014-05-29 21:58:22 -05:00
Anthony Davis
e213aef10c
VRFS-1748 - now GA won't be loaded if User-Agent is 'monitor'
2014-05-29 21:53:44 -05:00
Seth Call
5cd947729c
* don't track user-agent of 'monitor'
2014-05-29 21:51:02 -05:00
Brian Smith
a607124e63
VRFS-1746 RSVP cancel dialog bug fixes
2014-05-29 22:19:30 -04:00
Seth Call
4919b92771
* adding backend guard to network test step
2014-05-29 21:13:50 -05:00
Brian Smith
d4a21e62f3
VRFS-1746 RSVP cancel dialog complete
2014-05-29 22:02:29 -04:00
Seth Call
133722f753
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-05-29 20:58:47 -05:00
Seth Call
7d246ef817
* fix reconnect and limit bands 3 test
2014-05-29 20:58:40 -05:00
Anthony Davis
00de83fc5c
Fixing VRFS-1701 - API requires countrycode in the value attrib
2014-05-29 20:01:02 -05:00
Seth Call
6ad607cd24
* fixing latency tester's page
2014-05-29 16:52:50 -05:00
Seth Call
5752f2d7dd
* fixing tests
2014-05-29 15:34:19 -05:00
Seth Call
7da75e94d9
* VRFS-1575
2014-05-29 14:44:37 -05:00
Seth Call
dff3fa4870
*wip
2014-05-29 14:44:37 -05:00
Seth Call
a2bf56beac
* wip
2014-05-29 14:44:37 -05:00
Seth Call
fcc7130536
* wip
2014-05-29 14:44:37 -05:00
Seth Call
e4da30f39e
* wip
2014-05-29 14:39:08 -05:00
Seth Call
05666f7927
wip
2014-05-29 14:34:18 -05:00
Seth Call
ebe1278e5e
* wip
2014-05-29 14:32:46 -05:00
Seth Call
cc3d48ed0a
* wip
2014-05-29 14:32:46 -05:00
Seth Call
df5fae1981
* wip
2014-05-29 14:32:46 -05:00
Seth Call
d39f91e186
* VRFS-1575 - step 2 of FTUE almost done
2014-05-29 14:31:01 -05:00
Seth Call
9b18849544
* working on feature ftue
2014-05-29 14:31:01 -05:00
Scott Comer
3b3776f065
get score from Search.musician_filter into json sent to client
2014-05-29 13:03:33 -05:00
Jonathan Kolyer
77b6bdf106
Merge branch 'feature/scheduled_sessions' of bitbucket.org:jamkazam/jam-cloud into feature/scheduled_sessions
2014-05-29 16:32:29 +00:00
Jonathan Kolyer
ff15da9f4e
VRFS-1665 mail formatting; bug fixing
2014-05-29 16:32:22 +00:00
Jonathan Kolyer
f90f55fb11
VRFS-1665 added mail delivery test
2014-05-29 09:15:46 +00:00
Jonathan Kolyer
f4533ebbf1
VRFS-1665 added non-pass case
2014-05-29 07:41:28 +00:00
Jonathan Kolyer
243e06533b
VRFS-1665 scheduled session impl
2014-05-29 07:19:55 +00:00
Brian Smith
f1229f6842
VRFS-1746 RSVP cancel dialog work
2014-05-29 02:33:37 -04:00
Brian Smith
a0696ce610
more test fixes
2014-05-29 02:02:19 -04:00
Brian Smith
e143e351e6
more test fixes
2014-05-29 02:00:53 -04:00
Brian Smith
b640c31301
fix test
2014-05-29 01:28:40 -04:00
Brian Smith
69c92e1f76
fix test
2014-05-29 00:45:31 -04:00
Jonathan Kolyer
c9b37c6124
merge
2014-05-29 04:40:31 +00:00
Brian Smith
7a4ad83cef
merge develop
2014-05-29 00:20:09 -04:00
Brian Smith
4d63dad502
VRFS-1671 RSVP submit dialog
2014-05-28 23:43:57 -04:00
Scott Comer
ebfe72e11d
fix tests for scoring musician search
2014-05-28 21:19:50 -05:00
Jonathan Kolyer
2caee7a15b
merging with develop
2014-05-28 07:22:53 +00:00
Brian Smith
fea728923f
VRFS-1671 RSVP submit dialog work
2014-05-28 01:14:14 -04:00
Brian Smith
c7fc7bdc22
VRFS-1668 clean up notifications / fix comment notification for session info page
2014-05-27 22:35:26 -04:00
Brian Smith
860704f874
Merge branch 'feature/scheduled_sessions' of bitbucket.org:jamkazam/jam-cloud into feature/scheduled_sessions
2014-05-27 21:31:42 -04:00
Brian Smith
6dc8192516
session info permissioning work
2014-05-27 21:31:39 -04:00
Scott Comer
f51a152f97
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-05-27 11:52:26 -05:00
Scott Comer
6f57265a0d
finish up mods for geocoding based on scores
2014-05-27 11:52:18 -05:00
Seth Call
93ddd02bd1
* using extra_js block to initialize page code
2014-05-27 11:00:08 -05:00
Scott Comer
3886c0a413
tweak resetdb.sh
2014-05-27 09:31:50 -05:00
Brian Smith
989a2a2b3a
VRFS-1670 session info page work
2014-05-27 00:32:14 -04:00
Brian Smith
f31248815d
VRFS-1670 session info page work
2014-05-26 23:52:59 -04:00
Scott Comer
3bdf12c981
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-05-26 14:16:09 -05:00
Scott Comer
7446898071
added tests for new_musicians
2014-05-26 14:16:01 -05:00
Brian Smith
304008d693
VRFS-1670 more session info work
2014-05-26 14:00:34 -04:00
Anthony Davis
3736b93968
VRFS-1021 - tests were implicitly order-dependent, also fixing to use new ActiveMusicSession model
2014-05-26 12:20:01 -05:00
Brian Smith
3078236ef6
add open_rsvps flag to music_sessions table
2014-05-26 12:09:18 -04:00
Jonathan Kolyer
c8b961a002
merging
2014-05-26 15:50:47 +00:00
Bert Owen
7720dd2eb8
fix tests
2014-05-26 19:52:42 +08:00
Bert Owen
7fc2575588
fix routes
2014-05-26 14:25:53 +08:00
Bert Owen
972af58888
fix tests
2014-05-26 13:49:54 +08:00
Brian Smith
cc4686ab79
VRFS-1670 session info page work
2014-05-26 01:35:57 -04:00
Brian Smith
2cef0872d9
Merge branch 'feature/sched_sessions_rsvps' into feature/scheduled_sessions
2014-05-25 18:26:54 -04:00
Bert Owen
bc0e3ba0eb
VRFS-1681 cleanup unused notation files
2014-05-26 01:30:10 +08:00
Brian Smith
16b240fdc8
merge scheduled_sessions branch
2014-05-24 04:01:40 -04:00
Brian Smith
a06ba7197e
VRFS-1670 session info page work
2014-05-24 03:58:47 -04:00
Bert Owen
fbeddf1735
VRFS-1682, VRFS-1679 : upload music notation, download music notation
2014-05-24 02:58:59 +08:00
Scott Comer
918d65cd92
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-05-23 10:12:30 -05:00
Jonathan Kolyer
219135205a
develop merge
2014-05-23 14:33:11 +00:00
Jonathan Kolyer
50d1696ad3
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-05-23 04:54:57 +00:00
Jonathan Kolyer
5f5bcaf04c
VRFS-736 updated welcome message; fixed queue loading issue by updating jam_ruby.rb
2014-05-23 04:54:46 +00:00
Scott Comer
81495315f7
simplify Search.new_musicians api
2014-05-22 21:42:07 -05:00
Scott Comer
bf06df36a3
added better regions database; added appropriate indexing for regions table
2014-05-22 15:17:00 -05:00
Scott Comer
5527a6032c
geolite region/state codes per country
2014-05-22 08:14:45 -05:00
Bert Owen
5685e2f0e8
VRFS-1678 added music session update feature
2014-05-22 17:49:35 +08:00
Bert Owen
00d06fe6f2
* merge
2014-05-22 16:07:17 +08:00
Bert Owen
57f1fab935
VRFS-1677 fixed
2014-05-22 16:02:48 +08:00
Brian Smith
b4f7035fed
Merge branch 'feature/sched_sessions_rsvps' into feature/scheduled_sessions
2014-05-22 00:42:50 -04:00
Brian Smith
03eb125fa8
Merge branch 'feature/scheduled_sessions' of bitbucket.org:jamkazam/jam-cloud into feature/scheduled_sessions
2014-05-22 00:42:33 -04:00
Brian Smith
0e419a7881
VRFS-1692 cancel RSVP complete
2014-05-22 00:40:17 -04:00
Brian Smith
176e862338
VRFS-1691 update RSVP request complete
2014-05-21 23:36:34 -04:00
Scott Comer
eea6d2c41c
fix spelling problem
2014-05-21 21:38:02 -05:00
Scott Comer
94421c03c0
merge conflict with db/manifest resolved
2014-05-21 21:33:38 -05:00
Scott Comer
09231c5fe6
fix for vrfs-1476 - scoring should store the detail data
2014-05-21 21:30:43 -05:00
Jonathan Kolyer
0b3b4c5dfa
merging
2014-05-21 22:46:57 +00:00
Jonathan Kolyer
3891cea86d
VRFS-736 updated for user_progress_emailer
2014-05-21 22:45:06 +00:00
Jonathan Kolyer
bbd0c27d23
VRFS-736 cleanup of sess_notrecord text; added progress mailer queue
2014-05-21 22:41:17 +00:00
Jonathan Kolyer
836baee962
merging with develop
2014-05-21 21:55:26 +00:00
Anthony Davis
44c895b704
Merge remote-tracking branch 'origin/develop' into develop
...
Conflicts:
monitor/spec/production_spec.rb
2014-05-21 16:52:44 -05:00
Anthony Davis
1ce510bb18
VRFS-1705 - 'monitor' subproj initial commit
2014-05-21 16:52:11 -05:00
Anthony Davis
dc9b17fa46
production_spec.rb moved to 'monitor' subproject
2014-05-21 21:51:28 +00:00
Brian Smith
25f325d720
VRFS-1690 create RSVP request working
2014-05-21 17:47:11 -04:00
Bert Owen
a1f288fe4d
VRFS-1676 fixed
2014-05-22 03:11:50 +08:00
Scott Comer
4a76e0c983
get_work has a larger radius and excludes the current connections address
2014-05-21 14:05:45 -05:00
Bert Owen
1904c8f474
VRFS-1675 completed
2014-05-22 00:24:40 +08:00
Jonathan Kolyer
3fd7805b1d
VRFS-736 removed pending send email tests
2014-05-21 07:30:20 +00:00
Jonathan Kolyer
b235817a0c
VRFS-736 undo accidental commit
2014-05-21 07:19:02 +00:00
Jonathan Kolyer
6c0807ac5a
VRFS-736 adding email content for progression steps
2014-05-21 07:17:42 +00:00
Jonathan Kolyer
9ad0badff1
VRFS-736 filling out remaining subtypes
2014-05-21 06:20:15 +00:00
Jonathan Kolyer
b998b87a01
VRFS-736 refactoring
2014-05-21 06:06:16 +00:00
Brian Smith
7f5940ac01
VRFS-1739 API for RSVP slots
2014-05-21 01:36:32 -04:00
Jonathan Kolyer
70f34120b3
VRFS-736 refactoring
2014-05-21 05:24:52 +00:00
Brian Smith
f793b14879
VRFS-1738 more RSVP API work
2014-05-21 00:57:32 -04:00
Scott Comer
867ec7c53f
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-05-20 10:07:05 -05:00
Scott Comer
3e0667e24d
added Scores.score_conns to help with making scores for tests; comments for usage of musician_filter; optional score_dt for Score.createx; betterify query for connection in scoring api
2014-05-20 09:46:45 -05:00
Bert Owen
22f4d0ffc5
Merge branch 'feature/scheduled_sessions' of https://bitbucket.org/jamkazam/jam-cloud into feature/scheduled_sessions
2014-05-20 21:26:55 +08:00
Bert Owen
cebbd869cb
VRFS-1675 add join session feature
2014-05-20 21:26:32 +08:00
Bert Owen
b4908ce924
* fix music session api test
2014-05-20 21:23:34 +08:00
Brian Smith
96f62b1364
VRFS-1690 VRFS-1691 VRFS-1692 RSVP API work
2014-05-20 02:45:00 -04:00
Jonathan Kolyer
f53ca0010d
VRFS-736 looping through results
2014-05-20 05:58:06 +00:00
Jonathan Kolyer
cd801d7852
VRFS-736 fixing progression email algorithm and tests
2014-05-20 05:21:11 +00:00
Seth Call
d11261c5c6
* VRFS-1730 - websocket on web layout
2014-05-20 00:33:43 -04:00
Brian Smith
d665a09080
scheduled session rsvp wip
2014-05-20 00:31:26 -04:00
Brian Smith
ca53ee0ead
update data model / fix tests
2014-05-19 23:34:56 -04:00
Seth Call
a0fbd433b3
* brought back two pending test
2014-05-19 18:49:02 -05:00
Seth Call
1f86b809ff
* VRFS-1730 - websocket on web layout
2014-05-19 16:57:08 -05:00
Bert Owen
a379689418
* remove client_id check
2014-05-19 23:52:06 +08:00
Bert Owen
97843035ba
Merge branch 'feature/scheduled_sessions' of https://bitbucket.org/jamkazam/jam-cloud into feature/scheduled_sessions
2014-05-19 23:36:23 +08:00
Bert Owen
cdc9d121cb
VRFS-1674 Create Session API
2014-05-19 23:35:38 +08:00
Jonathan Kolyer
e44ccc7653
VRFS-736 client_notdl mailer
2014-05-19 15:12:59 +00:00
Jonathan Kolyer
4ddd699302
VRFS-736 filling out progression steps
2014-05-19 04:35:25 +00:00
Jonathan Kolyer
30f2387658
VRFS-736
2014-05-19 03:23:14 +00:00
Brian Smith
dce007a13d
VRFS-1670 VRFS-1671 VRFS-1678 RSVP work in progres
2014-05-18 22:31:25 -04:00
Jonathan Kolyer
f6196bb2c8
VRFS-736 consolidating query
2014-05-19 00:43:37 +00:00
Brian Smith
95100a1b49
VRFS-1668 added some edge case tests for new notifications (still need sunny day tests)
2014-05-18 14:59:57 -04:00
Jonathan Kolyer
1271b74bc4
VRFS-736 passing tests
2014-05-18 06:14:19 +00:00
Jonathan Kolyer
fbb86dd9e7
VRFS-736 tests passing and what-not
2014-05-18 05:24:07 +00:00
Brian Smith
0b2acda11e
VRFS-1668 email notifications for scheduled sessions
2014-05-18 01:22:20 -04:00
Brian Smith
8fc30baf42
VRFS-1668 more notification work
2014-05-18 00:09:21 -04:00
Scott Comer
a1b8d78e6a
fix a problem with band location vs. user location management
2014-05-17 22:09:31 -05:00
Jonathan Kolyer
6e7562ffc8
VRFS-736 progression emails first pass
2014-05-18 00:12:01 +00:00
Scott Comer
9eaa34b07f
disable lat lng and distance in queries for users
2014-05-17 14:55:26 -05:00
Jonathan Kolyer
72110cb057
Merge branch 'develop' into vrfs1664
2014-05-17 17:43:35 +00:00
Jonathan Kolyer
b393cf35c4
VRFS-1664 STI columns for email batches
2014-05-17 17:42:47 +00:00
Jonathan Kolyer
c51d7de5f4
VRFS-1664 some tweaks
2014-05-17 17:38:42 +00:00
Jonathan Kolyer
e330fb96c7
VRFS-1664 some tweaks
2014-05-17 17:38:22 +00:00
Jonathan Kolyer
7428a2f26b
VRFS-1664 new musician weekly email
2014-05-16 07:58:06 +00:00
Bert Owen
091998c200
* fix music_session test
2014-05-16 01:22:21 +08:00
Bert Owen
027fd61606
* added recurring_mode to music_session for recurring sessions
2014-05-16 00:19:44 +08:00
Bert Owen
24117c1b67
VRFS-1718 added MusicNotation model, migration
2014-05-15 23:49:06 +08:00
Brian Smith
baee1b7506
VRFS-1668 merge with test fixes for notification changes
2014-05-15 01:06:48 -04:00
Seth Call
a19d6dcc07
* adding RsvpRequest and RsvpSlot models
2014-05-14 15:48:42 -05:00
Brian Smith
27517c673f
VRFS-1668 more test fixes
2014-05-14 01:51:18 -04:00
Brian Smith
212ef168c9
VRFS-1668 fixing tests related to notification changes
2014-05-14 01:16:33 -04:00
Scott Comer
e0df9c7721
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-05-13 14:57:07 -05:00
Scott Comer
00e177311d
tests for last jam location setting and some cleanup of user manager and user location spec
2014-05-13 14:56:58 -05:00
Seth Call
ac2ee3210f
* VRFS-1654 - fixing tests
2014-05-13 14:48:58 -05:00
Scott Comer
43d1c9cbbd
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-05-13 09:12:43 -07:00
Seth Call
9ee27a5127
Revert "VRFS-1668 initial work on new notifications / refactor to make notification buttons more dynamic"
...
This reverts commit 2302c89154 .
2014-05-13 08:21:32 -05:00
Anthony Davis
b919f55280
fixing failed bands tests
2014-05-13 07:40:04 -05:00
Brian Smith
2302c89154
VRFS-1668 initial work on new notifications / refactor to make notification buttons more dynamic
2014-05-13 01:22:23 -04:00
Anthony Davis
fc35f0ad9d
Merge remote-tracking branch 'origin/develop' into develop
2014-05-12 23:17:18 -05:00
Anthony Davis
f88808aa10
adding/fixing bands tests
2014-05-12 23:16:32 -05:00
Scott Comer
9deb7fcc74
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-05-12 21:13:33 -07:00
Scott Comer
79136d2127
correct weirdness in how user location is set
2014-05-12 21:13:16 -07:00
Jonathan Kolyer
5327be79eb
VRFS-1664 changed batch to 500
2014-05-11 09:43:40 +00:00
Jonathan Kolyer
e199ee861f
Merge branch 'vrfs736' into develop
2014-05-11 09:03:48 +00:00
Jonathan Kolyer
6ccbddfe72
VRFS-736 changd GA data val for email
2014-05-11 07:42:14 +00:00
Jonathan Kolyer
738b848d28
VRFS-736 positioning share links on right
2014-05-11 07:18:02 +00:00
Jonathan Kolyer
91ca1af98b
VRFS-736 like us GA support
2014-05-11 06:42:20 +00:00
Jonathan Kolyer
833d9c9c38
VRFS-736 fixed broken div
2014-05-11 01:49:17 +00:00
Jonathan Kolyer
9090a71b41
VRFS-736 moving sharing links elsewhere
2014-05-11 01:45:30 +00:00
Jonathan Kolyer
cf7522f2e4
VRFS-736 images using relative path
2014-05-11 00:22:12 +00:00
Jonathan Kolyer
9f9763b653
Merge branch 'develop' into vrfs736
2014-05-11 00:18:14 +00:00
Anthony Davis
9929e1eca1
VRFS-1708 / VRFS-1654 - marking these tests as pending
2014-05-11 15:59:37 -05:00
Jonathan Kolyer
1618a37d6b
Merge branch 'develop' into vrfs736
2014-05-11 00:17:48 +00:00
Jonathan Kolyer
f83f333dd1
VRFS-736 like us features
2014-05-11 00:17:44 +00:00
Anthony Davis
bf18a936c8
VRFS-1708 - fix failing feed tests, remove interdependency
2014-05-10 14:16:17 -05:00
Anthony Davis
5d5dc51434
Slight fix to chat text in sidebar
2014-05-10 14:08:39 -05:00
Jonathan Kolyer
589b0dad34
VRFS-1706 fixed sporadic display of session rating
2014-05-10 05:59:19 +00:00
Seth Call
e3b17fb439
* .touch on the history entries
2014-05-09 14:36:03 -05:00
Seth Call
dc6dec76cf
* move registerChatMessage so that it always gets a chance to fire
2014-05-09 14:27:18 -05:00
Bert Owen
2c58ded35f
VRFS-1700 fixed
2014-05-10 00:37:51 +08:00
Bert Owen
af893f4b24
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-05-09 23:51:27 +08:00
Bert Owen
6ecb7abcad
VRFS-1654 issue fixed without test
2014-05-09 23:50:50 +08:00
Scott Comer
ca27a6ab97
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
...
Conflicts:
db/manifest
2014-05-08 19:47:17 -05:00
Scott Comer
3f688a8392
update user home base (last_jam_blah) fields upon registation and joining a music session as a musician
2014-05-08 19:44:52 -05:00
Anthony Davis
9dbb42f3de
Merge remote-tracking branch 'origin/develop' into develop
2014-05-08 18:01:17 -05:00
Anthony Davis
ac8a9a5af6
VRFS-1705 - fix test-www by a slight decouple
2014-05-08 18:00:49 -05:00
developer
8f06168f1c
VRFS-1654 - configure feed layout
2014-05-08 23:18:57 +08:00
Seth Call
9948917f95
* fix promotional data
2014-05-08 08:25:30 -05:00
Seth Call
d4a0d8d820
* force jenkins build
2014-05-08 08:11:39 -05:00
Seth Call
f6b31a675f
Merge branch 'develop' into feature/scheduled_sessions
2014-05-08 08:04:45 -05:00
Seth Call
4e9c2377ba
* fix broken pages in admin
2014-05-08 08:04:06 -05:00
Seth Call
f158863347
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-05-07 18:50:12 -05:00
Seth Call
42de732065
* whitespace change to readme to force develop branch build in jenkins
2014-05-07 18:48:45 -05:00
Anthony Davis
f496ba6349
VRFS-1651 - fixed
2014-05-07 18:29:30 -05:00
Anthony Davis
802fcf658d
VRFS-1651 - debug
2014-05-07 18:21:48 -05:00
Anthony Davis
268403d5d9
VRFS-1651 - debug
2014-05-07 18:19:47 -05:00
Seth Call
1cb9699096
* VRFS-1688 - beefed up history_show.rabl
2014-05-07 16:38:28 -05:00
Seth Call
88e13aa3fc
* attempt to run problem test now that fix to nindex has been made
2014-05-07 15:14:42 -05:00
Seth Call
244f79eefb
* merging develop into feature/scheduled_sessions
2014-05-07 15:04:41 -05:00
Seth Call
57e8860dcb
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-05-07 14:22:56 -05:00
Seth Call
6817d2f458
* fixing another bug in the SQL of MusicSession.index and MusicSession.index (bad inner join with music_session and active_music_session)
2014-05-07 14:16:35 -05:00
Seth Call
23aec0d1a5
* uncommenting the index tests; fixed a bug too
2014-05-07 10:53:39 -05:00
Anthony Davis
4d4d04b343
VRFS-1651 - test-www should not use build_number
2014-05-07 08:30:41 -05:00
Seth Call
97269133ba
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-05-07 08:03:43 -05:00
Anthony Davis
1fa9ffcc3f
VRFS-1651 - really no jam_* gems in test-www
2014-05-07 07:40:22 -05:00
Anthony Davis
fb1d634875
VRFS-1651 - jam_ gem version does not matter for test_www
2014-05-07 07:33:33 -05:00
Anthony Davis
6528c5f838
VRFS-1651 - our gems aren't even needed for this
2014-05-07 07:25:48 -05:00
Seth Call
5f1ea4c754
* merging manifest
2014-05-07 05:17:17 -05:00
Brian Smith
c549128c90
VRFS-1562 make musician/band avatar and name clickable in hover bubbles
2014-05-07 00:26:38 -04:00
Brian Smith
9a5bd6887e
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-05-07 00:17:01 -04:00
Brian Smith
58b7f27387
VRFS-1562 make musician/band avatar and name clickable in hover bubbles
2014-05-07 00:16:20 -04:00
Anthony Davis
a13e99cb19
VRFS-1651 - revert
2014-05-06 23:07:45 -05:00
Anthony Davis
9442256b97
VRFS-1651 - reverting Gemfile, adding check for test-www project
2014-05-06 23:05:29 -05:00
Anthony Davis
74d7d0b587
VRFS-1651 - decoupling jam_ gems from ENV
2014-05-06 22:57:32 -05:00
Anthony Davis
26e4a2b72d
Merge remote-tracking branch 'origin/develop' into develop
2014-05-06 22:35:27 -05:00
Anthony Davis
673132c540
VRFS-1651 - periodic real test of www
2014-05-06 22:35:00 -05:00
Seth Call
d72cdfda14
* pending for now
2014-05-06 22:04:37 -05:00
Seth Call
332aee8667
* adding verification that the update settings dialog is dismissed
2014-05-06 21:48:02 -05:00
Jonathan Kolyer
ebe9aa1047
VRFS-1577 VRFS-736
2014-05-07 01:33:27 +00:00
Seth Call
c31c13b07e
* adding chat_messages constraint for user_id
2014-05-06 20:04:53 -05:00
Scott Comer
e6ea200b19
useful command to drop all jam db and recreate jam db.
2014-05-06 19:48:31 -05:00
Seth Call
9700fff691
* fixing some SQL in conn manager for querying active_music_sessions
2014-05-06 18:02:00 -05:00
Seth Call
7dd1e6c464
* renaming of tables in
2014-05-06 17:50:41 -05:00
Seth Call
732fd66f0e
* all tests pass; but need to now rename music session tables to match class names...
2014-05-06 16:17:26 -05:00
Jonathan Kolyer
7d0b9bff6a
replaced find with find_by_id
2014-05-06 08:35:49 -05:00
Seth Call
23082beb2f
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-05-06 08:34:54 -05:00
Seth Call
f3d39a351d
* wip
2014-05-06 08:34:38 -05:00
Jonathan Kolyer
1c6b5b78bb
VRFS-1577 fixing specs
2014-05-06 07:20:14 +00:00
Jonathan Kolyer
5f74bce061
VRFS-1577
2014-05-06 06:41:10 +00:00
Jonathan Kolyer
294bb22cdd
Merge branch 'develop' into vrfs1577
2014-05-06 05:21:31 +00:00
Jonathan Kolyer
0119001d3d
VRFS-1698 testing
2014-05-06 05:21:09 +00:00
Jonathan Kolyer
a519191394
replaced find with find_by_id
2014-05-06 02:55:32 +00:00
Seth Call
eab5e5b72b
* merging in master with heartbeat fixes into develop after release
2014-05-05 10:50:47 -05:00
Seth Call
acd1efd877
* wip
2014-05-05 10:06:27 -05:00
Seth Call
15936855e9
* fixing yet another bug associated with websockets and reconnect
2014-05-03 08:50:06 -05:00
Seth Call
30b3098244
* don't null user on context; it should always be non-null
2014-05-02 19:07:10 -05:00
Scott Comer
6be0791adb
merge
2014-05-02 15:20:21 -05:00
Scott Comer
5cc515d615
a small cleanup of connection fields and fix broken tests
2014-05-02 13:44:29 -05:00
Seth Call
7515b1c3bd
* moving new migration to end of manifest
2014-05-02 11:36:51 -05:00
Bert Owen
7d3ac6fc54
VRFS-1503 implement session chat feature
2014-05-03 00:33:27 +08:00
Bert Owen
bf04fca205
VRFS-1503 implement session chat feature
2014-05-03 00:30:56 +08:00
Seth Call
14d6904162
* fixing another bug where .reconnect is not supplied the correct arguments
2014-05-02 07:39:09 -05:00
Seth Call
53850a716b
* fixing bad ref to user_id in client cleanup code
2014-05-02 07:33:41 -05:00
Seth Call
65fb0511c6
* merging manually database migrations from the master branch now, because I need to preserve db lineage with www as a priority
2014-05-01 15:04:23 -05:00
Seth Call
c0ce26c602
* fixing tests for: * VRFS-1663 (diagnostics), VRFS-1657 (configurable timer for heartbeats), VRFS-1653 (websocket connection cleanup)
2014-05-01 14:09:33 -05:00
Jonathan Kolyer
affb1cd875
VRFS-1577
2014-05-01 06:35:16 +00:00
Scott Comer
a11dd664ce
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-04-30 22:01:57 -05:00
Scott Comer
fe59865bd9
change join_the_session api to add tracks; move the impl to connection; a few bug fixes
2014-04-30 22:01:43 -05:00
Jonathan Kolyer
b1be072c6c
VRFS-1577 VRFS-736
2014-05-01 01:48:57 +00:00
Jonathan Kolyer
5e27268fa4
VRFS-1577 VRFS-736 added should_rate_session?; fixed bug in add_rating
2014-05-01 01:46:57 +00:00
Jonathan Kolyer
2cbfae2215
VRFS-1577 VRFS-736
2014-04-30 20:49:32 +00:00
Seth Call
ad266e5b80
* VRFS-1663 (diagnostics), VRFS-1657 (configurable timer for heartbeats), VRFS-1653 (websocket connection cleanup)
2014-04-30 15:29:10 -05:00
Jonathan Kolyer
968dff2829
VRFS-1577 VRFS-736
2014-04-30 16:44:37 +00:00
Jonathan Kolyer
1af868dd60
VRFS-1577 moved session_ratings.sql to bottom
2014-04-30 14:23:26 +00:00
Jonathan Kolyer
2ee96c49ec
merging develop
2014-04-30 14:21:23 +00:00
Jonathan Kolyer
dddc0311c0
VRFS-1577 VRFS-736 session ratings
2014-04-30 14:07:23 +00:00
Seth Call
6463512420
* a fix for race condition that can hang eventmachine startup
2014-04-30 03:03:37 +00:00
Seth Call
9820562892
* more websocket/heartbeat fixes
2014-04-30 03:01:28 +00:00
Seth Call
e3e9cb5830
* keeping master in line with development, for dataabse
2014-04-29 16:31:36 +00:00
Seth Call
d472c2b78f
* keeping master manifest is lock with develop
2014-04-29 16:29:06 +00:00
Seth Call
3e2f39cc85
* VRFS-1653 - don't bother with cleanup in onerror, and make startup of EventMachine better (VRFS-1659)
2014-04-29 16:27:50 +00:00
Seth Call
ece5ee80f8
* debugging websocket-gateway problems
2014-04-29 14:22:31 +00:00
Seth Call
264d65d98b
* merged in more websocket fixes
2014-04-29 14:22:23 +00:00
Seth Call
8262725aae
* merging in some gateway fixes
2014-04-29 14:19:42 +00:00
Seth Call
00a6139cd1
* merged
2014-04-29 14:04:26 +00:00
Brian Smith
c0834c92c7
Merge branch 'feature/widget_fixes_1558' into develop
2014-04-29 03:37:01 -04:00
Brian Smith
4b98350f48
remove debug logs
2014-04-29 03:36:09 -04:00
Brian Smith
8b43e63800
VRFS-1558 added tests
2014-04-29 03:33:37 -04:00
Scott Comer
e82ae132bd
fix method for adding connection to music session
2014-04-28 22:38:30 -05:00
Brian Smith
8eedd63d7f
Merge branch 'develop' into feature/widget_fixes_1558
2014-04-28 23:22:08 -04:00
Brian Smith
4e188d74b7
VRFS-1562 make avatars clickable links (this commit addresses Feed and comment dialog only)
2014-04-27 20:28:25 -04:00
Brian Smith
2b7ef1df55
VRFS-1350 hover bubble style improvements
2014-04-27 19:00:18 -04:00
Brian Smith
15e8ddb706
VRFS-1558 comment dialog work
2014-04-27 10:06:01 -04:00
Brian Smith
9b810310f9
VRFS-1558 implement comment dialog
2014-04-27 04:09:55 -04:00
Brian Smith
37c23d4ee2
VRFS-1558 wire up share button dialog / hide new share icon if session has ended
2014-04-26 23:59:38 -04:00
Brian Smith
7e2d37bac5
VRFS-1555 VRFS-1556 do not show private sessions and recordings
2014-04-26 16:31:51 -04:00
Brian Smith
c06458550c
VRFS-1436 allow unauthenticated uses to share recordings and sessions from landing pages
2014-04-26 14:21:17 -04:00
Brian Smith
ce80b1a09b
VRFS-1558 convert SESSION and RECORDING text into clickable links
2014-04-25 02:11:46 -04:00
Brian Smith
23137ec423
VRFS-1558 widget enhancement work
2014-04-25 01:56:24 -04:00
Seth Call
26dc80436c
* merging build script
2014-04-24 18:07:52 +00:00
Seth Call
26a9f9a162
* commenting 'Measurement Protocol' into related classes
2014-04-24 02:27:31 +00:00
Seth Call
2496c051a3
* doubting approach of using sessionModel as trigger handler; changing to document
2014-04-23 22:13:37 +00:00
Seth Call
fb662e82be
* sessionModel to send out events on start/stop
2014-04-23 22:03:00 +00:00
Seth Call
f9e035e621
* adding db 1/0 to test mode
2014-04-23 21:52:35 +00:00
Seth Call
bc006b8c71
* adding some error logs for recording missing scenarios (VRFS-1643), and merging email redirect problem manually
2014-04-23 19:48:40 +00:00
Seth Call
29dfba8276
* fix startup of eventmachine when in unicorn/production mode (fixes or could fix: VRFS-1636 VRFS-1637 VRFS-1642 VRFS-1643
2014-04-23 15:08:19 +00:00
Bert Owen
3921324b32
VRFS-1503 added protocol buffer, chat message model & controller, rest api
2014-04-23 14:34:59 +02:00
Bert Owen
ddf3c9cc5f
VRFS-1503 added protocol buffer, chat message model & controller, rest api
2014-04-23 14:27:58 +02:00
Bert Owen
07e141cc8f
VRFS-1503 added protocol buffer, chat message model & controller, rest api
2014-04-23 14:27:49 +02:00
Jonathan Kolyer
ed09892284
merging develop and vrfs1576
2014-04-23 07:50:50 +00:00
Jonathan Kolyer
55b149827a
VRFS-1576 report layout
2014-04-23 07:43:35 +00:00
Jonathan Kolyer
a7d83064df
VRFS-1576 fixing redirect paths to use active_admin_template
2014-04-23 06:39:49 +00:00
Jonathan Kolyer
7b2d124b33
VRFS-1576 affiliate report view integration
2014-04-23 06:38:49 +00:00
Jonathan Kolyer
22566f1b29
VRFS-1576 added block to referrals_by_date
2014-04-23 06:34:21 +00:00
Brian Smith
5fa2319daa
VRFS-1558 make play/comment/like icons clickable in feed and add share icon
2014-04-23 02:07:46 -04:00
Brian Smith
7180516e75
fix formatting issue in feed where time was indented too far
2014-04-23 02:00:55 -04:00
Jonathan Kolyer
c66f5879cf
VRFS-1576 fixed referrals_by_date to support pagination
2014-04-23 02:43:13 +00:00
Seth Call
5b92445021
* release branch pushes from jenkins
2014-04-22 17:59:42 +00:00
Seth Call
5695338266
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-04-22 17:53:49 +00:00
Seth Call
30ca8d7c5c
* wip still on new ftue. also push release branches to repository VRFS-1639
2014-04-22 17:53:41 +00:00
Jonathan Kolyer
b232344336
VRFS-1576 added referrals_by_date and associated test
2014-04-22 07:12:05 +00:00
Bert Owen
b95e1a7f1b
fix band setup view for band spec
2014-04-22 07:30:53 +02:00
Jonathan Kolyer
af63b03d6a
VRFS-1576 case insensitive codes
2014-04-22 02:14:22 +00:00
Jonathan Kolyer
6ee83f8dcc
VRFS-1576 error handling; referral page; new admin menu
2014-04-22 01:55:40 +00:00
Bert Owen
15064ad6c0
VRFS-1567 fix default sender, add new migration for email_batches table
2014-04-21 10:39:08 -07:00
Bert Owen
4cfc1b878a
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-04-21 17:18:11 +02:00
Bert Owen
7893affafb
VRFS-1592 add custom message in app dialog, fix test
2014-04-21 17:17:40 +02:00
Bert Owen
8563c82802
VRFS-1602 remove web/db/schema.db file
2014-04-21 10:05:34 +02:00
Bert Owen
5d9d87bc56
VRFS-1592 show app dialog, without customization.
2014-04-21 10:04:37 +02:00
Jonathan Kolyer
c81e581786
Merge branch 'develop' into vrfs1576
2014-04-21 03:55:43 +00:00
Jonathan Kolyer
62dbeaa818
VRFS-1576 added validation and tests
2014-04-20 23:20:27 +00:00
Jonathan Kolyer
245727806d
VRFS-1576 affiliate_partner model
2014-04-20 22:55:40 +00:00
Jonathan Kolyer
937efed3e5
VRFS-1576 affiliate_partner model
2014-04-20 22:54:49 +00:00
Anthony Davis
f85f303da8
VRFS-1331 - JamKazam instead of Jamkazam
2014-04-20 16:43:58 -05:00
Bert Owen
fc1fa1412f
VRFS-1592 fixed
2014-04-20 20:16:37 +02:00
Bert Owen
404670c9a5
VRFS-1609 fixed
2014-04-19 12:52:54 -07:00
Bert Owen
6e5848fe60
VRFS-1602 Writing tests.
2014-04-19 12:24:30 -07:00
Bert Owen
bd0df88e24
link musician/band profile on feed page
2014-04-18 19:14:11 -07:00
Seth Call
0a811a147c
* adding bert as a dev user
2014-04-16 17:13:55 +00:00
Seth Call
585385351d
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-04-16 17:11:39 +00:00
Seth Call
d1267dff53
* wip on new ftue
2014-04-16 17:11:30 +00:00
Anthony Davis
addc1e0475
VRFS-905 and also fix failed test
2014-04-15 22:09:16 -05:00
Anthony Davis
ca78165cf0
Merge remote-tracking branch 'origin/develop' into develop
2014-04-15 21:03:51 -05:00
Anthony Davis
e3b57da087
VRFS-1616 fixed javascript c&p error
2014-04-15 21:03:39 -05:00
Seth Call
ac1b5d2e42
* fix for timecop
2014-04-15 17:02:51 +00:00
Seth Call
1d6741714d
* resque_spec path removed
2014-04-15 15:17:44 +00:00
Seth Call
21a101cc56
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-04-15 15:02:57 +00:00
Seth Call
87f0eaa07b
* VRFS-1612 - fix for invitations showing up when they shouldn't. also new ftue wip progres
2014-04-15 15:02:45 +00:00
Anthony Davis
7a5f5ef93c
Merge remote-tracking branch 'origin/develop' into develop
2014-04-14 15:52:52 -05:00
Anthony Davis
08951258a8
VRFS-905 - adding bands integration tests
2014-04-14 15:52:26 -05:00
Jonathan Kolyer
bf1e315b48
Merge branch 'develop' into vrfs925
2014-04-14 10:59:58 +00:00
Brian Smith
e01409a0fb
VRFS-1530 added missing semicolon (not sure if this will fix issue or not - unable to reproduce)
2014-04-15 00:48:48 -04:00
Brian Smith
e5a6f01198
VRFS-1529 hover bubbles should render above dialogs
2014-04-15 00:14:02 -04:00
Jonathan Kolyer
9ddbc6ba5c
VRFS-925 finishing up tests
2014-04-14 10:57:21 +00:00
Seth Call
83038cf315
* tweak hover code
2014-04-11 14:45:54 +00:00
Seth Call
5e62890003
* more debugs in failing build server tests
2014-04-11 02:58:31 +00:00
Seth Call
7c16c5f915
* adding more puts, and waiting longer for tests to start
2014-04-11 02:29:59 +00:00
Seth Call
4e8af1cf32
* adding build server debug statements
2014-04-11 01:56:12 +00:00
Seth Call
e983e3d186
* ok, last time I remove stuff from maintanance page. probably
2014-04-10 19:40:46 +00:00
Seth Call
d7e9bb9f18
* removign more dirt from maintanence page
2014-04-10 19:40:14 +00:00
Seth Call
218d2ed454
* removing facebook generated stuff at bottom of maintanance page
2014-04-10 19:39:17 +00:00
Seth Call
b0de20b916
* fixing landing tests
2014-04-10 18:56:21 +00:00
Seth Call
916f93797e
* VRFS-1595 fix typo in maintenance
2014-04-10 17:20:36 +00:00
Seth Call
5076fd103d
* VRFS-1595 completed (maintanence page)
2014-04-10 17:18:08 +00:00
Seth Call
d9fcf77be7
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-04-10 15:26:34 +00:00
Seth Call
61cdf5a681
* delete all users before running the reconnect test
2014-04-10 15:25:30 +00:00
Brian Smith
7a95830b39
remove absolute position style
2014-04-10 02:24:04 -04:00
Brian Smith
628f250a7f
VRFS-1511 fix hover bubble positioning and mouseout issues
2014-04-10 02:21:21 -04:00
Brian Smith
ff03770256
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-04-09 21:18:57 -04:00
Seth Call
76e63193ca
* fixing some broken tests
2014-04-09 21:11:13 +00:00
Seth Call
cc7bbf3f6a
* resolved merge
2014-04-09 18:31:40 +01:00
Seth Call
95f1a59851
* VRFS-1404 reconnect with tests
2014-04-09 18:25:52 +01:00
Brian Smith
2525f86c4f
VRFS-1350 update timestamps to use timeago
2014-04-08 23:52:30 -04:00
Brian Smith
8e9bf41b10
VRFS-1573 start playing audio as soon as session/recording landing pages load
2014-04-08 22:29:03 -04:00
Brian Smith
1a7e63d50a
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-04-08 21:37:12 -04:00
Jonathan Kolyer
5a4bff14d2
VRFS-925 running tests for server side GA events
2014-04-08 17:15:49 +00:00
Seth Call
3dfc455fa4
* reconnect working for in-session; beginning in-situ reconnect refactor
2014-04-08 12:43:26 +01:00
Jonathan Kolyer
7203124e89
merging
2014-04-08 07:21:50 +00:00
Brian Smith
a6f5fa7f54
VRFS-1356 do not display broken instrument icon by using helper method that resolves to default icon
2014-04-08 01:41:25 -04:00
Brian Smith
4906c2b902
VRFS-1437 update play and like stats during refresh
2014-04-08 01:21:10 -04:00
Brian Smith
5784c26089
VRFS-1437 fix bug
2014-04-08 01:17:40 -04:00
Brian Smith
73f819511e
VRFS-1437 update recording/session landing page comments automatically
2014-04-08 00:59:35 -04:00
Seth Call
79c243a20b
* automatic reconnect dialog will guide user without having to click - VRFS-1404
2014-04-07 17:36:08 +01:00
Jonathan Kolyer
8b9bb336e4
Merge branch 'vrfs736' into develop
2014-04-07 07:55:32 +00:00
Jonathan Kolyer
880027a87f
VRFS-736 added liked us tracking to email footer icons for twitter/fb/goog
2014-04-07 07:54:17 +00:00
Brian Smith
0dbe8ea634
update tests
2014-04-06 16:59:38 -04:00
Brian Smith
200541e964
update tests
2014-04-06 16:59:09 -04:00
Brian Smith
cdc28e48fb
remove alert
2014-04-06 16:44:56 -04:00
Brian Smith
6cda9023c7
VRFS-1440 session and recording landing page comments should use timeago for timestamps
2014-04-06 16:43:32 -04:00
Jonathan Kolyer
887795bead
VRFS-1483 final cleanup
2014-04-05 22:16:32 +00:00
Jonathan Kolyer
e5d280e374
VRFS-1483 final cleanup
2014-04-05 22:13:28 +00:00
Jonathan Kolyer
6834a05568
Merge branch 'develop' into vrfs1483
2014-04-05 21:43:37 +00:00
Jonathan Kolyer
ce6d143876
VRFS-1483 added authoritzation for email_batch
2014-04-05 21:42:56 +00:00
Jonathan Kolyer
15090e3c70
VRFS-1483 error collector; cleanup
2014-04-05 21:25:47 +00:00
Jonathan Kolyer
e59d9cbe7a
VRFS-1483 email error handling
2014-04-05 18:52:12 +00:00
Jonathan Kolyer
4e95c7cbd5
VRFS-1483 changed instructions to indicate default hiding of admin session
2014-04-05 18:26:16 +00:00
Seth Call
b37a95c6a5
* Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-04-05 03:21:58 +01:00
Seth Call
3a29abd3d6
* fix minimal typo
2014-04-05 03:10:44 +01:00
Seth Call
700ef04edf
* VRFS-1531, and a fix for feed test having 'dirt' in it from other tests. also reverting batch mailer test
2014-04-04 23:16:38 +01:00
Seth Call
8f18ed09f2
* removing jquery.d dependencie
2014-04-04 20:18:33 +01:00
Seth Call
d1622cfd95
* fix batch_mailer tests
2014-04-04 20:02:44 +01:00
Seth Call
26d7b067f1
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-04-04 19:38:42 +01:00
Seth Call
b48308a4fd
* VRFS-1575 - just very initial work
2014-04-04 19:38:31 +01:00
Jonathan Kolyer
d49c4624cd
VRFS-1483 added test Rails.env check
2014-04-04 10:23:20 +00:00
Jonathan Kolyer
e9f99dbe08
develop merge
2014-04-04 10:22:48 +00:00
Jonathan Kolyer
b4a3c73917
VRFS-1483 fixed batch email test so it should always work in test Rails.env
2014-04-04 10:18:09 +00:00
Jonathan Kolyer
e750ac9e68
VRFS-1483 error handling
2014-04-04 10:08:00 +00:00
Brian Smith
5683b7386a
VRFS-1465 fix tests
2014-04-04 00:47:07 -04:00
Brian Smith
981a7eb4e2
Merge branch 'hotfix/feed_icon_fix' into develop
2014-04-03 23:46:53 -04:00
Seth Call
e1d20949f5
* make 'two-instrument' user
2014-04-03 15:44:02 +01:00
Seth Call
7816007361
* test tweaks
2014-04-03 15:38:58 +01:00
Seth Call
18484c484b
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-04-03 15:11:31 +01:00
Seth Call
f1ef1de83c
* wip new ftue
2014-04-03 15:11:23 +01:00
Jonathan Kolyer
a7c8d9311f
VRFS-1483 fixing tests
2014-04-03 05:03:28 +00:00
Brian Smith
7e8b6eb238
VRFS-1465 add tests
2014-04-03 00:19:39 -04:00
Brian Smith
b17dafd94f
Merge branch 'develop' into hotfix/feed_icon_fix
2014-04-01 21:31:07 -04:00
Seth Call
90eb0bc081
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-04-02 00:43:10 +01:00
Seth Call
86246d526f
Merge branch 'feature/create_find_tiles' into develop
2014-04-02 00:42:56 +01:00
Seth Call
7bfe1cb634
* VRFS-1532 - launch in chrome, ff, or IE10/11. otherwise show instructions to go run it yourself
...
* VRFS-1541 - alphabetically order recordings
* VRFS-1563 - password reset page should have no crashes anymore.
2014-04-02 00:38:36 +01:00
Jonathan Kolyer
3509a84de5
VRFS-1483 replaced layout with user_mailer
2014-04-01 14:51:45 +00:00
Jonathan Kolyer
634de87e90
Merge branch 'develop' into vrfs1483
2014-04-01 14:49:29 +00:00
Jonathan Kolyer
accaa99e38
VRFS-1483 integrating opt-out; fixing tests
2014-04-01 14:42:26 +00:00
Brian Smith
925c5831af
VRFS-1445 display correct values of musician flag and country in admin
2014-04-01 01:18:31 -04:00
Seth Call
1fcd7a8994
* fix offset musician tile
2014-03-31 12:42:37 +01:00
Seth Call
f2ff0ea434
* wip
2014-03-31 12:41:26 +01:00
Seth Call
ad2cfe41cd
* merged
2014-03-31 03:35:04 +01:00
Seth Call
373cda1121
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-03-31 03:28:16 +01:00
Seth Call
da7fc7d901
* VRFS-1541 done from a code perspective... just need to do some admin work once posted
2014-03-31 03:28:04 +01:00
Anthony Davis
39d4aa7b13
VRFS-1263 - remove missing asset reference
2014-03-29 19:53:01 -05:00
Anthony Davis
bfd5712e3c
VRFS-1251 - clean up asset reference
2014-03-29 19:49:36 -05:00
Anthony Davis
54ecf4ca97
VRFS-1331 - capitalize K
2014-03-29 19:45:05 -05:00
Anthony Davis
979317db5f
VRFS-1355 - trivial padding
2014-03-29 19:43:55 -05:00
Seth Call
9f28db3dc3
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-03-28 04:05:13 +00:00
Seth Call
ef59756f11
* make the viluat jam fest link smaller text and scooted down
2014-03-28 04:03:44 +00:00
Seth Call
39bd83ae5a
* launch app test
2014-03-28 04:00:57 +00:00
Anthony Davis
c7ff47dabf
Fixing failing test
2014-03-27 22:23:39 -05:00
Seth Call
4e74ba438c
* initializing 'me' for sidebar
2014-03-28 02:24:53 +00:00
Seth Call
b7c6d8b9c0
* fix broken refreence to initializeFriendsPanel in notificaitonsPanel.js
2014-03-28 02:16:57 +00:00
Seth Call
7a29a358df
* VRFS-1508 - Facebook signups are not recorded as type=Facebook in GA
2014-03-27 20:59:03 +00:00
Seth Call
de10ed09d7
* adding config in admin needed by web VRFS-1541
2014-03-27 20:14:59 +00:00
Seth Call
28901b4d92
* bring back virtual jam fest link, but fix text based on VRFS-1541
2014-03-27 19:03:06 +00:00
Seth Call
94494a2b3a
Merge branch 'feature/highlight_notifications' into develop
2014-03-27 18:44:34 +00:00
Seth Call
53a6941ceb
* VRFS-1473 - Notification Highlighter - make obvious to user that they have new notifications complete
...
* VRFS-1523 - USER: Make "enter" key send message in new user-to-user messaging feature
2014-03-27 18:43:15 +00:00
Brian Smith
4316fa0d2c
VRFS-1465 fix instrument icon for recording feed items
2014-03-27 02:00:21 -04:00
Seth Call
ba43244b69
* fixing the refresh of sidebar friends when friend request accepted
2014-03-26 17:31:51 +00:00
Seth Call
526f6fe577
* VRFS-1473 - notifications should be highlighted, wip
2014-03-26 17:09:48 +00:00
Seth Call
d365054237
* VRFS-1533 - track in success path, not failure path of download GA info
2014-03-25 22:42:15 +00:00
Seth Call
1aef96b697
* VRFS-1474 cleaned up some error case dialogs
2014-03-25 16:30:22 +00:00
Seth Call
d6210c0b2f
* VRFS-1474 - link in friend invite
2014-03-25 15:29:08 +00:00
Seth Call
f4a3ecdb25
* VRFS-1524 - adding getting started to carousel videos
2014-03-23 22:57:21 +00:00
Seth Call
5aaa389a4b
* VRFS-1386 - check if invited_user.email is nil, and change existing test to have email
2014-03-21 22:37:15 +00:00
Seth Call
3de73f2193
* give hover bubble for musicians 10 more px VRFS-1516
2014-03-21 20:37:20 +00:00
Seth Call
9dee37ca8e
* scoot over upload/download/convert statuses a few percent. not a permanent solution VRFS-1518
2014-03-21 20:27:38 +00:00
Seth Call
85cb225a3d
* fix for VRFS-1517 - empty notifications in sidebar
2014-03-21 20:21:03 +00:00
Seth Call
2306948f9c
* whack the default domain cookie if we see an attempt to invalidate
2014-03-21 16:20:34 +00:00
Seth Call
4aece93b87
* run websocket-gateway in spec_helper intsead of initializer for tests VRFS-1509
2014-03-21 04:44:34 +00:00
Seth Call
b058f19692
* VRFS-1493 - redirect to forums implemented, VRFS-1507 (signin url preserved on postback failure)
2014-03-21 03:23:33 +00:00
Seth Call
8f1d48da40
* merged in VRFS-1110
2014-03-20 13:08:59 +00:00
Seth Call
79cd6edb78
* bring back kill hung tests switch
2014-03-20 12:54:48 +00:00
Seth Call
7cdd47ac89
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-03-20 11:53:35 +00:00
Seth Call
b04c7bcea5
* VRFS-871 - user-to-user messaging complete
2014-03-20 11:53:26 +00:00
Jonathan Kolyer
e29907f09b
merging
2014-03-19 18:44:35 +00:00
Jonathan Kolyer
eecdbebf3d
VRFS-1483 integrating admin interface
2014-03-19 18:42:28 +00:00
Jonathan Kolyer
22104e3a97
VRFS-1483 undoing accidently checkin of wsg connect params
2014-03-19 16:38:59 +00:00
Jonathan Kolyer
0987cf2cf8
VRFS-1483 editing batch emails
2014-03-19 16:37:03 +00:00
Jonathan Kolyer
74a5f3863a
VRFS-1483 various fixes from testing
2014-03-19 16:32:53 +00:00
Jonathan Kolyer
21bd8fcf2f
VRFS-1483 removed debug code
2014-03-19 16:29:19 +00:00
Jonathan Kolyer
d15c1dbdfd
VRFS-1483
2014-03-19 07:15:38 +00:00
Jonathan Kolyer
4ba18a88ee
VRFS-1483 integrating sendgrid_smtpapi
2014-03-19 06:20:58 +00:00
Jonathan Kolyer
e8dd5f6ae5
VRFS-1483 state transitions and optimistic locking
2014-03-19 04:24:42 +00:00
Brian Smith
44da456a42
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-03-18 21:52:54 -04:00
Brian Smith
d00bc8d5fc
VRFS-1465 fix instrument icons for sessions on feed
2014-03-18 21:52:37 -04:00
Jonathan Kolyer
c6c12e7b9e
Merge branch 'develop' into vrfs1483
2014-03-19 00:23:32 +00:00
Jonathan Kolyer
17fcd42120
VRFS-1483 include resque::mailer
2014-03-18 23:39:23 +00:00
Jonathan Kolyer
1c39238fe5
VRFS-1483 adding send batch layouts and such
2014-03-18 23:05:40 +00:00
Jonathan Kolyer
cdb271bf98
VRFS-1483 added async support
2014-03-18 22:50:06 +00:00
Jonathan Kolyer
40a2049bdf
VRFS-1483 added from_email column to email_batches
2014-03-18 20:31:23 +00:00
Jonathan Kolyer
72fb245dd7
VRFS-1483 added batch_mailer
2014-03-18 19:56:15 +00:00
Jonathan Kolyer
98a4553f72
VRFS-1483 specs for test users
2014-03-18 18:33:48 +00:00
Jonathan Kolyer
3204de01e6
VRFS-1483 merge
2014-03-18 15:13:03 +00:00
Jonathan Kolyer
e6d0851391
VRFS-1483 adding first set of updates for batch emails
2014-03-18 15:07:45 +00:00
Brian Smith
e38494b0f9
VRFS-1481 display 256x256 instrument icons on musician profile page
2014-03-17 18:55:11 -04:00
Scott Comer
bfc2a36df4
a better version of update for scott
2014-03-17 12:53:06 -05:00
Scott Comer
91d76c7f12
marking broken location tests as pending; marked broken icecast config tests as pending; disabled some silly and now useless debugging output in get_work
2014-03-17 12:21:32 -05:00
Jonathan Kolyer
c8a60a7d83
VRFS-1422 removed extra call to facebookHelper.promptLogin() which is unnecessary for feed posts
2014-03-17 16:58:48 +00:00
Scott Comer
3ff131c031
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-03-17 22:39:47 -05:00
Scott Comer
26667bf4c2
fix spec broken by no longer supported function countries
2014-03-17 22:39:31 -05:00
Scott Comer
82ad25795c
disable countries methods which are no longer supported
2014-03-17 22:27:38 -05:00
Scott Comer
ddabbcecc5
fix countries to use labels for users, bands, and new signups
2014-03-17 22:20:41 -05:00
Scott Comer
f7ffa2d7a9
fix problem with missing client_type in login tests
2014-03-17 11:47:27 -05:00
Seth Call
b783d270b1
* VRFS-1457 - resolved two issues; invited users will be able to invite, and the error path will show errors
2014-03-15 16:47:21 +00:00
Seth Call
964fcb5f0e
* VRFS-1456 - hoverIntent error goes away once you stop including jquery twice\!
2014-03-15 04:42:36 +00:00
Seth Call
4c737086e4
* VRFS-1454 - 2px bigger on the orange button for the win
2014-03-15 02:38:26 +00:00
Seth Call
9324725e3c
* VRFS-1451 - fix broken signup link when clicked more than once
2014-03-15 01:25:37 +00:00
Seth Call
f9439bd42e
* fixing websocket tests
2014-03-14 17:02:38 +00:00
Seth Call
f765068017
* fix band_spec test
2014-03-14 16:40:57 +00:00
Seth Call
9ec7c18d79
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-03-14 14:44:34 +00:00
Seth Call
993afe1174
if either fan access or musician access is public, expose rabl VRFS-1427
2014-03-14 14:44:11 +00:00
Brian Smith
fde9c64e11
VRFS-1439 fix display issue in musician profile social tab
2014-03-14 00:57:28 -04:00
Brian Smith
90ab928a7c
VRFS-1448 fix bug with Connect button in Fan hover bubble
2014-03-13 22:56:11 -04:00
Brian Smith
5fd204c89e
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-03-13 20:56:50 -04:00
Jonathan Kolyer
f56fcd6fab
Merge branch 'develop' into VRFS-1110
2014-03-13 10:53:47 +00:00
Jonathan Kolyer
148fc69950
VRFS-1110 in createBandInvitation fixed selector for invitation list
2014-03-13 10:51:21 +00:00
Jonathan Kolyer
14fa5e18e5
VRFS-1110 clear the friend input beforeShow
2014-03-13 10:20:25 +00:00
Jonathan Kolyer
45f2124cfa
VRFS-1110 removed autocomplete for session update
2014-03-13 10:00:17 +00:00
Brian Smith
0b02e9e323
fix JS error with notifications
2014-03-13 05:24:24 -04:00
Jonathan Kolyer
c46f8c4476
VRFS-1110 added instructions argument
2014-03-13 09:23:22 +00:00
Jonathan Kolyer
b428bbb913
VRFS-1110 fixed integration of InviteMusiciansUtil to band setup
2014-03-13 08:47:27 +00:00
Jonathan Kolyer
a91092a048
Merge branch 'develop' into vrfs1110
2014-03-13 07:49:10 +00:00
Seth Call
19f21236e4
* link to press release
2014-03-12 14:37:13 +00:00
Seth Call
1a68a49fbd
* change all video links to the one that's ready (the Overview one)
2014-03-12 14:17:31 +00:00
Brian Smith
9c7dafe8b8
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-03-11 22:12:52 -04:00
Seth Call
dd71838af0
* fix bad text in the FTUE
2014-03-12 02:00:41 +00:00
Brian Smith
31d94344b5
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-03-11 19:54:51 -04:00
Scott Comer
ac883bb7d3
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-03-11 17:35:23 -05:00
Scott Comer
60aa59e11f
faster signup
2014-03-11 17:35:00 -05:00
Seth Call
5bcf69a36b
* fixing firefox, maybe other browsers, for omission of type in audio source
2014-03-11 21:51:29 +00:00
Scott Comer
3c3f191239
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-03-11 13:20:33 -05:00
Scott Comer
2dd8ad0be8
data models for countries, regions, and cities tables.
2014-03-11 13:20:00 -05:00
Seth Call
1d1578fde8
* adding social description ability for sharing facebook
2014-03-11 18:14:05 +00:00
Seth Call
557412992e
* add just a few more constraint delete cascades
2014-03-11 16:06:50 +00:00
Seth Call
a5a083a4e8
* fix for recording landing page not working, and fix for sort order enforced for jamfest
2014-03-11 15:50:08 +00:00
Brian Smith
2b89cc208b
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-03-11 07:52:14 -04:00
Seth Call
164a4fdbe1
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-03-11 07:41:18 +00:00
Seth Call
24f8bb257c
* VRFS-1168 - done except the distance filter, but that's assigned elsewhere anyway
2014-03-11 07:40:58 +00:00
Seth Call
c9438fcf99
* feed shows items. no scrolling, no support for query modification yet
2014-03-11 06:09:44 +00:00
Brian Smith
12701f447d
VRFS-600 attempt to fix IE10
2014-03-11 00:52:39 -04:00
Brian Smith
45597d90e8
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-03-10 23:40:24 -04:00
Brian Smith
20ad17608e
stub press release link correctly
2014-03-10 23:40:14 -04:00
Brian Smith
cee4dd6aa4
add line break
2014-03-10 22:41:32 -04:00
Seth Call
4cf4aad497
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-03-11 02:28:00 +00:00
Seth Call
67b5049913
* VRFS-1380 - lighter links in emails
2014-03-11 02:27:52 +00:00
Anthony Davis
a3964037e2
VRFS-1410 - fixed typo on session page
2014-03-10 21:20:17 -05:00
Seth Call
b42fc5194f
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-03-11 01:50:34 +00:00
Seth Call
c3f60f178a
* add big ol' link on front page to jamfest
2014-03-11 01:47:22 +00:00
Brian Smith
a5ea256d62
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-03-10 19:36:04 -04:00
Brian Smith
1af692c75c
VRFS-1399 format testimonial page
2014-03-10 19:35:48 -04:00
Seth Call
10b10bb9d2
* allow html in descr
2014-03-10 23:16:38 +00:00
Seth Call
59b21c557b
* fix feed screen
2014-03-10 22:01:11 +00:00
Seth Call
5a76f42fcd
* beginning feed work, and loosening the query for when a session starts for event feature
2014-03-10 21:47:19 +00:00
Seth Call
bfd017b19f
* VRFS-1377 - adding sponsor on session page, and making centurylink a link
2014-03-10 21:15:58 +00:00
Seth Call
5dd0463d72
* ugh js error
2014-03-10 18:36:42 +00:00
Seth Call
6867b2711a
* adding a br clear all between entries
2014-03-10 18:19:56 +00:00
Seth Call
ae2c2fb807
* padding at bottom of entry
2014-03-10 18:14:08 +00:00
Jonathan Kolyer
61c509422b
Merge branch 'develop' into vrfs1110
2014-03-10 17:35:14 +00:00
Seth Call
9225937ee7
* using UTC date
2014-03-10 17:24:29 +00:00
Jonathan Kolyer
e408bb4274
VRFS-1110 fixed couple nits
2014-03-10 16:50:53 +00:00
Seth Call
030d31eadc
supply link on facebook share - VRFS-1376
2014-03-10 16:24:36 +00:00
Seth Call
a2061ff830
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-03-10 15:24:55 +00:00
Seth Call
c9625a4529
* VRFS-1377 done, tested. going to manually test soon on production
2014-03-10 15:21:21 +00:00
Jonathan Kolyer
a2b6aaf783
VRFS-1110 integrated autocomplete
2014-03-10 15:14:12 +00:00
Scott Comer
84011ce339
remove bogus reference to non-existent GeoIpIsp
2014-03-10 07:26:15 -05:00
Jonathan Kolyer
93a24f0ca8
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-03-10 11:47:52 +00:00
Jonathan Kolyer
00c45b4612
VRFS-1393 changed FB share image to use square logo-512.png
2014-03-10 11:47:31 +00:00
Jonathan Kolyer
66b66a926b
VRFS-925 updating position of bands_did_session.sql
2014-03-10 09:02:23 +00:00
Jonathan Kolyer
d63f090657
VRFS-925 merge conflict
2014-03-10 09:01:33 +00:00
Jonathan Kolyer
6ba8256d1a
VRFS-925 fixed typo for testing
2014-03-10 08:58:03 +00:00
Seth Call
7df02c0778
* merging manifest
2014-03-10 07:13:01 +00:00
Scott Comer
29d86cc605
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-03-10 01:45:55 -05:00
Scott Comer
8072096427
fix problem where jam_isp importer deleted contents of geoiplocations instead of geoipisp.
2014-03-10 01:45:32 -05:00
Seth Call
b9ee475db5
* working on event page
2014-03-10 06:31:20 +00:00
Brian Smith
56b9bd07ea
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-03-10 01:41:26 -04:00
Brian Smith
b13dcef4f1
VRFS-1399 media center content
2014-03-10 01:41:06 -04:00
Scott Comer
a0fab2b584
mod the get_work stored procedure to exclude all connections but those which are from clients.
2014-03-10 00:17:34 -05:00
Seth Call
3c5a14312a
* Event page 'chrome' is setup and pulling from database--now to add band logic
2014-03-09 22:58:57 +00:00
Brian Smith
959320f909
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-03-09 18:56:24 -04:00
Brian Smith
dbed2edee8
VRFS-1397 ensure instruments are always synced in music_sessions_user_history table
2014-03-09 18:56:08 -04:00
Scott Comer
bf86b9b30b
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-03-09 17:35:29 -05:00
Scott Comer
af748cba75
rake tasks for importing geoip data
2014-03-09 17:35:12 -05:00
Seth Call
23e5906e55
* VRFS-1253 - account for unknowns
2014-03-09 19:35:42 +00:00
Brian Smith
e250b0f175
do not send band session join notification to band members
2014-03-09 14:44:06 -04:00
Seth Call
5a8c3886fd
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-03-09 18:05:39 +00:00
Seth Call
aa493ecc29
* VRFS-1253 - working in a basic sense with pagination
2014-03-09 18:05:26 +00:00
Seth Call
000dd3fdd0
* VRFS-1253 - working in a basic sense with pagination
2014-03-09 18:04:56 +00:00
Jonathan Kolyer
848702e04d
VRFS-925 added bands_did_session.sql to bottom
2014-03-09 13:45:35 +00:00
Jonathan Kolyer
3b2c3ea755
VRFS-925 merge conflict
2014-03-09 13:42:53 +00:00
Jonathan Kolyer
2b11cb7abb
VRFS-925 ga event processing
2014-03-09 13:38:46 +00:00
Scott Comer
c1bea4ae03
merge conflict
2014-03-09 01:28:41 -06:00
Scott Comer
f8e06c476d
fixed and normalized data types and nullability in max_mind_geo and max_mind_isp; fixed rakes for same to use ruby csv instead of pg; dropped the huge maxmind data files i committed earlier; fixed lack of genre in websocket factories.rb constructed music sessions.
2014-03-09 00:22:51 -06:00
Jonathan Kolyer
5abc877a38
VRFS-709 added calls to GA record/session tracking
2014-03-09 01:16:39 +00:00
Jonathan Kolyer
e271feeb70
VRFS-1333 addPlayablePlay integration
2014-03-08 23:59:56 +00:00
Jonathan Kolyer
386fcbd9a3
VRFS-1333 removed add_play; now lives in user/api
2014-03-08 23:56:49 +00:00
Jonathan Kolyer
721840172c
VRFS-1333 added plays_refactor.sql
2014-03-08 20:51:12 +00:00
Jonathan Kolyer
713344a7a7
merge conflict
2014-03-08 20:50:51 +00:00
Brian Smith
e67b091015
VRFS-600 replace console.debug with console.log (except for tests
2014-03-08 14:52:32 -05:00
Brian Smith
dd520ee6e6
VRFS-1382 add new template parameter to Followers section
2014-03-08 14:33:40 -05:00
Brian Smith
1bd8271b03
VRFS-1382 fix band hovers on musician profile Social tab
2014-03-08 14:31:49 -05:00
Brian Smith
d312f46ff9
VRFS-600 fix musicians feed display issue in IE11
2014-03-08 14:06:17 -05:00
Brian Smith
a5a8575ccf
VRFS-1378 scope CONNECT button for main search results page so the sidebar CONNECT button is not invoked twice
2014-03-08 12:49:11 -05:00
Brian Smith
00a447037a
VRFS-1287 VRFS-1340 fix issues with weird behavior of Okay and Cancel buttons in notifications
2014-03-08 01:37:25 -05:00
Seth Call
eea0001ab3
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-03-07 20:53:29 -06:00
Seth Call
8d0faa9b81
* adding test method to check 'local' behavior
2014-03-07 20:52:00 -06:00
Brian Smith
9c2b10dd5f
VRFS-1243 VRFS-1310 fix regression in session notifications in sidebar
2014-03-07 19:56:27 -05:00
Scott Comer
798ccc4529
fix case where connection_client_type.sql is boggled by existing connections, and added schema for cities, regions, and countries.
2014-03-07 17:23:25 -06:00
Scott Comer
d7443edf58
fix case where connection_client_type.sql is boggled by existing connections, and added schema for cities, regions, and countries.
2014-03-07 17:23:04 -06:00
Seth Call
5a51bae5fd
* set server_id to be same as hostname
2014-03-07 15:03:44 -06:00
Seth Call
755cd0172e
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-03-07 14:20:43 -06:00
Seth Call
faed48271b
* VRFS-1372 resolved, and not requiring local only until figure out some deployment issues
2014-03-07 14:20:34 -06:00
Brian Smith
b0525231ab
fix test
2014-03-07 15:17:05 -05:00
Jonathan Kolyer
77528ddc9d
VRFS-1333 added recordingId
2014-03-07 09:05:34 +00:00
Jonathan Kolyer
db3a063bd2
Merge branch 'develop' into vrfs1333
2014-03-07 07:35:31 +00:00
Jonathan Kolyer
38bde04ec7
VRFS-1333 play tracking
2014-03-07 07:35:10 +00:00
Seth Call
adb37e06a6
* merged
2014-03-07 01:31:13 -06:00
Seth Call
d6b6cb553c
* adding data-claimed-recording-id to feed entry, and pass in claimedRecordingId as an option to .listenRecording() in recording landing page, and home page
2014-03-07 01:30:38 -06:00
Jonathan Kolyer
eb98b97cd5
merge conflict
2014-03-07 06:53:35 +00:00
Jonathan Kolyer
46b0832cd8
VRFS-1333 play tracking
2014-03-07 06:46:07 +00:00
Brian Smith
667c629c27
VRFS-1052 fix timestamp issue with notifications (moved to timeago plugin)
2014-03-07 01:30:23 -05:00
Brian Smith
76e7a873ba
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-03-07 00:39:37 -05:00
Brian Smith
49269443da
VRFS-1243 VRFS-1310 fix join session notifications based on access level and user type
2014-03-07 00:38:10 -05:00
scott comer
77b535f431
Merge branch 'develop' of https://bitbucket.org/jamkazam/jam-cloud into develop
2014-03-06 23:36:12 -06:00
scott comer
f64d5e3429
code to name maps for countries, united states, and canada
2014-03-06 23:35:46 -06:00
Seth Call
083a3dd4a3
* merged
2014-03-06 23:23:00 -06:00
Seth Call
d0885a829e
* change all scheduled jobs to names prefixed with scheduled_
2014-03-06 23:20:24 -06:00
Seth Call
dc8f420577
* adding temporary warning about no signups yet
2014-03-06 21:31:09 -06:00
scott comer
88eb6584af
new geo files
2014-03-06 19:45:15 -06:00
scott comer
924bd082eb
Merge branch 'develop' of https://bitbucket.org/jamkazam/jam-cloud into develop
2014-03-06 16:38:58 -06:00
scott comer
5be30ed2cc
new geoip data
2014-03-06 16:38:27 -06:00
scott comer
5aa4759605
new geoip data
2014-03-06 16:37:43 -06:00
Seth Call
a570856156
* fix for VRFS-1362 by not putting all query params back in URL
2014-03-06 16:17:32 -06:00
Seth Call
a87f07c654
* pin multijson to 1.9.0
2014-03-06 14:50:46 -06:00
Seth Call
322988f33a
* line wrap issue - VRFS-1363
2014-03-06 14:41:57 -06:00
Seth Call
8d36cd8e27
* VRFS-1311 GetChatInputs is used now to list in new FTUE
2014-03-06 13:51:02 -06:00
Seth Call
4f626cc644
* VRFS-900 check for no tracks when you land directly on session screen, and if you find session
2014-03-06 12:17:47 -06:00
Seth Call
a3289c5d4c
* VRFS-900 - guard against 0 tracks
2014-03-06 11:56:15 -06:00
Seth Call
0d27a47b42
* VRFS-1308 - make configure tracks be cool about no selected items when the user indicates they might want to configure them. fix some recording styling button issues
2014-03-06 11:02:50 -06:00
Scott Comer
2effc50f17
oops, use current_scores not scores
2014-03-05 23:00:57 -06:00
Scott Comer
40e2f15b8b
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-03-05 22:26:26 -06:00
Scott Comer
20cd9e5dd0
added stuff to support getting the max_score attribute to client via json
2014-03-05 22:26:17 -06:00
Seth Call
64b8f7d001
* fix broken music session page
2014-03-05 21:38:28 -06:00
Seth Call
42fb69b9cb
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-03-05 21:20:10 -06:00
Seth Call
104bf40a49
* VRFS-1264 and VRFS-1047
2014-03-05 21:20:00 -06:00
Scott Comer
b54e7d1ca1
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-03-05 20:30:54 -06:00
Scott Comer
65b0c7115a
first take on api_music_sessions_controller#index replacement, nindex.
2014-03-05 20:30:40 -06:00
Seth Call
1c2585ba92
* VRFS-1047 mosttly done, aside from jamfet link
2014-03-05 17:18:53 -06:00
Seth Call
5eee96fb3e
* adding query params helper file
2014-03-05 13:58:09 -06:00
Seth Call
71c4948ef6
* pop videos in system browser if jamaclient
2014-03-05 13:28:19 -06:00
Seth Call
83e793c046
* adding hover bubbles to frontpage VRFS-1047
2014-03-05 12:28:10 -06:00
Seth Call
48c5d2a982
* when loaunching old FTUE, start the user at the wizard step with the videos
2014-03-05 11:01:28 -06:00
Seth Call
0436ca1f4d
* enable select items in old ftue when device chosen
2014-03-05 10:59:08 -06:00
Seth Call
a63869ce27
* reverting ftue, account profile screen to before any showing of disabled devices
2014-03-05 10:49:10 -06:00
Seth Call
302341360e
* VRFS-1349 - fixed
2014-03-05 09:35:43 -06:00
Seth Call
2454ff2b05
* rolling back some android specific changes that don't help
2014-03-05 09:22:40 -06:00
Seth Call
67219f8125
* convert all debug statements to log to work in IE10
2014-03-05 09:10:12 -06:00
Seth Call
9a354823c8
* play start abort ignore for now until more testing
2014-03-05 08:23:38 -06:00
Brian Smith
f96019ba69
added new JS bridge method
2014-03-05 02:14:02 -05:00
Brian Smith
1e7352712a
fix JoinRequestRejected message definition
2014-03-05 02:01:51 -05:00
Jonathan Kolyer
1eb4b80482
VRFS-1333 refactoring {recording,music_sessions_history}_plays into playable_plays
2014-03-05 06:40:04 +00:00
Brian Smith
d513f9b570
VRFS-1336 audio profile screen changes
2014-03-05 01:27:04 -05:00
Brian Smith
997ca081d5
clean up logs
2014-03-05 01:24:05 -05:00
Brian Smith
c6e660dac2
VRFS-1336 utils changes for this bug fix
2014-03-05 01:22:29 -05:00
Brian Smith
a8a7ecea7d
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-03-05 01:16:57 -05:00
Brian Smith
7c16674c27
VRFS-1336 show user friendly config name
2014-03-05 01:16:31 -05:00
Seth Call
14ce28d964
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-03-05 00:15:58 -06:00
Seth Call
db15ec0a66
* recording widget working on home page VRFS-1264
2014-03-05 00:15:46 -06:00
Brian Smith
2abceaef8c
VRFS-1336 show user friendly config name
2014-03-05 01:11:48 -05:00
Brian Smith
6d277f6597
fix bug retrieving band followers
2014-03-04 22:32:04 -05:00
Brian Smith
9938ec0a1d
hide REMOVE MEMBER button when showing Pending Band Members
2014-03-04 22:29:58 -05:00
Brian Smith
64824d3587
VRFS-614 remove remaining async=false lines
2014-03-04 22:12:44 -05:00
Scott Comer
87b6654f28
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-03-04 18:48:42 -06:00
Scott Comer
057a2b79dd
removed updating with with connection location attributes
2014-03-04 18:48:29 -06:00
Seth Call
5f67ad3290
* make rabbitmq_host and rabbitmq_port configurable for websocket-gateway
2014-03-04 15:51:49 -06:00
Seth Call
314d3c9dac
* supporting session widget in rich client
2014-03-04 12:22:42 -06:00
Seth Call
3afdd55a15
* fix IE auth issues (and other browsers)... chehck if session is over between every retry play attempt
2014-03-04 11:56:42 -06:00
Seth Call
f5f16e9b91
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-03-04 11:08:05 -06:00
Seth Call
7d0ca26bda
* restrict not null
2014-03-04 11:06:53 -06:00
scott comer
f0a0f9f2f2
the real deal geoipdata
2014-03-04 10:41:00 -06:00
Seth Call
81d3a0a540
* make remote show track when loaded in-session
2014-03-04 09:14:16 -06:00
Jonathan Kolyer
7a991a8032
VRFS-1326 added includes(:latest) to PromoLatest.active impl
2014-03-04 08:17:56 +00:00
Jonathan Kolyer
b4c168c12a
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-03-04 08:14:46 +00:00
Jonathan Kolyer
fa3ca94e53
VRFS-1326 added filter for deleted sessions/recordings
2014-03-04 08:14:38 +00:00
Seth Call
e09b563737
* clean up lowercase k's in emails: VRFS-732
2014-03-04 01:09:13 -06:00
Seth Call
64d77d4ebb
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-03-04 00:59:31 -06:00
Seth Call
44be38f2b0
* VRFS-1280 - allow people to listen to public widgets without being logged in by allowing music session show API public access
2014-03-04 00:58:40 -06:00
Brian Smith
33500fa385
fixed bugs with showing valid/invalid profiles on account and account audio screens
2014-03-04 01:52:13 -05:00
Brian Smith
ba31848626
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-03-04 01:44:41 -05:00
Brian Smith
0f9603f0e8
VRFS-1232 added testimonials
2014-03-04 01:44:32 -05:00
Jonathan Kolyer
956f2cf9e9
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-03-04 06:23:34 +00:00
Jonathan Kolyer
82722d2cbc
VRFS-756 broken test fix
2014-03-04 06:23:29 +00:00
Brian Smith
171a2371a7
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-03-04 01:03:39 -05:00
Brian Smith
78560a71a1
VRFS-1287 unbind click each time notification is rendered
2014-03-04 01:03:26 -05:00
Seth Call
7fda82ec0b
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-03-04 00:00:51 -06:00
Seth Call
5285078cf6
* VRFS-1285 - hide play button if it can't be played, and show BROADCASTING OFFLINE or PRIVATE SESSION appropriaely
2014-03-04 00:00:01 -06:00
Jonathan Kolyer
490b8ad06c
VRFS-1326 added Latest ID column
2014-03-04 05:47:32 +00:00
Jonathan Kolyer
ff673e97d8
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-03-04 05:39:09 +00:00
Jonathan Kolyer
17088d49b5
VRFS-1326 fixed integration of latest/buzz
2014-03-04 05:38:58 +00:00
Seth Call
9b8caedbb2
* VRFS-1309 - Edit link erroneously shown on non-you profiles
2014-03-03 23:34:00 -06:00
Seth Call
90f18a671a
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-03-03 23:33:22 -06:00
Seth Call
e01491aa86
* VRFS-1330 - load recordings again
2014-03-03 23:11:54 -06:00
Brian Smith
e2cae90fa3
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-03-03 22:35:48 -05:00
Brian Smith
407ab1d4dc
VRFS-1327 ensure genres is not empty
2014-03-03 22:35:35 -05:00
Seth Call
ddcbcbdd9e
* Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-03-03 21:07:23 -06:00
Seth Call
608f4b2b13
* VRFS-1323 - protect against null entries
2014-03-03 20:45:24 -06:00
Scott Comer
7d8cb8c458
fix missing better test data and bug in connection_manager.rb relating to line 111
2014-03-03 20:30:34 -06:00
Brian Smith
e53dcc722f
fix JS error in error handler
2014-03-03 19:15:29 -05:00
Seth Call
aa62cc7d2a
* deal with extremes by squelching to values VRFS-1319
2014-03-03 18:09:27 -06:00
Seth Call
535a0da880
* oops. messed up manifest
2014-03-03 16:53:04 -06:00
Seth Call
f0a9b90583
* VRFS-293 - connection status indicators hooked up
2014-03-03 16:49:53 -06:00
Seth Call
3c4f5c7e55
* merged
2014-03-03 16:18:03 -06:00
Seth Call
7ab7bfd795
* VRFS-1297, VRFS-1305, VRFS-293, VRFS-950, VRFS-641 - track changes added to help frontend better understand when it needs to poke backend, and refresh state
2014-03-03 16:13:23 -06:00
Scott Comer
6ee68e8943
fix the login test for locidispid and add a test for reconnect
2014-03-03 14:54:07 -06:00
Scott Comer
ab1143c9a8
fix and test user updates upon login
2014-03-03 14:31:25 -06:00
Scott Comer
8c65c272ec
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-03-02 23:17:05 -06:00
Scott Comer
1e8d2bb724
update user with connection address on login or reconnect; make the better test data useable; fix up tests for geo stuff
2014-03-02 23:16:48 -06:00
Jonathan Kolyer
848430ef05
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-03-03 00:51:36 +00:00
Jonathan Kolyer
f760fa1795
VRFS-756 fixed broken tests
2014-03-03 00:51:06 +00:00
Jonathan Kolyer
0b7e860bd1
VRFS-756 removed extranous args from ajaxError
2014-03-03 00:50:32 +00:00
Brian Smith
19f011a3c8
fix syntax errors
2014-03-02 17:10:12 -05:00
Brian Smith
4e032f583d
expose new JS bridge methods
2014-03-02 17:09:02 -05:00
Brian Smith
c0cb5ef138
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-03-02 17:01:34 -05:00
Brian Smith
9a1bba988b
VRFS-604 show disconnected devices in FTUE
2014-03-02 17:00:11 -05:00
Brian Smith
57ea6134ff
VRFS-1254 clip long names for sidebar
2014-03-02 16:44:36 -05:00
Scott Comer
b801902ea4
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-03-02 15:27:09 -06:00
Brian Smith
8dc8e99a3b
VRFS-604 show invalid profiles on main account screen
2014-03-02 15:58:12 -05:00
Brian Smith
25a4e14e3a
VRFS-604 clear html before appending
2014-03-02 15:14:54 -05:00
Brian Smith
11a9d8b77b
VRFS-604 show disconnected devices on audio profile screen
2014-03-02 15:06:23 -05:00
Brian Smith
55de15338f
fix dead link
2014-03-02 15:05:27 -05:00
Scott Comer
284cbeefc4
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-03-01 23:37:00 -06:00
Seth Call
0d53309cd5
* delay track changes 3 seconds; not one
2014-03-01 23:20:48 -06:00
Seth Call
3ddc471586
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-03-01 23:20:12 -06:00
Seth Call
c12b561c3f
* adding timing debug to REBUILD_MIXER and updating much of the notifications
2014-03-01 23:19:43 -06:00
Brian Smith
59dff168ff
VRFS-830 convert Audio Device dropdown to easydropdown
2014-03-01 22:54:48 -05:00
Brian Smith
4a8434f71c
VRFS-830 convert Audio Device dropdown to easydropdown
2014-03-01 22:53:35 -05:00
Brian Smith
3d8a84c552
minor refactor
2014-03-01 22:19:13 -05:00
Brian Smith
d764cb5522
VRFS-1248 fix hidden dropdown on Find Session
2014-03-01 22:18:14 -05:00
Scott Comer
a64ab23c97
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-03-01 20:37:15 -06:00
Scott Comer
5d899f57dd
complete unit tests for api_scoring_controller and add some better test data
2014-03-01 20:36:51 -06:00
Brian Smith
37745101e2
add comment explaining sort
2014-03-01 21:35:11 -05:00
Brian Smith
8ca840548d
VRFS-950 not a fix, but should only call TrackSaveAssignments once
2014-03-01 21:25:59 -05:00
Seth Call
725460176a
* VRFS-792 - also guard against direct session link joins with no ftue
2014-03-01 17:01:45 -06:00
Scott Comer
fdbdf53ec6
fix the variable names for record to be more natural
2014-03-01 16:54:23 -06:00
Seth Call
87f4890638
* VRFS-1279 - whats next dialog shows twice, VRFS-721 - default to 1 for kernel streaming
2014-03-01 10:39:35 -06:00
Seth Call
a9edcfa798
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-03-01 08:58:56 -06:00
Seth Call
7a820e7827
* VRFS-726 - don't care if ftue has succeeded before; we care if there are any good devices
2014-03-01 08:58:42 -06:00
Jonathan Kolyer
6e996c468c
Merge branch 'vrfs756' into develop
2014-03-01 04:44:00 +00:00
Jonathan Kolyer
bfd2c5997d
VRFS-756 added error handling and cleanup
2014-03-01 04:37:22 +00:00
Jonathan Kolyer
23957d0260
VRFS-756 fixed bugs
2014-03-01 03:07:48 +00:00
Seth Call
1e55b4acc8
* working towards using a loaded deferrable in recording
2014-02-28 20:29:20 -06:00
Seth Call
b7a1e06889
* working on generic recording widget logic
2014-02-28 19:28:17 +00:00
Jonathan Kolyer
af1186d0ef
Merge branch 'develop' into vrfs756
2014-02-28 18:02:34 +00:00
Jonathan Kolyer
b4aae340f7
merge conflict
2014-02-28 07:07:26 +00:00
Seth Call
e7c1a791a7
Merge branch 'develop' of bitbt ucket.org:jamkazam/jam-cloud into develop
2014-02-28 06:41:07 +00:00
Seth Call
d98bc2d210
* VRFS-1248 - rolled back
2014-02-28 06:40:19 +00:00
Seth Call
898092f48e
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-28 04:19:49 +00:00
Seth Call
cc44c00865
* refactor more stuff into listenBroadcast jquery plugin in preparation of doing VRFS-1261
2014-02-28 04:19:39 +00:00
Brian Smith
f409366893
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-27 22:39:51 -05:00
Brian Smith
e297dd7f19
VRFS-1248 fix genre selector on find session screen
2014-02-27 22:39:45 -05:00
Seth Call
8c9546918f
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-28 02:51:56 +00:00
Seth Call
56ce4c9fe8
* session broadcast widget working decently well
2014-02-28 02:50:17 +00:00
Brian Smith
b2de499d9d
fix session notification LISTEN link
2014-02-27 21:32:55 -05:00
Brian Smith
d89b776131
change un-follow to unfollow for consistency
2014-02-27 21:31:01 -05:00
Seth Call
51f955fc74
* VRFS-1047 - broadcast widget almost fully done
2014-02-28 00:24:55 +00:00
Seth Call
dcc5437f3a
* fix import of common by custom
2014-02-27 19:22:58 +00:00
Seth Call
9d739a78f5
* remove user history before history
2014-02-27 18:51:59 +00:00
Seth Call
fd584967f2
Merge branch 'develop' oft sta bitbucket.org:jamkazam/jam-cloud into develop
2014-02-27 18:38:12 +00:00
Seth Call
aaef11add4
* VRFS-1047 - broadcasts can be listened to (but very raw). VRFS-1257 - adding back in listen_in page for admin only
2014-02-27 18:38:02 +00:00
Scott Comer
fd42fc56fe
wire up get_work
2014-02-27 10:42:47 -06:00
Scott Comer
c86433afd8
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-27 08:34:00 -06:00
Jonathan Kolyer
acd3650bca
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-27 10:44:52 +00:00
Anthony Davis
e43e31b64b
VRFS-1251 - fixed all URIs for assets except VRFS-1263
2014-02-27 23:38:21 -06:00
Jonathan Kolyer
dc212cbb9e
VRFS-1260 adjusted dialog size and button position
2014-02-27 10:44:41 +00:00
Brian Smith
a95b0fb151
VRFS-1237 fix hover bubble in musician list
2014-02-27 00:15:02 -05:00
Brian Smith
09899e8f0a
VRFS-1247 include Listen link in session emails
2014-02-27 00:00:01 -05:00
Brian Smith
f77965b851
VRFS-1239 remove dead code
2014-02-26 23:26:24 -05:00
Brian Smith
701063f865
VRFS-1239 show Click to Join link only in thick client, also prompt with terms or join request dialog as needed
2014-02-26 23:22:09 -05:00
Scott Comer
69dfca5640
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-26 21:45:08 -06:00
Scott Comer
63fdd60311
eh, added some code which i disabled
2014-02-26 21:44:49 -06:00
Brian Smith
e9e3cd886f
VRFS-1246 revert some emails back to use to field
2014-02-26 21:15:40 -05:00
Brian Smith
4588149876
VRFS-1246 bcc users on generated emails
2014-02-26 20:56:58 -05:00
Brian Smith
ca20570a16
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-26 20:56:33 -05:00
Seth Call
f433151ffb
* carrierwave needs fog
2014-02-27 00:49:16 +00:00
Seth Call
7c99c44eaf
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-27 00:38:06 +00:00
Seth Call
f0e916e736
* VRFS-1047 - looks good; no audio hooked up
2014-02-27 00:38:01 +00:00
Scott Comer
0444c1209f
take ceil of score before posting
2014-02-25 23:35:48 -06:00
Scott Comer
2a66b1ec6d
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-25 23:02:06 -06:00
Scott Comer
d12e65549d
wire up api/scoring/record
2014-02-25 23:01:55 -06:00
Brian Smith
ee0a25293d
VRFS-1235 de-dup tracks on recording hover
2014-02-25 22:04:19 -05:00
Brian Smith
c4dd04de69
fix JS error
2014-02-25 21:18:50 -05:00
Brian Smith
f6fdd13170
fix bug with session/recording hovers on landing pages
2014-02-25 21:18:12 -05:00
Brian Smith
1a2f40c3e8
reset current time when recording playback is complete
2014-02-25 20:40:35 -05:00
Brian Smith
2794a03993
VRFS-1231 de-dup instruments for the same musician
2014-02-25 20:36:45 -05:00
Seth Call
7882d65dc7
* VRFS-1165 resolved for real this time
2014-02-25 21:25:59 +00:00
Seth Call
45c61ad038
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-25 19:27:47 +00:00
Seth Call
7a41b74549
* VRFS-1228
2014-02-25 19:22:32 +00:00
Scott Comer
4e24b51fe9
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-25 08:32:13 -06:00
Brian Smith
89a5f2747e
mark test as pending
2014-02-25 07:34:23 -05:00
Brian Smith
1322f72e64
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-25 07:23:10 -05:00
Scott Comer
2163e0172f
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-25 06:17:58 -06:00
Seth Call
23301f32a3
* fixing tests, VRFS-1228 - bio create for user
2014-02-25 06:27:13 +00:00
Seth Call
686a0980e6
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-25 05:41:47 +00:00
Seth Call
7753a2d4b3
* VRFS-1228 - can add, but not update ,user biography
2014-02-25 05:41:43 +00:00
Brian Smith
e9e57c71de
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-25 00:37:13 -05:00
Brian Smith
a873ab29e7
VRFS-1231 fix user/track display on landing pages
2014-02-25 00:36:53 -05:00
Jonathan Kolyer
b36e87e29f
VRFS-733 disabled validation fail when sessions exist until tests can pass
2014-02-25 04:25:22 +00:00
Scott Comer
39b209dfc3
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-24 21:51:11 -06:00
Scott Comer
8d72f48915
get_work data model
2014-02-24 21:50:58 -06:00
Jonathan Kolyer
9d3ee833a1
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-25 03:29:38 +00:00
Jonathan Kolyer
a1a265f36f
VRFS-756 changing email invite posting behavior incrementally
2014-02-25 03:29:03 +00:00
Seth Call
051fcd8b04
* working around conn.update
2014-02-25 03:25:34 +00:00
Seth Call
cd36caf3e9
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-25 02:20:26 +00:00
Seth Call
e3c4b09c3f
* promptLeave
2014-02-25 02:20:17 +00:00
Brian Smith
586b130138
fix search rabl
2014-02-24 20:51:59 -05:00
Brian Smith
fd2ae13b17
VRFS-1230 fix Cancel button color
2014-02-24 20:50:29 -05:00
Scott Comer
82b12c5867
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-24 16:32:15 -06:00
Scott Comer
4153cfe3a1
users.locidispid must be bigint, too
2014-02-24 16:31:53 -06:00
Seth Call
25b9d8e420
* adding better error reporting to session errors
2014-02-24 21:49:38 +00:00
Scott Comer
b33206683b
merged updates
2014-02-24 15:22:26 -06:00
Scott Comer
f69cdc3b4d
fix problem with locidispid being int instead of bigint; add scores; flush use of prepared statements for geoip stuff; implement connection manager update of connection and user records with location information
2014-02-24 15:19:46 -06:00
Seth Call
a90b909ac3
* fixing account identity tests and search tests
2014-02-24 18:54:19 +00:00
Seth Call
002560a332
* fixing pending tests
2014-02-24 18:05:29 +00:00
Seth Call
e4718652fd
* merging
2014-02-24 16:57:01 +00:00
Seth Call
0522c20e60
* VRFS-1100 - can only download 100 times before 404 given for client downloads, VRFS-862 - quick change to unblock
2014-02-24 16:55:56 +00:00
Brian Smith
31c7cf7b45
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-24 01:10:20 -05:00
Brian Smith
ccee2e15b3
VRFS-1210 VRFS-1212 VRFS-1223 bug fixes
2014-02-24 01:10:09 -05:00
Jonathan Kolyer
fe5163b1fb
added active class accessor
2014-02-24 04:24:13 +00:00
Brian Smith
1e75e2ffeb
fix play button issue
2014-02-23 22:57:24 -05:00
Scott Comer
7de74f89af
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-23 21:42:23 -06:00
Brian Smith
b2718de7cf
VRFS-1223 allow unauthenticated users to view hover bubbles but hide action buttons
2014-02-23 21:05:31 -05:00
Brian Smith
69b4342731
remove puts statements
2014-02-23 21:04:02 -05:00
Jonathan Kolyer
4b91f4493c
VRFS-773 added validation check to ensure users cannot connect to multiple music sessions unless they are admin
2014-02-24 01:46:38 +00:00
Jonathan Kolyer
7ff4184731
VRFS-808 Added call to initAfterConnect from loggedIn(); added timeout to repeated attempts in case of missing WSG login ack
2014-02-23 23:49:53 +00:00
Scott Comer
810b5e7911
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-23 17:24:40 -06:00
Scott Comer
04dab677f9
model for geoiplocations
2014-02-23 17:24:25 -06:00
Jonathan Kolyer
dc0ccd102d
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-23 22:16:00 +00:00
Jonathan Kolyer
32cdd8ff43
VRFS-757 removed forgot password link
2014-02-23 22:15:45 +00:00
Anthony Davis
ad35b92d2c
VRFS-1218
2014-02-23 15:51:23 -06:00
Anthony Davis
f51626ad1a
Merge remote-tracking branch 'origin/develop' into develop
...
Conflicts:
web/spec/features/recordings_spec.rb
2014-02-23 15:49:29 -06:00
Brian Smith
15a3f71a62
fix test
2014-02-23 16:39:31 -05:00
Brian Smith
83b4260b91
VRFS-759 VRFS-1221 delete session notifications when session ends in db and sidebar, fix listen button for sessions and recordings
2014-02-23 15:47:53 -05:00
Brian Smith
0a2da28ae4
VRFS-1215 must call deliver to send emails
2014-02-23 14:08:28 -05:00
Brian Smith
f318558c4b
VRFS-1215 fix UserMailer so templates are loaded correctly
2014-02-23 13:32:03 -05:00
Brian Smith
c79c841b57
fix avatar url for session invitation popup notification
2014-02-23 13:31:18 -05:00
Brian Smith
89dd2e9254
fix JS syntax error in session landing
2014-02-23 13:29:40 -05:00
Brian Smith
a8144d4b28
show user hover bubble in sidebar only if avatar or name is hovered, not the entire row
2014-02-23 08:19:29 -05:00
Brian Smith
6c4939239e
VRFS-807 modeled after leave session dialog
2014-02-23 07:53:33 -05:00
Scott Comer
b0dfa5501f
data model for geoipblocks
2014-02-22 23:39:20 -06:00
Seth Call
bab83c91c1
* oops. def didn't mean to leave that fake backend event in
2014-02-23 05:27:49 +00:00
Seth Call
7f08e42d33
* also put promptLeave = false if the session is already over
2014-02-23 05:21:36 +00:00
Seth Call
23af96adbe
* also set promptLeave to false when BACKGROUND_MOVE indicated VRFS-846
2014-02-23 05:15:26 +00:00
Seth Call
df36417551
* VRFS-846 is likely handled; but can't test on mac due to bugs; going to try windows shortly
2014-02-23 05:04:04 +00:00
Seth Call
bc3d1a6231
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-23 04:41:49 +00:00
Seth Call
f119007c86
* VRFS-1219 - don't show prompt if leaving session from the add audio gear dialog
2014-02-23 04:41:42 +00:00
Scott Comer
57d2dff00b
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-22 22:00:44 -06:00
Scott Comer
74fc2f1b48
data model for jamisp table
2014-02-22 22:00:32 -06:00
Anthony Davis
4ef19e4356
VRFS-1218 DRYing it slightly, move toward VRFS-1214
2014-02-22 21:12:12 -06:00
Anthony Davis
1397c86daa
VRFS-1218 fixing recordings specs that do a Leave Session
2014-02-22 21:03:27 -06:00
Seth Call
de24ba15bc
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-23 02:26:33 +00:00
Seth Call
acf8f84624
VRFS-1172 - easydropdown plugin thinkns client has touch support... but it doesn't
2014-02-23 02:26:19 +00:00
Anthony Davis
afa49f2a41
Merge remote-tracking branch 'origin/develop' into develop
2014-02-22 16:38:25 -06:00
Anthony Davis
6fa96365b1
Music Session spec failing on build server
2014-02-22 16:37:58 -06:00
Brian Smith
53ac75c0e7
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-22 13:44:44 -05:00
Brian Smith
a2307e16b7
VRFS-658 warn user when navigating away from session
2014-02-22 13:43:11 -05:00
Seth Call
2acecc5dea
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-22 17:34:26 +00:00
Seth Call
f2e97625b4
* VRFS-729 - reset FTUE after Add new audio gear selected
2014-02-22 17:34:17 +00:00
Anthony Davis
22535ffbfb
VRFS-457 - whacking F/C/N characters in sidebar
2014-02-22 11:02:14 -06:00
Seth Call
5c9a75b466
* pending out the one broken websocket test.
2014-02-22 15:27:04 +00:00
Seth Call
51ad34d611
* VRFS-99 - hide chat for now
2014-02-22 08:43:34 +00:00
Seth Call
f1908627aa
* VRFS-621 - help icons hidden
2014-02-22 08:22:01 +00:00
Seth Call
a42d750b30
* VRFS-468 - hiding any pages not needed for production appropriately
2014-02-22 07:46:41 +00:00
Seth Call
db6dfe38b9
* fix linebreak in css
2014-02-22 07:22:23 +00:00
Seth Call
7704611d39
* VRFS-800 - client update is a proper dialog; and added concept of 'topmost' to force a certain dialog to the top
2014-02-22 07:20:53 +00:00
Seth Call
6c106989a6
* fixing websokcet test
2014-02-22 06:53:05 +00:00
Seth Call
3da1a89f2c
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-22 06:30:12 +00:00
Seth Call
ab2d8c4f8a
* VRFS-1213 - work arounds for postgis migrations
2014-02-22 06:29:39 +00:00
Scott Comer
d61522491f
fixed problem with not null violation in connection construction in factory
2014-02-21 23:48:47 -06:00
Seth Call
b5934bba30
* merging in from scoring cache migrations
2014-02-22 05:11:40 +00:00
Seth Call
dae0f40929
* removed is_downloadable for VRFS-1141, from database and UI
...
* what's next dialog has icheck-styled checkbox now VRFS-913
* facebook invitations hooked up for VRFS-1121
2014-02-22 05:09:39 +00:00
Scott Comer
42b17dc1f5
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-21 22:21:53 -06:00
Scott Comer
4a9330523c
*** scoring schema migration
2014-02-21 22:21:31 -06:00
Seth Call
5ef992f881
* VRFS-1208; dropdowns close now
2014-02-22 03:14:07 +00:00
Seth Call
20436ea846
Merge branch 'develt pushop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-22 02:56:49 +00:00
Seth Call
1c23b107e8
* fix broken user progression test now that new ftue is used for audio profile
2014-02-22 02:56:40 +00:00
Brian Smith
b2112a2118
VRFS-1188 VRFS-1189 fix playback issue
2014-02-21 20:43:53 -05:00
Brian Smith
fde077e72e
correct pause button
2014-02-21 20:12:50 -05:00
Seth Call
dbf350c528
* merging in ftue help article change
2014-02-21 22:04:04 +00:00
Seth Call
8ee250d550
* VRFS-560, VRFS-898, VRFS-597, VRFS-1153, VRFS-1154 - all ftue related fixes and improvements in user behavior. make new ftue show up everywhere instead of new ftue
2014-02-21 22:02:51 +00:00
Seth Call
abfba1ac37
* tweak build file
2014-02-21 20:45:12 +00:00
Brian Smith
65f529fb12
fix nil reference exception
2014-02-21 09:42:27 -05:00
Brian Smith
b8d7453eda
VRFS-793 alert user and prevent session join if there is no valid audio config
2014-02-20 23:15:23 -05:00
Brian Smith
41e103a71f
VRFS-1011 fix broken link
2014-02-20 22:52:10 -05:00
Brian Smith
b9641a1e67
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-20 22:47:09 -05:00
Brian Smith
4afac4bb64
VRFS-845 handle backend alerts
2014-02-20 22:46:54 -05:00
Daniel Weigh
8b64323bd7
VRFS-611 move avatar to left col.
2014-02-20 22:00:22 -05:00
Scott Comer
9d5958175b
* merged
2014-02-20 20:40:22 -06:00
Scott Comer
451976aabd
integrate scoring stubs work, worklist, and record
2014-02-20 20:30:40 -06:00
Brian Smith
84f8d7b23f
hide play button if audio is not available
2014-02-20 21:10:30 -05:00
Brian Smith
fc004ea914
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-20 21:02:52 -05:00
Brian Smith
73dce2906d
fix issue with recording url construction
2014-02-20 21:02:41 -05:00
Daniel Weigh
4e659813ef
VRFS-611 wrapping of instruments in profile page
2014-02-20 20:48:11 -05:00
Brian Smith
f85f0fa956
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-20 20:46:54 -05:00
Brian Smith
c619d867ef
re-enable test
2014-02-20 20:46:33 -05:00
Brian Smith
2369aa80a8
VRFS-1188 VRFS-1189 check if audio paths exist
2014-02-20 20:46:09 -05:00
Daniel Weigh
fa1e554bf7
VFRS-1197 FAQ link
2014-02-20 20:13:13 -05:00
Daniel Weigh
6806b2ebcd
VRFS-1203 fix path to asset
2014-02-20 19:52:21 -05:00
Jonathan Kolyer
cb40419f76
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-21 00:32:38 +00:00
Jonathan Kolyer
91b05073d1
VRFS-684 added selection of first entry by default to support Enter key
2014-02-21 00:32:23 +00:00
Seth Call
27afed64dc
* adding code to try web tests 2x if a hang is detected
2014-02-20 23:22:31 +00:00
Seth Call
a6b3abdc3a
* VRFS-1200 - api for toggling favorite is done
2014-02-20 22:56:00 +00:00
Seth Call
f3c09f65c2
* allowing tests to be skipped, and mostly done with VRFS-1200
2014-02-20 22:23:44 +00:00
Seth Call
1472944648
* fixnig feed tests
2014-02-20 21:09:41 +00:00
Seth Call
9ca1149daf
* fix accidental typo in hover-recording
2014-02-20 20:59:50 +00:00
Seth Call
aab902e8cf
* VRFS-1160 - favorites REST API done
2014-02-20 20:54:35 +00:00
Seth Call
061c74f8c6
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-20 16:28:45 +00:00
Seth Call
f353c04900
* VRFS-1135 - add unique_user_histories to MusicUserHistory, and render that in feed
2014-02-20 16:20:20 +00:00
Jonathan Kolyer
e0ae2e378e
VRFS-1194 changed recording/session drop-down list selection to unique ID text input
2014-02-20 10:01:25 -06:00
Jonathan Kolyer
b281349bec
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-20 09:11:44 -06:00
Jonathan Kolyer
d831cae7c7
VRFS-1193 fixed landing page promo buzz image display
2014-02-20 09:07:59 -06:00
Seth Call
cf75da7774
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-20 14:16:36 +00:00
Seth Call
c285734bb4
* remove whitespace
2014-02-20 14:16:24 +00:00
Brian Smith
98178b28f2
VRFS-1189 fix bug
2014-02-20 08:40:28 -05:00
Brian Smith
eed5c74835
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-20 08:38:46 -05:00
Brian Smith
e8e224dbaa
VRFS-1189 music session playback
2014-02-20 08:38:36 -05:00
Seth Call
db15c37a53
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-20 08:03:02 +00:00
Seth Call
cda7ef8ce9
* revert back spec_helper
2014-02-20 08:02:50 +00:00
Seth Call
1940e6d8ff
* VRFS-1135 a few more tests in controller for user and band targetting
2014-02-20 08:01:18 +00:00
Seth Call
df14676495
* VRFS-1135 - user and band targetting possible
2014-02-20 07:45:51 +00:00
Brian Smith
f37e7de42e
VRFS-1188 remove hard-coded audio source / reset slider when playback is complete
2014-02-20 02:07:09 -05:00
Brian Smith
e92cf83035
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-20 02:03:20 -05:00
Brian Smith
1ecc21fd9c
VRFS-1188 play/pause for recording landing page
2014-02-20 02:03:00 -05:00
Daniel Weigh
ca64966c7f
* duplicate entry
...
$ bundle exec rails server
Your Gemfile lists the gem bcrypt-ruby (= 3.0.1) more than once.
You should probably keep only one of them.
While it's not a problem now, it could cause errors if you change the
version of just one of them later.
2014-02-20 00:30:25 -05:00
Daniel Weigh
069e9c8297
VRFS-1135 allow empty string to be passed in to start parameter
...
(due to jQuery not stripping null / empty params and refactor)
2014-02-20 00:29:28 -05:00
Brian Smith
85f8bf6cad
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-19 22:48:47 -05:00
Brian Smith
956ff422f4
fix sidebar for recordings
2014-02-19 22:48:34 -05:00
Seth Call
3efb3fc5ab
* feed test fixes
2014-02-20 03:23:38 +00:00
Seth Call
455ddecaaa
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-20 02:28:31 +00:00
Seth Call
6aae1ef0e6
* VRFS-1135 add time filters and type filter
2014-02-20 02:22:41 +00:00
Brian Smith
9bd673e67d
VRFS-1185 fix piano and upright bass icons
2014-02-19 21:07:03 -05:00
Brian Smith
76d8e84a62
check for empty comment before posting
2014-02-19 20:35:34 -05:00
Brian Smith
c95a650cdc
add POST button to landing pages for comments, add like_count back to session model
2014-02-19 20:31:44 -05:00
Brian Smith
f388f1c7e2
add likes and play count back to model...not sure how it got deleted
2014-02-19 20:06:40 -05:00
Brian Smith
238fba1fc3
fix bug with recording link/hover bubble in landing page sidebar
2014-02-19 20:04:06 -05:00
Seth Call
857dd27404
* VRFS-1191, VRFS-1120, VRFS-1079, VRFS-1087, VRFS-1190, VRFS-1192--many band page changes, fixes. small fix for notification icons showing orange circle if icon_url not specified
2014-02-19 22:56:13 +00:00
Seth Call
b7e07760ff
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-19 15:28:50 +00:00
Seth Call
b21fcd74b2
* allow duration to be specified
2014-02-19 15:15:55 +00:00
Brian Smith
4e117745e2
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-19 01:27:32 -05:00
Brian Smith
7a96a0e48e
VRFS-1058 fix Join link issue and fix Listen link
2014-02-19 01:27:18 -05:00
Seth Call
266af4bc15
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-19 05:38:32 +00:00
Seth Call
d5b7ec1a9b
* focus email when you open signin dialog
2014-02-19 05:37:25 +00:00
Brian Smith
b8a4b823d0
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-19 00:14:10 -05:00
Brian Smith
fb1adc488f
VRFS-1184 fix join
2014-02-19 00:14:00 -05:00
Seth Call
665ec9b395
* remove debug log
2014-02-19 04:53:22 +00:00
Seth Call
d5310d21bd
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-19 04:44:12 +00:00
Seth Call
2905245f1a
* VRFS-1181 - upright bass in the mix
2014-02-19 04:40:37 +00:00
Anthony Davis
6614974a07
Merge remote-tracking branch 'origin/develop' into develop
2014-02-18 18:54:50 -06:00
Anthony Davis
393091eba0
VRFS-1178 - nudging Latest container up
2014-02-18 18:54:27 -06:00
Seth Call
6a5c607fed
* remove javascript_include to avoid precompiled error VRFS-1175
2014-02-18 23:43:53 +00:00
Seth Call
9a043148d6
* remove javascript_include to avoid precompiled error VRFS-1175
2014-02-18 23:16:32 +00:00
Seth Call
0c44842bb0
* VRFS-1173 - audio/mpeg instead of audio/mp3 in postback
2014-02-18 22:58:15 +00:00
Seth Call
e3d34fb7b2
* VRFS-1171 - forgot join_music_session is called twice
2014-02-18 22:43:21 +00:00
Seth Call
4e674b312c
* VRFS-1171 - resolved by moving notification out of transaction
2014-02-18 22:35:23 +00:00
Seth Call
0e145089b5
* move styles to css
2014-02-18 20:44:27 +00:00
Seth Call
72d19e0f48
* easydropdown-ing the dropdowns in session settings dialog
2014-02-18 20:38:41 +00:00
Seth Call
18988c05fd
* VRFS-1170 - default to public-ish settings
2014-02-18 20:32:54 +00:00
Seth Call
5a9ff8b10e
* fixing feed tests
2014-02-18 20:24:45 +00:00
Seth Call
ec0eb4bb2a
* VRFS-1140
2014-02-18 20:12:50 +00:00
Seth Call
7449de7aad
* fix test bugs, get VRFS-1135 sorts resolved, and fix for easydropdown not destroying topmost div
2014-02-18 18:53:16 +00:00
Seth Call
e33e3a519f
* fix url problem with tracks
2014-02-18 15:35:47 +00:00
Seth Call
de294d19bb
* VRFS-1135; music session history has creator, participants, and band info now.
2014-02-18 14:24:32 +00:00
Seth Call
5b44b05885
* adding in user info on claimed recording
2014-02-18 13:45:40 +00:00
Seth Call
3ca1744c27
* VRFS-1135 make plays and recordings and sessions unique for user/model combo
2014-02-18 13:40:13 +00:00
Seth Call
4808514032
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-18 13:35:11 +00:00
Seth Call
222bf23cc5
* VRFS-1135 sorts added to model; need to change next behavior to come from model, not controller
2014-02-18 13:34:51 +00:00
Jonathan Kolyer
15f60d8b4f
changed SessionSetConnectionStatusRefreshRate default to 1000 milliseconds
2014-02-18 01:31:33 -06:00
Jonathan Kolyer
3b8e564495
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-18 01:27:40 -06:00
Jonathan Kolyer
6dc6d1b52d
VRFS-1110 fixed selection behavior and styling for autocomplete
2014-02-18 01:27:02 -06:00
Brian Smith
c196ad8711
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-18 02:25:06 -05:00
Brian Smith
a471e67a84
VRFS-1030 fix menu hover sensitivity
2014-02-18 02:24:56 -05:00
Daniel Weigh
bb68fbf596
VRFS-1028 - Fixed an issue where a user has no instruments.
...
This is probably an edge case, but Test User (id: 1) has no instruments,
so this was not rendering and throwing a javascript error.
2014-02-18 02:15:44 -05:00
Daniel Weigh
b919dbadd8
VRFS-1136 - fix / tweak infinite scroll
...
on band and musicians page.
2014-02-18 02:09:31 -05:00
Jonathan Kolyer
b822711f1d
Merge branch 'develop' into vrfs1110
2014-02-18 00:13:26 -06:00
Jonathan Kolyer
98f358d970
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-18 00:12:53 -06:00
Jonathan Kolyer
0b9eec4823
fixed broken tests again
2014-02-18 00:12:47 -06:00
Brian Smith
61a745398e
VRFS-1132 fix visual issues on create session screen
2014-02-18 01:01:14 -05:00
Jonathan Kolyer
cba678616f
fixed broken test from refactoring of followers
2014-02-17 23:38:35 -06:00
Brian Smith
95519dc450
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-18 00:33:24 -05:00
Brian Smith
8a1308381b
VRFS-1133 fix issue with musician and fan access dropdowns
2014-02-18 00:33:16 -05:00
Seth Call
89559aa456
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-18 04:54:45 +00:00
Seth Call
d6149a3908
* pin rails to 3.x
2014-02-18 04:54:33 +00:00
Anthony Davis
2262c5f3d1
VRFS-1163 - adding slight padding
2014-02-17 22:31:34 -06:00
Seth Call
36257a98b7
Merge branch t push'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-18 03:42:52 +00:00
Seth Call
8483239054
* pg_migrate bump to 0.1.13 with relaxed thor version
2014-02-18 03:42:42 +00:00
Brian Smith
ca1c22c058
VRFS-1147 fix genre selection in session settings
2014-02-17 22:39:44 -05:00
Brian Smith
e535d0401d
VRFS-546 use session settings to preselect band on create session
2014-02-17 22:00:57 -05:00
Brian Smith
5a4a097539
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-17 21:22:59 -05:00
Brian Smith
43cc811849
VRFS-680 change Mix label to Monitor
2014-02-17 21:22:29 -05:00
Seth Call
c21d0ea0ba
* fixnig anothec laimed recording test
2014-02-18 00:48:47 +00:00
Seth Call
26725e1c9b
* fix one claimed_recording test
2014-02-18 00:46:33 +00:00
Seth Call
e5c6ba0c76
* gah left in bad file in manifest
2014-02-18 00:02:31 +00:00
Seth Call
b9e20ba446
* moving recording_plays to where it belongs
2014-02-17 23:56:17 +00:00
Seth Call
51d446ab62
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-17 23:26:58 +00:00
Seth Call
4f964a7294
* VRFS-1135 baby steps to play storting
2014-02-17 23:26:53 +00:00
Seth Call
5654f27b55
* merged
2014-02-17 23:26:17 +00:00
Seth Call
0218ca5ad6
* urls fixed for VRFS-1148
2014-02-17 19:12:52 +00:00
Seth Call
eaecdf7de8
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-17 04:10:30 +00:00
Seth Call
5ae2a769b5
* fix mix regressions due to addition of MixUploader
2014-02-17 03:56:42 +00:00
Daniel Weigh
a82a295123
Update utils to new mapping.
...
Commit: e24cdab262 [e24cdab ]
Parents: 348f96f5b0
Author: Brian Smith <briansmith@jamkazam.com>
Date: February 16, 2014 at 9:47:42 PM EST
2014-02-16 22:16:04 -05:00
Seth Call
408a1fd857
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-17 02:52:15 +00:00
Seth Call
134974af61
* fix issue
2014-02-17 02:52:00 +00:00
Brian Smith
1620845371
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-16 21:47:58 -05:00
Brian Smith
e24cdab262
rename vocals icon to fix bug
2014-02-16 21:47:42 -05:00
Daniel Weigh
9c52eea162
* cleanup and a comment to revisit
2014-02-16 20:28:26 -05:00
Seth Call
ff6b3795ce
* merged
2014-02-17 00:32:51 +00:00
Seth Call
5ef630cf86
* in progress on next parameter VRFS-1135
2014-02-17 00:30:08 +00:00
Brian Smith
348f96f5b0
fix bugs
2014-02-16 17:39:26 -05:00
Brian Smith
83f347e84c
merge like/follow refactor and hover bubble work
2014-02-16 16:03:32 -05:00
Brian Smith
ebc49b6ccc
VRFS-1028 more refactor work
2014-02-16 14:48:54 -05:00
Seth Call
82ab90f007
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-16 18:32:47 +00:00
Seth Call
812c1cdc4b
* VRFS-1135 add pagination. affects the structure of the API. will update doc shortly. Also removed wtf log in VRFS-1143
2014-02-16 18:32:32 +00:00
Anthony Davis
60364f3f47
VRFS-1143 - whacking "wtf" message
2014-02-16 12:26:52 -06:00
Brian Smith
a1828cd93d
trying to fix tests
2014-02-16 13:06:36 -05:00
Daniel Weigh
bf9e26ae3f
* ignore vendor/* (bundle|cache) -- any issues with this, feel free
...
to revert
2014-02-16 11:18:03 -05:00
Seth Call
8cfe032dc2
* adding error info to debug VRFS-1140 and pagination in progress on VRFS-1135
2014-02-16 14:04:24 +00:00
Seth Call
8b7761f98f
* adding empty gif to pass tests
2014-02-16 13:49:02 +00:00
Brian Smith
5ba98b93ab
fixing tests in progress
2014-02-16 08:40:03 -05:00
Seth Call
f7d0ef2b05
* VRFS-1135 only one recording comes back; not per claimed recording
2014-02-16 13:10:00 +00:00
Jonathan Kolyer
4dd15d1146
Merge branch 'develop' into vrfs1110
2014-02-16 02:32:53 -06:00
Jonathan Kolyer
cddf9a5013
added active_latests convenience method
2014-02-16 02:31:44 -06:00
Jonathan Kolyer
be7b423426
VRFS-1110 autocompletion ui tweaks
2014-02-16 02:10:17 -06:00
Jonathan Kolyer
a168434edf
VRFS-1110 enabled friend-input search box
2014-02-16 01:35:33 -06:00
Jonathan Kolyer
0c6cb063e3
VRFS-1110 upgrading to latest version
2014-02-16 01:34:47 -06:00
Jonathan Kolyer
37025a68d7
VRFS-1110 changed param name; added api request support
2014-02-16 01:28:39 -06:00
Brian Smith
36287d0b5f
VRFS-1028 hover bubble / like and follow refactor
2014-02-16 02:28:35 -05:00
Jonathan Kolyer
a7ceab114c
VRFS-1110 added session invite search requests
2014-02-16 01:15:24 -06:00
Jonathan Kolyer
b0dcb4a934
VRFS-1110 add autocomplete tests
2014-02-16 00:17:56 -06:00
Seth Call
06a9dde2c2
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-16 03:38:13 +00:00
Seth Call
ac677ebdf1
* adding sample data building to create a recording with a mix. VRFS-1135
2014-02-16 03:37:54 +00:00
Brian Smith
c173582aa3
more work on like/follow refactor
2014-02-15 20:24:51 -05:00
Jonathan Kolyer
9b9fd789d2
merge conflict
2014-02-15 18:35:18 -06:00
Jonathan Kolyer
cd3b57ef45
changed redirect to use route paths
2014-02-15 18:33:41 -06:00
Brian Smith
c03404d520
like/follow refactor
2014-02-15 18:23:00 -05:00
Daniel Weigh
ab630474d8
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-15 17:58:41 -05:00
Seth Call
da090bd1a9
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-15 21:33:04 +00:00
Daniel Weigh
250a523228
* ignore vendor/* (bundle|cache|etc) -- any issues with this, feel free
...
to revert
2014-02-15 16:21:37 -05:00
Seth Call
f5268c43fc
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-15 21:21:25 +00:00
Seth Call
26a8b8013d
* VRFS-1135 - initial implementation with no ways to control the returned results. it just returns most recent to oldest now, with a max of 20
2014-02-15 21:19:03 +00:00
Daniel Weigh
6124cb20fb
VFRS-1047 Implement the new landing page.
...
Carousel in place -- edit slides in users_controller.erb.
At some point, should probably migrate to admin db.
Minor rework to make user/* (web.erb) pages appear correctly in firefox
-- float issues.
Buzz should work (may need some styling)
Latest is stubbed out.
2014-02-15 16:11:06 -05:00
Daniel Weigh
18deb7b13a
* fix admin redirect
2014-02-15 15:55:58 -05:00
Daniel Weigh
7ac51c7cbf
VRFS-931 Band tweaks
...
fix for wrapping instruments
2014-02-15 15:06:07 -05:00
Brian Smith
5a03ec87ae
follow/like refactor to use polymorphic associations
2014-02-15 11:55:01 -05:00
Seth Call
865d8c17b6
* VRFS-1121 - set dropdown size to 7
2014-02-15 14:24:08 +00:00
Seth Call
7dd0751409
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-14 23:10:51 -06:00
Seth Call
9f7dfa4fcc
* adding in piano to list of instruments
2014-02-14 23:10:39 -06:00
Seth Call
c02bc4e872
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-15 04:22:59 +00:00
Seth Call
0300306e1d
* VRFS-1130 - found issue where postback wasn't using ENV['RAILS_RELATIVE_URL_ROOT']
2014-02-15 04:22:48 +00:00
Daniel Weigh
614547a9dd
VRFS-1123 Text wrapping.
2014-02-14 19:06:38 -05:00
Seth Call
0fbd3543ca
* VRFS-1118 fix hidden text problem
2014-02-14 23:41:01 +00:00
Seth Call
694a57bb4a
* VRFS-1119 - GA variable not prefixed correctly
2014-02-14 13:27:31 -06:00
Seth Call
84ce286588
* fixing test. no such thing as find\!
2014-02-14 12:04:02 -06:00
Seth Call
f0cb73e842
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-14 11:59:30 -06:00
Seth Call
f86d0643eb
* remove dup haml-rails
2014-02-14 11:59:28 -06:00
Jonathan Kolyer
fb3beb3859
VRFS-580 set default SessionSetConnectionStatusRefreshRate to 3 seconds
2014-02-14 08:07:24 -06:00
Jonathan Kolyer
80b042a637
Merge branch 'develop' into vrfs580
2014-02-14 08:06:51 -06:00
Jonathan Kolyer
835d5a24a0
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-14 06:55:53 -06:00
Jonathan Kolyer
ebbe0c3752
VRFS-725 removed the remember_me checkbox if the client is active
2014-02-14 06:55:42 -06:00
Jonathan Kolyer
470150c661
VRFS-580 added calls to SessionSetConnectionStatusRefreshRate for client csTimer
2014-02-14 02:36:10 -06:00
Brian Smith
c0f91bb8d1
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-14 02:17:46 -05:00
Brian Smith
71385eda04
VRFS-1028 add like / share functionality to session / recording hover bubbles
2014-02-14 02:17:36 -05:00
Daniel Weigh
6186e20251
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-14 01:01:37 -05:00
Daniel Weigh
5d8fac92c6
* fix admin redirect
2014-02-14 01:01:09 -05:00
Seth Call
4d1f24e606
* gon has issue fixed
2014-02-13 23:26:53 -06:00
Daniel Weigh
b704186e9a
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-14 00:07:42 -05:00
Daniel Weigh
1834f72662
VRFS-294
...
fix for box-sizing in Firefox.
2014-02-13 23:39:00 -05:00
Seth Call
0d6c8a94e6
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-13 22:11:45 -06:00
Seth Call
9e561c047a
* VRFS-1103 - coverage for all projects. need to figure out how to merge all
2014-02-13 22:11:30 -06:00
Daniel Weigh
6b8f00d103
VRFS-294
...
fix for box-sizing in Firefox.
2014-02-13 22:09:05 -05:00
Brian Smith
ca15275a4f
fix bug
2014-02-13 22:03:59 -05:00
Brian Smith
c8f7141c13
Merge branch 'feature/hover_bubbles' into develop
2014-02-13 20:52:47 -05:00
Brian Smith
f6aaa3dcbd
VRFS-1028 session / recording hover bubbles
2014-02-13 20:50:56 -05:00
Seth Call
108a9564b6
* adding band create error reporting, better styling of 500 errors, and upping region size
2014-02-13 22:57:48 +00:00
Seth Call
b534a1e757
* trying rcov formatter for jenkins integration (VRFS-1103)
2014-02-13 21:17:47 +00:00
Seth Call
d20713144e
* VRFS-1062 - mostly done. l2m there is an open question on before moving on
2014-02-13 20:17:16 +00:00
Brian Smith
eb15b1843b
VRFS-1028 session/recording hover work
2014-02-13 14:55:55 -05:00
Seth Call
fa37549482
* VRFS-1096 - register volume change callbacks when page loads
2014-02-13 18:54:54 +00:00
Seth Call
240967f7ce
* VRFS-1098 - fixed case where registering as a musician in the native interface sends you to downloads (goofy). Also refactoder is_native_client? into a helper
2014-02-13 18:27:38 +00:00
Seth Call
763538e136
* VRFS-1095 fixing copy-to-clipboard for share dialog in native client.
2014-02-13 17:51:51 +00:00
Seth Call
5ba4e97dca
* VRFS-1089 - jamadmin creation of recordings done
2014-02-13 16:41:50 +00:00
Seth Call
69523e0e07
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-13 14:19:29 +00:00
Seth Call
52f9bde0a3
* taking gon to 5.0.1 for now
2014-02-13 14:19:08 +00:00
Brian Smith
0a94f73d08
VRFS-1028 add hover bubbles throughout app
2014-02-12 23:40:41 -05:00
Brian Smith
aac29c3547
VRFS-1028 band hover bubble
2014-02-12 03:12:30 -05:00
Brian Smith
4265ef50b7
VRFS-1028 musician hover bubble
2014-02-12 01:35:44 -05:00
Jonathan Kolyer
fba4e53093
VRFS-1037 reverted redirect path on create/update
2014-02-11 21:05:09 -06:00
Jonathan Kolyer
479b05c67b
VRFS-1037 fixed redirect path on create/update
2014-02-11 21:02:51 -06:00
Jonathan Kolyer
3ed657f815
VRFS-1037 fixed redirect path on create/update
2014-02-11 21:01:06 -06:00
Seth Call
a732d2a191
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-11 17:26:30 +00:00
Seth Call
0f0521ccf8
* VRFS-152-replace localhost with 127.0.0.1, if present
2014-02-11 17:25:03 +00:00
Seth Call
652c56dafd
* VRFS-924 haml added
2014-02-11 15:53:20 +00:00
Seth Call
c60322aaf4
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-11 15:52:39 +00:00
Seth Call
184ac3e834
* VRFS-924 haml added
2014-02-11 15:52:18 +00:00
Brian Smith
bca7f33400
VRFS-1028 hover bubble work
2014-02-10 23:08:40 -05:00
Anthony Davis
000678f45e
VRFS-1029 - updating copyright
2014-02-10 19:52:06 -06:00
Seth Call
dc462d804d
* VRFS-982 - style with custom easydropdown instead of select element
2014-02-10 22:43:09 +00:00
Jonathan Kolyer
3efe5ab575
VRFS-152 a couple of minor code tweaks before closing this ticket out
2014-02-10 12:12:03 -06:00
Anthony Davis
ce9c379853
VRFS-1099 - modfying Buzz/Latests creation
2014-02-11 20:35:24 -06:00
Jonathan Kolyer
d47d007895
Merge branch 'vrfs152' into develop
2014-02-10 11:54:55 -06:00
Jonathan Kolyer
8a469e4943
VRFS-152 fixed sharing with FB auth in place
2014-02-10 11:54:19 -06:00
Brian Smith
c1dd3eea75
VRFS-1028 hover bubble work
2014-02-10 08:03:29 -05:00
Seth Call
a5d29cc8aa
* fix (sign-in) state problem with fb login
2014-02-09 22:39:42 +00:00
Seth Call
2934755d46
* fix (sign-in) state problem with fb login
2014-02-09 22:39:18 +00:00
Seth Call
524ef6d833
* left in typo right before commit
2014-02-08 03:09:25 +00:00
Seth Call
b90bfe97ec
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-08 03:07:56 +00:00
Seth Call
fa7f83a371
* VRFS-1090 all_discarded add to db schema
2014-02-08 03:05:16 +00:00
Jonathan Kolyer
966075c885
VRFS-1034 fixed image uploading for buzz; added UI text instructing user to upload image before editing text
2014-02-07 20:26:17 -06:00
Seth Call
64de2bc4cb
* VRFS-980 - escape special characters in the filename of the avatar
2014-02-07 23:56:39 +00:00
Seth Call
12d294f62f
* fix typo in production config
2014-02-07 22:26:27 +00:00
Seth Call
afbe4c09c2
* VRFS-1084-notify working on web layout
2014-02-07 21:44:57 +00:00
Seth Call
ff9f132341
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-07 21:28:56 +00:00
Seth Call
7661fc5e39
* VRFS-1082 and VRFS-1083 - centralize facebook logic for invitationDialog, and add twitter integration into share dialog
2014-02-07 21:28:47 +00:00
Seth Call
b648c40587
* merged
2014-02-07 17:38:51 +00:00
Seth Call
e8fe86e504
* VRFS-1083 user_authorizations require user now; found some bugs
2014-02-07 17:18:57 +00:00
Seth Call
7cf866b4b8
* merged
2014-02-07 14:11:24 +00:00
Seth Call
b668e54f57
* VRFS-1083 - twitter mostly working; need to deal with edge cases
2014-02-07 14:07:08 +00:00
Brian Smith
f7e4a49fa9
VRFS-1020 share dialog
2014-02-07 02:14:34 -05:00
Brian Smith
003b5f8d33
VRFS-1020 display share URL on dialog
2014-02-07 00:57:31 -05:00
Brian Smith
db21415b7b
remove space
2014-02-06 20:44:43 -05:00
Seth Call
47694c5f52
* adding tests for share_resolver
2014-02-06 21:53:19 +00:00
Seth Call
7e1d5c1e4e
* fixing controller
2014-02-06 21:44:49 +00:00
Seth Call
1c6c1da027
* fixing associations
2014-02-06 21:41:35 +00:00
Seth Call
28c2298931
* removing set of shareable_id
2014-02-06 21:12:40 +00:00
Seth Call
9598c06e1f
* moved shareable_resolver into new controller, and made tests
2014-02-06 21:02:04 +00:00
Jonathan Kolyer
bf04986e25
VRFS-1033 changed column names from {short,long}_text to Who/Quote
2014-02-06 13:07:32 -06:00
Seth Call
caa565470d
* VRFS-1081 - restyle share dialog
2014-02-06 18:59:19 +00:00
Seth Call
4c39e45708
* merged
2014-02-06 16:35:33 +00:00
Seth Call
36bc5cb72d
* adding in new logos
2014-02-06 16:32:04 +00:00
Seth Call
17961e676d
* VRFS-1077 done
2014-02-06 16:31:52 +00:00
Daniel Weigh
ac8913c027
VRFS-294
...
Updates to the band profile page
2014-02-06 08:11:20 -05:00
Daniel Weigh
dddfb50c45
VRFS-1012 Fix band profile navigation.
...
forgot a file
2014-02-06 08:07:31 -05:00
Daniel Weigh
77e7b60ca5
VRFS-1012 Fix band profile navigation.
2014-02-06 08:03:44 -05:00
Brian Smith
bc305cac5e
VRFS-1020 fix share token design
2014-02-06 00:45:48 -05:00
Seth Call
10573fd37a
* merged
2014-02-05 11:20:18 +00:00
Seth Call
ee67bb59b2
* fail on error
2014-02-05 11:14:07 +00:00
Brian Smith
3f9bb9bdad
VRFS-1020 share dialog work
2014-02-05 02:15:55 -05:00
Brian Smith
fbba95856d
VRFS-1020 share dialog work
2014-02-05 01:51:26 -05:00
Seth Call
195c5fea7e
* oops; missing comma for ogg url'
2014-02-05 03:18:17 +00:00
Seth Call
eadeb5888f
* working on fb integration
2014-02-05 03:17:19 +00:00
Seth Call
0d0ed1de5e
* fix share-dialog name
2014-02-05 02:17:52 +00:00
Seth Call
f86d7fbdd5
* deal with chuid differently so pre-script works
2014-02-05 02:13:41 +00:00
Seth Call
a43399a95d
* more error handling
2014-02-05 02:12:38 +00:00
Seth Call
badeb5ba70
* fix syntax error
2014-02-05 01:58:11 +00:00
Seth Call
669e8e2862
Merge branch 'feature/share_dialog' of bitbucket.org:jamkazam/jam-cloud into feature/share_dialog
2014-02-05 01:55:55 +00:00
Seth Call
ca7a69a465
* working on checkboxes
2014-02-05 01:55:51 +00:00
Brian Smith
11fbcc96e7
merge develop
2014-02-04 20:23:08 -05:00
Brian Smith
9e72e6510a
merge develop
2014-02-04 20:21:24 -05:00
Seth Call
52f783f70e
* fixing another issue with recording id vs claimed recording id
2014-02-04 23:21:34 +00:00
Seth Call
0f29d020a9
* oops fixed a typo in recording reorg
2014-02-04 23:17:38 +00:00
Seth Call
c1bee157dd
* refactor recordings in the same way
2014-02-04 23:15:12 +00:00
Seth Call
ea48b6aa36
* reorging music session page to have most code in JS file
2014-02-04 23:09:13 +00:00
Seth Call
fe0c4a374d
* adding 'extra_js' block to web layout
2014-02-04 23:00:11 +00:00
Seth Call
a25ccf5ced
* fixing typo in @music_sessions variable
2014-02-04 22:45:37 +00:00
Seth Call
4549282f0d
* trying no-https rubygems for a bit, see if it helps build
2014-02-04 21:53:37 +00:00
Seth Call
11c5c8723b
* changing url to mp3_url and ogg_url in rabls
2014-02-04 21:49:33 +00:00
Seth Call
636ca9b891
* VRFS-1076 - fix for leave session being broken
2014-02-04 21:45:34 +00:00
Seth Call
8c1e2c5df6
* backend handles these notfications already VRFS-1067
2014-02-04 21:21:51 +00:00
Seth Call
dab9063fb9
* backend handles these notfications already VRFS-1067
2014-02-04 21:20:30 +00:00
Seth Call
148009ece5
* VRFS-1018 - audiomixer ruby runner generates an mp3 with metadata using ffmpeg
2014-02-04 20:28:00 +00:00
Seth Call
9ce300db56
* fix for welcome.js not being in assets
2014-02-04 19:10:31 +00:00
Seth Call
9526be15ad
* finish renaming back ShareDialog
2014-02-04 18:25:53 +00:00
Seth Call
103954cb96
* VRFS-1074 - create run folders for pids on every upstart start
2014-02-04 18:18:15 +00:00
Seth Call
389b6d5635
* rename it all back to Sharedialog
2014-02-04 18:04:12 +00:00
Seth Call
ff8eea553f
* finish rename of ShareDialog to ShareSessionDialog
2014-02-04 17:28:49 +00:00
Seth Call
ae8b6ebbc7
* renaming all ShareDialog to ShareSessionDialog
2014-02-04 17:05:38 +00:00
Seth Call
c3a51989fd
* changing to localhost:3000 instead of jamkazamdev.local
2014-02-04 14:40:05 +00:00
Seth Call
5df00b2883
* VRFS-1012-fixing any URLs that don't start with /client
2014-02-04 13:48:13 +00:00
Jonathan Kolyer
0d675b16dc
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-04 02:53:04 -06:00
Jonathan Kolyer
5be1742d11
vrfs-1012: changed band profile url back from website to /profile
2014-02-04 02:52:52 -06:00
Jonathan Kolyer
7797b6907c
vrfs152: added GA tracking for FB invites
2014-02-04 01:16:16 -06:00
Jonathan Kolyer
3414229384
vrfs152: added test to allow multiple signups with a fb invite
2014-02-04 01:12:34 -06:00
Seth Call
dc70f349b6
* overlay-small i being pulled 150px to the left
2014-02-04 03:16:39 +00:00
Seth Call
ea19fe002d
* VRFS-1026 and VRFS-1024 resolved (signin and dropdown scooted back
2014-02-04 03:06:46 +00:00
Seth Call
d82b0b6fd9
* VRFS-1026 - putting user dropdown back to where it belonged
2014-02-04 02:45:52 +00:00
Seth Call
d10f966c0b
* VRFS-1025 finished
2014-02-03 21:19:34 +00:00
Seth Call
d4a5737c51
* VRFS-1025 finished
2014-02-03 21:19:14 +00:00
Brian Smith
730c315589
Merge branch 'develop' into feature/share_dialog
2014-02-02 18:15:37 -05:00
Brian Smith
b7ddd4661a
VRFS-1020 share dialog work
2014-02-02 18:14:47 -05:00
Seth Call
aa68a4e2f4
* adding welcome.js
2014-02-02 22:25:59 +00:00
Seth Call
ef6e3f5fa8
* signup dialog js included now
2014-02-02 21:19:45 +00:00
Seth Call
af553c1734
* adding fb image
2014-02-02 15:07:04 -06:00
Seth Call
05e5a8cc11
* working on signup on welcome page
2014-02-02 15:06:41 -06:00
Seth Call
513fb2b8d4
* intsall to vendor/bundle
2014-02-02 14:03:31 -06:00
Seth Call
821e8cc2b5
* fail on error
2014-02-02 13:57:41 -06:00
Seth Call
3ded3ff39c
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-02 13:35:33 -06:00
Seth Call
b256182cc6
* VRFS-1055 and VRFS-1056 - fixing tests that hardcode / instead of /client, and updating pg gem to 17.1 from 15.1
2014-02-02 13:34:53 -06:00
Jonathan Kolyer
da9a001e43
fixed issues editing buzz entries
2014-02-01 21:59:25 -06:00
Jonathan Kolyer
d92d02a361
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-01 21:52:40 -06:00
Jonathan Kolyer
61de77c7e1
vrfs152: fixed broken tests
2014-02-01 21:48:46 -06:00
Seth Call
aaf4914885
VRFS-1054 removing reload slush
2014-02-01 20:46:38 -06:00
Seth Call
5dc376fa23
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-01 20:46:04 -06:00
Seth Call
7f409c2cb4
VRFS-1054 removing reload slush
2014-02-01 20:45:58 -06:00
Anthony Davis
a3f8d9288c
VRFS-923 - deleting at the object level instead. works fine on my machine.
2014-02-01 19:30:23 -06:00
Seth Call
a05a85aad7
* revert new welcome as root until can fix all the tests
2014-02-01 20:48:19 +00:00
Daniel Weigh
177220bae8
VRFS-1047 Implement the new landing page.
...
Setup core layout.
2014-02-01 14:26:16 -05:00
Seth Call
86b51b6b89
* in listen_in example page, specify preload=none to lessen load on sessions
2014-02-01 17:36:46 +00:00
Seth Call
6ae07fa187
* make icecast config job wait configurable amount of time after reloading before moving on (hack until VRFS-1043)
2014-02-01 15:59:43 +00:00
Seth Call
68221090eb
* marking pending a test that fails on mac, not linux
2014-02-01 05:02:56 +00:00
Seth Call
4e89a686e2
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-02-01 04:51:49 +00:00
Seth Call
4ce77a44b3
* VRFS-1039 - add extension to mount name
2014-02-01 04:51:38 +00:00
Seth Call
4369e0ba9b
* VRFS-1016 - pushing debians at end
2014-01-31 14:25:31 -06:00
Seth Call
6806d6f0d3
* VRFS-1016
2014-01-31 14:25:17 -06:00
Seth Call
d5478dc926
* removing force:true in IcecastConfigWriter
2014-01-31 13:19:46 -06:00
Seth Call
3517cf048b
* re-establish pg connection before/after fork
2014-01-31 12:37:43 -06:00
Seth Call
43d5c8465f
* adding runtests helper
2014-01-31 12:09:44 -06:00
Seth Call
062b36ae82
* commenting out share_token
2014-01-31 11:23:05 -06:00
Seth Call
c9b58229c4
* fixing broken tests some more
2014-01-31 10:04:17 -06:00
Seth Call
3d6069bdb3
* fix broken tests
2014-01-31 09:32:18 -06:00
Brian Smith
edebf42e73
VRFS-1020 share dialog work
2014-01-31 01:39:09 -05:00
Brian Smith
42930fe95e
fix header on client
2014-01-30 22:30:37 -05:00
Seth Call
b4b120aa3b
* removing first_recording_at method and allowing server_id to be modified
2014-01-30 20:43:35 -06:00
Seth Call
f1a8c1b744
* remove first_recording_at method
2014-01-30 20:39:42 -06:00
Seth Call
2e5eb4fd7f
* beefing up description in icecast_bootstrap
2014-01-30 20:13:09 -06:00
Seth Call
a4902977a4
* marking tests broken
2014-01-30 20:10:06 -06:00
Seth Call
3a5321dc5c
* merging manifest and user
2014-01-30 15:53:22 -06:00
Seth Call
6ccfc4cc08
* VRFS-1010 possibly done
2014-01-30 15:51:05 -06:00
Seth Call
956b25c577
* fixing bug when icecast.xml exists VRFS-1010
2014-01-30 09:32:12 -06:00
Jonathan Kolyer
b0a8da15b6
vrfs152: moved invited_users_facebook_support.sqlto bottom
2014-01-29 23:05:55 -06:00
Jonathan Kolyer
c22331c010
conflict merge
2014-01-29 23:05:09 -06:00
Jonathan Kolyer
1a965b298b
vrfs152: integrated fb invites to dropdown
2014-01-29 23:03:12 -06:00
Jonathan Kolyer
13df76e136
vrfs152: added dynamic fetching of facebook invited_user signup url
2014-01-29 22:49:36 -06:00
Jonathan Kolyer
e839c8cb69
vrfs152: moved generate_signup_url into invited_user
2014-01-29 22:48:35 -06:00
Jonathan Kolyer
4a1ebb7630
vrfs152: added test for facebook_invite!
2014-01-29 21:37:49 -06:00
Jonathan Kolyer
a73d4d758d
vrfs152: created one FB invite constraint
2014-01-29 21:22:37 -06:00
Brian Smith
b457babf79
VRFS-1020 share dialog work
2014-01-29 21:37:36 -05:00
Jonathan Kolyer
7c39c3cd4c
vrfs152: integration fb login into view code
2014-01-29 19:55:16 -06:00
Seth Call
3903822ca5
* overriding lock timeout for LonelyJobs
2014-01-29 14:33:47 -06:00
Seth Call
55850ae602
* adding ability to run everything within jam-web for jobs
2014-01-29 13:26:11 -06:00
Seth Call
3d453468f2
* adding ability to run everything within jam-web for jobs
2014-01-29 13:24:34 -06:00
Seth Call
873037101c
* removing errant m VRFS-1027
2014-01-29 11:05:01 -06:00
Seth Call
d9ff073882
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-01-29 10:59:25 -06:00
Seth Call
38a8ca08bc
* renabling logging
2014-01-29 10:59:14 -06:00
Brian Smith
555b53e3c3
format code
2014-01-28 10:31:57 -05:00
Brian Smith
3ad56b4142
fix session bug
2014-01-28 10:30:16 -05:00
Brian Smith
374a9da957
VRFS-986 landing page dev complete
2014-01-28 02:35:35 -05:00
Brian Smith
40a8dbd89e
remove binding.pry
2014-01-26 16:48:15 -05:00
Brian Smith
1463866c75
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-01-26 16:46:46 -05:00
Brian Smith
998ebfdc6c
VRFS-986 landing page sidebar complete / session landing fixes
2014-01-26 16:46:41 -05:00
Seth Call
708da1fb70
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-01-26 14:46:23 -06:00
Seth Call
8f5a2a6369
* tell NOKOGIRI to use system libraries in build environment
2014-01-26 14:46:11 -06:00
Seth Call
576e8deeee
* fixing recursion bug in eventmachine.rb
2014-01-26 19:51:56 +00:00
Daniel Weigh
a7f10d8141
VRFS-930 Musician fixes
...
VRFS-931 Band fixes
Allows for (temporary?) hiding of buttons when FOLLOW is clicked.
2014-01-26 13:44:06 -05:00
Daniel Weigh
b98e6439d9
VRFS-930 Musician fixes
...
"Oops". removed accidentally committed test text.
2014-01-26 13:35:03 -05:00
Daniel Weigh
df748d5f5a
VRFS-930 Musician fixes
...
Addresses horiz. scrollbar in the header
2014-01-26 13:32:21 -05:00
Daniel Weigh
f2d0801908
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-01-26 13:26:01 -05:00
Daniel Weigh
7a782c2197
VRFS-930 Musician fixes
2014-01-26 13:25:34 -05:00
Daniel Weigh
31a18a1f95
VRFS-931 Band tweaks
2014-01-26 13:25:19 -05:00
Seth Call
8cf8e7ae1d
* skip Unicorn check when running a worker
2014-01-25 22:31:06 -06:00
Seth Call
afb0f30c9f
* still working on this bugsnag issue VRFS-1023
2014-01-25 21:24:14 -06:00
Seth Call
d23ca37a82
* fix for VRFS-1023; bugsnag preventing rails from starting
2014-01-25 21:07:39 -06:00
Seth Call
90583f8463
* actually comment out audiomixer tests, hwich fail on server
2014-01-25 18:53:59 -06:00
Seth Call
a26b93a54b
* adding requires bugsnag in needed locations to fix VRFS-1023- jam-web won't start
2014-01-25 17:48:17 -06:00
Seth Call
ad1521c98b
* VRFS-1022 make sure to use resolve_string mime_type, subtype, bitrate, and again try to disable tests in rspec
2014-01-25 17:38:03 -06:00
Seth Call
d93d27db52
* trying to disable testsgg
2014-01-25 16:48:24 -06:00
Seth Call
bf7b09e820
* marking a few tests as pending
2014-01-25 16:23:57 -06:00
Seth Call
e63e718091
* merged
2014-01-25 14:19:12 -06:00
Seth Call
96768b7979
* VRFS-1022 finished
2014-01-25 14:03:14 -06:00
Brian Smith
191b9c8756
VRFS-1020 add dividers to share dialog
2014-01-25 14:32:40 -05:00
Brian Smith
73875a4950
merge develop
2014-01-25 13:26:56 -05:00
Brian Smith
8c4296096c
VRFS-1020 share dialog work
2014-01-25 13:25:27 -05:00
Brian Smith
dcea238631
VRFS-1020 share dialog work
2014-01-25 10:37:15 -05:00
Brian Smith
d6a38f6bee
VRFS-986 bug fixes
2014-01-23 21:43:49 -05:00
Brian Smith
30b13ed538
merge develop
2014-01-22 21:21:40 -05:00
Seth Call
35466433ca
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-01-22 16:23:46 -06:00
Seth Call
4b13c5c16c
* making ubuntu command need sudo, and adding ubuntu template maker
2014-01-22 16:23:33 -06:00
Seth Call
7c375278f8
* fixing jamadmin pages
2014-01-21 20:30:40 -06:00
Seth Call
f91fb27d64
* fixing websocket-gateway tests by not deleting icecast server groups table
2014-01-21 16:59:29 +00:00
Seth Call
9f86cc62ab
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-01-21 14:51:12 +00:00
Seth Call
fcec0a776b
* icecast working locally on my mac (VRFS-1002)
2014-01-21 14:51:03 +00:00
Brian Smith
f4f54f579e
VRFS-986 pass recent_history to partial
2014-01-21 01:49:45 -05:00
Brian Smith
aa056d53fd
VRFS-986 recent history sidebar for landing pages
2014-01-21 01:45:51 -05:00
Brian Smith
6660102982
VRFS-986 landing page work
2014-01-20 09:28:06 -05:00
Brian Smith
eea5cc781e
VRFS-986 landing page work
2014-01-19 17:23:10 -05:00
Seth Call
c91940852b
* going to 'hide' integrate icecast into sessions.sql' from staging for now
2014-01-19 05:20:40 +00:00
Seth Call
dea36d897f
* VRFS-982 and VRFS-1003 - making every table that's directly related to music_session be UNLOGGED
2014-01-19 05:17:30 +00:00
Seth Call
5c8e315ee5
* pending didn't take
2014-01-19 03:32:36 +00:00
Seth Call
13f711754c
* suppressing the other failing test on the build server
2014-01-19 03:14:00 +00:00
Seth Call
4e05affc77
* disabling audiomixer tests until I figure out why it's failing on audiomixer
2014-01-19 02:56:35 +00:00
Seth Call
e57946afd2
* fixing tests, and adding a bunch more jam-admin page work for managing icecast, as well as the beginnings of the REST API for icecast (VRFS-1002 and VRFS-1006)
2014-01-19 02:20:44 +00:00
Brian Smith
cdb47bdd75
fix band_session_join protobuf message
2014-01-18 21:03:15 -05:00
Brian Smith
09d84b4c11
VRFS-986 landing page work
2014-01-18 15:32:39 -05:00
Seth Call
f327317ede
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-01-17 19:55:42 +00:00
Seth Call
8644f4cbc3
* VRFS-1006 admin pages added to icecast
2014-01-17 19:55:26 +00:00
Seth Call
5d6e34f374
* VRFS-1000 - mapped all the castles, got the xml working, and added more tests
2014-01-17 04:51:19 +00:00
Seth Call
cfa2ba383a
* fixing EM test and removing old pending tests
2014-01-16 12:37:25 +00:00
Brian Smith
6d482a034d
VRFS-986 more landing page work
2014-01-16 02:50:13 -05:00
Brian Smith
4f9e36a332
VRFS-986 more landing page work
2014-01-16 01:55:36 -05:00
Seth Call
ece0b9bf87
* suppressing puts to stdout in test runs
2014-01-16 03:29:52 +00:00
Seth Call
01e50b45b3
* fixes for EventMachine initialization to work in ruby-only context (without web)
2014-01-16 02:21:28 +00:00
Seth Call
7d90425864
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-01-15 22:20:29 +00:00
Seth Call
d39ec9ba34
* VRFS-996 - prevent recording info block stop about footer click
2014-01-15 22:20:18 +00:00
Seth Call
63d6f428b3
* VRFS-997 - mix notifications
2014-01-15 22:15:33 +00:00
Seth Call
dc781f04ad
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-01-15 18:00:59 +00:00
Seth Call
b8829b417a
* VRFS-997 - mix complete notification
2014-01-15 18:00:45 +00:00
Jonathan Kolyer
42713f4c9d
vrfs152: allowing invited_users to have null email
2014-01-15 04:10:13 -06:00
Jonathan Kolyer
8f7a959a9e
vrfs152: relaxed requirement for an email address
2014-01-15 03:56:46 -06:00
Seth Call
e9804b0c03
* test failing intermittently on the build server-marking pending
2014-01-14 22:38:59 -06:00
Seth Call
f6d1869d52
* adding folders for the various jobs
2014-01-14 21:16:38 -06:00
Seth Call
99a4310508
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-01-14 16:55:48 -06:00
Seth Call
1f37b9881f
* parameterizing email configs and trying to speed up build on server
2014-01-14 16:55:34 -06:00
jam
10687093c1
Resolve conflicts
2014-01-14 21:24:45 +00:00
jam
b15604c148
Icecast modules and test
2014-01-14 21:22:05 +00:00
Jonathan Kolyer
84360ea642
Merge branch 'vrfs152' into develop
2014-01-14 14:07:20 -06:00
Daniel Weigh
80eb14853b
VRFS-930 Musician fixes
2014-01-23 06:36:31 -05:00
Daniel Weigh
703da937e8
VRFS-930 Musician fixes
2014-01-23 06:10:40 -05:00
Jonathan Kolyer
ccdad1c81a
vrfs1008: fixed failing test
2014-01-14 14:06:43 -06:00
Seth Call
1f31bb3ff5
* fixing debian postinstall issue
2014-01-14 09:47:30 -06:00
Jonathan Kolyer
a32697b2e4
vrfs1008: fixed typo
2014-01-14 03:19:21 -06:00
Jonathan Kolyer
8eb1bbe81d
vrfs1008: disabled the autocomplete feature for musician invites
2014-01-14 02:58:29 -06:00
Jonathan Kolyer
d2f71dd874
Merge branch 'vrfs1008' into develop
2014-01-14 02:31:48 -06:00
Daniel Weigh
4bdd77f171
* placeholder scroller for feed.
2014-01-21 21:56:35 -05:00
Daniel Weigh
b5a32b0a53
VRFS-931 Band tweaks
2014-01-21 21:56:03 -05:00
Daniel Weigh
b8a51e9f6c
VRFS-930 Musician fixes
2014-01-21 21:55:38 -05:00
Daniel Weigh
51c9892c63
* lint error cleanup
2014-01-21 21:54:39 -05:00
Jonathan Kolyer
91007055a0
vrfs1008: fixed updating invites bug
2014-01-14 02:29:07 -06:00
Jonathan Kolyer
ea6391e46e
vrfs1008: styled the invite dialog box; fixed bug updating invites
2014-01-14 01:52:22 -06:00
Brian Smith
59f6e10e55
VRFS-986 recording landing page work
2014-01-14 02:49:21 -05:00
Jonathan Kolyer
3c6af2e028
vrfs1008: sending updated invites
2014-01-14 01:31:20 -06:00
Jonathan Kolyer
61a7dcd50f
vrfs1008: added existingInvites storage for updates
2014-01-14 01:01:37 -06:00
Jonathan Kolyer
cfeed312bf
vrfs1008: refactoring
2014-01-14 00:12:00 -06:00
Jonathan Kolyer
28d346fe23
vrfs1008: refactoring, cleanup, bug fixes
2014-01-14 00:02:54 -06:00
Jonathan Kolyer
a8b7f3e5a6
vrfs1008: integration bug fixing
2014-01-13 23:18:09 -06:00
Jonathan Kolyer
33c64c2881
vrfs1008: fixing integration bugs
2014-01-13 22:33:32 -06:00
Jonathan Kolyer
11074044a7
vrfs1008:
2014-01-13 19:37:52 -06:00
Jonathan Kolyer
8958663987
vrfs1008: removed debug stmt
2014-01-13 19:01:11 -06:00
Jonathan Kolyer
3e2ae677fe
vrfs1008: integration with active session
2014-01-13 19:00:42 -06:00
Jonathan Kolyer
a923025a80
vrfs1008: changed createInvitations to be anon fcn
2014-01-13 18:35:05 -06:00
Seth Call
59c1b02e1c
* comment in god file about pending removal
2014-01-13 22:53:37 +00:00
Seth Call
a7fa73cfb3
* VRFS-801 still working out some mixer devops issues now;
2014-01-13 22:48:55 +00:00
Jonathan Kolyer
ddcfef56c4
vrfs1008: added hook to external createInvitations function
2014-01-13 14:57:22 -06:00
Jonathan Kolyer
d9d240541d
vrfs1008: fixing integration of refactoring with createsession
2014-01-13 14:50:56 -06:00
Jonathan Kolyer
f3ab5f8297
vrfs1008: createSession invite refactor integration
2014-01-13 10:35:34 -06:00
Jonathan Kolyer
8fdbc7cc08
vrfs1008: refactoring invite logic
2014-01-13 10:11:26 -06:00
Seth Call
43572c1524
* fixing rake routes bug
2014-01-13 13:57:14 +00:00
Seth Call
50595d155c
* VRFS-801 - closer to all fixes required for mixing
2014-01-13 13:44:28 +00:00
Jonathan Kolyer
ef01c9a8f1
vrfs1008: moved invite musician html into template for reuse in sessions page
2014-01-13 07:38:47 -06:00
Seth Call
8f5b021464
* adding fixed test
2014-01-13 13:23:09 +00:00
Seth Call
34b96db2c1
* updating nav of jam-admin and adding mixes page
2014-01-13 11:24:16 +00:00
Seth Call
da784f2cd0
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-01-13 11:23:41 +00:00
Seth Call
a61ff76dae
* stringifying id field in response to client downloads
2014-01-13 11:23:35 +00:00
Seth Call
f79d3bdd70
* fixing bad name in debian scripts from audimxer to audiomixer
2014-01-13 11:22:28 +00:00
Jonathan Kolyer
5af003e5b9
vrfs-988: fixed broken musician filter test
2014-01-13 03:41:53 -06:00
Jonathan Kolyer
c4d04adb77
vrfs988: fixed broken search test
2014-01-12 22:23:18 -06:00
Brian Smith
753dc22e8b
fix syntax error
2014-01-12 13:00:57 -05:00
Brian Smith
6d42e42c18
VRFS-987 backend support for session/recording likes, plays, and comments
2014-01-12 12:51:06 -05:00
Jonathan Kolyer
5bc7ceaba3
vrfs988: replaced global search with text-type search test
2014-01-12 03:40:32 -06:00
Jonathan Kolyer
e0d8dd286a
vrfs988: updated to work with new search attribute names
2014-01-12 02:58:04 -06:00
Jonathan Kolyer
e539157d76
Merge branch 'develop' into vrfs988
2014-01-12 02:53:11 -06:00
Jonathan Kolyer
68b0fd92d6
vrfs988: updated #query on new search; added semicolons
2014-01-12 02:50:55 -06:00
Jonathan Kolyer
74e95ad908
vrfs988: added band spec and band.website value integrity on save
2014-01-12 02:49:57 -06:00
Jonathan Kolyer
1276c66bd3
vrfs988: fixed sync bugs in searchResults
2014-01-12 02:11:54 -06:00
Jonathan Kolyer
379fe788a3
vrfs988: added clear=all for fans template
2014-01-12 02:11:19 -06:00
Jonathan Kolyer
af4f03c91e
vrfs988: refresh both sidebar and searchResults when search params changed
2014-01-12 02:02:15 -06:00
Jonathan Kolyer
ddd1b93420
vrfs988: syncing the search type selections between searchResults and sidebar
2014-01-12 01:53:39 -06:00
Jonathan Kolyer
8b7fcaf569
vrfs988: updated band template value names
2014-01-12 01:48:59 -06:00
Jonathan Kolyer
48bde580ae
vrfs988: fixed filter searchtype bug
2014-01-12 01:48:15 -06:00
Jonathan Kolyer
1a39f6296b
vrfs988: changed band url to use website
2014-01-12 01:40:30 -06:00
Jonathan Kolyer
da980ce699
vrfs988: refactoring search results; added fans/bands result template handling
2014-01-11 23:34:23 -06:00
Jonathan Kolyer
a4816fecfd
vrfs988: refactored search results processing
2014-01-11 22:44:58 -06:00
Seth Call
660e452996
* fixing weboscket gateway problem ;it's pulling in a very old version of actionpack due to some gemfile issue
2014-01-12 04:28:07 +00:00
Jonathan Kolyer
cdb2b9fab9
vrfs988: sidebar/searchresults
2014-01-11 20:18:20 -06:00
Seth Call
72a97198ed
* up activerecord in websocket gateway to match web
2014-01-11 19:52:30 +00:00
Jonathan Kolyer
87ae9d97df
vrfs988: refactored search with one accessor for text and filter type searches
2014-01-11 09:27:56 -06:00
Jonathan Kolyer
ecdfde2cdb
vrfs988: sync api wrapper with search model
2014-01-11 09:12:26 -06:00
Jonathan Kolyer
0279b05454
vrfs-988: fixed text search return value
2014-01-11 08:59:09 -06:00
Jonathan Kolyer
ac100e0898
vtfs-988: fixing user text search to use musician
2014-01-11 06:50:51 -06:00
Jonathan Kolyer
fa0b3eeb70
vrfs-988: ran band_search tests
2014-01-11 06:37:55 -06:00
Jonathan Kolyer
2229babf68
vrfs-988: refactoring search as text by entity, rather than site-wide
2014-01-11 06:27:05 -06:00
Jonathan Kolyer
3d75f8dd97
vrfs-988: refactoring search as text by entity, rather than site-wide
2014-01-11 06:26:40 -06:00
Seth Call
26f751cdc4
* sending 'downloadavailable' messages when mix becomes available
2014-01-11 05:34:26 +00:00
Seth Call
eb7adbd303
* working out more issues with VRFS-801
2014-01-11 05:23:29 +00:00
Seth Call
f5a271c35b
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-01-11 04:57:30 +00:00
Seth Call
d89ce4c140
* VRFS-801 - almost working on my dev machine
2014-01-11 04:57:07 +00:00
Jonathan Kolyer
401a97d566
Merge branch 'develop' into vrfs927
2014-01-10 18:13:00 -06:00
Jonathan Kolyer
85d6129a50
vrfs-927: fixing latest promotions
2014-01-10 18:10:14 -06:00
jam
7ec4be3063
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-01-10 23:53:25 +00:00
jam
b01fb4a818
baseline for icecast test cases
2014-01-10 23:53:16 +00:00
jam
cc4cd61930
nake char range explicit
2014-01-10 21:03:33 +00:00
jam
09f30e3880
Support for xml with attr_accessor
2014-01-10 21:02:52 +00:00
Seth Call
230a4d3f64
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-01-10 16:28:18 +00:00
Seth Call
1555af6db8
* VRFS-984 finished. subpath is /resque
2014-01-10 16:25:55 +00:00
Seth Call
be2a7ecc48
* removing git merge syntax from jam_ruby
2014-01-09 13:53:47 +00:00
Jonathan Kolyer
08e7496a40
merge conflict
2014-01-08 21:33:15 -06:00
Jonathan Kolyer
c576901d0d
fixed merge conflict
2014-01-08 21:32:23 -06:00
Seth Call
0b723362ae
* adding resque to websocket-gateway
2014-01-09 02:53:04 +00:00
Jonathan Kolyer
e5d23cc3bd
merge conflicts
2014-01-08 18:45:34 -06:00
Jonathan Kolyer
785817d299
vrfs-927: added initial promo latest support
2014-01-08 18:38:04 -06:00
Jonathan Kolyer
4b85863a33
vrfs-927: buzz admin fixes
2014-01-08 18:00:22 -06:00
Seth Call
783a7c3adf
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-01-08 22:55:51 +00:00
Seth Call
83409e9da8
* adding resque gem to Gemfile
2014-01-08 22:55:44 +00:00
jam
e827f274b2
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-01-08 22:42:24 +00:00
jam
9ed2210500
websock set timeout on development build
2014-01-08 22:42:10 +00:00
Seth Call
519650e265
* typo in audiomixer
2014-01-08 22:05:41 +00:00
Seth Call
9e7debdeda
* merged
2014-01-08 21:49:35 +00:00
Seth Call
207481ffbd
* audiomixer move
2014-01-08 21:49:04 +00:00
Seth Call
59bf00a97e
* DownloadAvailable proto msg added to help poke client when downloads become available
2014-01-08 21:24:21 +00:00
Anthony Davis
d899b88dd1
switching failing specs to expect() syntax
2014-01-08 15:21:32 -06:00
Anthony Davis
9127d1861d
VRFS-923 commenting out AWS wipe in web as well
2014-01-08 13:59:53 -06:00
Seth Call
88888a6846
* oops. didn't realize that the client footer is reused by 2 other templates
2014-01-08 19:49:21 +00:00
Seth Call
03e4dfdc49
* removing wipe commands for now
2014-01-08 18:22:53 +00:00
Seth Call
40480f1484
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-01-08 18:04:21 +00:00
Seth Call
a400c0f289
* VRFS-971 adding progress at bottom of fotor
2014-01-08 18:04:11 +00:00
Anthony Davis
cd62e07026
Merge remote-tracking branch 'origin/develop' into develop
2014-01-08 07:04:45 -06:00
Anthony Davis
fedea2cdc3
VRFS-923
2014-01-08 07:04:23 -06:00
Daniel Weigh
b10f0917fd
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
...
# By Anthony Davis (3) and Seth Call (2)
# Via Anthony Davis (2) and Seth Call (1)
* 'develop' of bitbucket.org:jamkazam/jam-cloud:
VRFS-923 wrong sdk/method
* removing print because tests passed on build server
minor refactor in recordings spec
VRFS-923 'jamkazam-testing' s3 bucket is emptied after tests
* adding some prints to debug failing tests
2014-01-08 07:34:21 -05:00
Anthony Davis
bc4223be22
Merge remote-tracking branch 'origin/develop' into develop
2014-01-08 05:52:14 -06:00
Anthony Davis
273495698a
VRFS-923 wrong sdk/method
2014-01-08 05:51:55 -06:00
Seth Call
4c35f05826
Merge remote-tracking branch 'origin/develop' into develop
2014-01-08 11:31:13 +00:00
Seth Call
a973a370a3
* removing print because tests passed on build server
2014-01-08 11:30:54 +00:00
Anthony Davis
f631351315
minor refactor in recordings spec
2014-01-08 05:11:05 -06:00
Anthony Davis
ee5eccfdc3
VRFS-923 'jamkazam-testing' s3 bucket is emptied after tests
2014-01-08 05:10:40 -06:00
Seth Call
a97472503d
* adding some prints to debug failing tests
2014-01-08 10:22:33 +00:00
Daniel Weigh
6f66f4219c
VRFS-929 Double Scroll Bars.
2014-01-08 05:07:56 -05:00
Jonathan Kolyer
bb2024fe19
vrfs-927: carrierwave_direct integration
2014-01-08 01:04:17 -06:00
Seth Call
bffe453a6a
* marking sign url test as pending until credentials are provided, and bringing back icecast test
2014-01-08 04:27:56 +00:00
Seth Call
010f41fed0
* marking other icecast test as failing
2014-01-08 03:58:08 +00:00
Seth Call
cbac485e7e
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-01-08 03:42:34 +00:00
Seth Call
89fd0c2995
* VRFS-971- fixed duplicate recorded_tracks being sent as a result of list_downloads; query much more efficient too
2014-01-08 03:28:15 +00:00
Brian Smith
76a1d01a66
reformatting
2014-01-07 22:05:36 -05:00
jam
f003fb2501
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-01-08 01:43:13 +00:00
jam
8c51eb31db
Fix test and make sure icecast is at the bottom of the sql command chain
2014-01-08 01:42:59 +00:00
Seth Call
e91dbc1388
* removing async:trues in code (because it's default), to make it easier to find async:false
2014-01-08 00:44:56 +00:00
Seth Call
c92dd66f24
* moving icecast to bottom
2014-01-07 23:32:08 +00:00
Seth Call
f0dcf419b5
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-01-07 23:30:55 +00:00
Seth Call
473cb69f6d
* VRFS-972 - profile.js changes
2014-01-07 23:30:23 +00:00
Anthony Davis
a7be00c8f9
VRFS-923
2014-01-07 16:32:16 -06:00
jam
25f4d9b449
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-01-07 22:27:11 +00:00
jam
ae1fd60bbf
add builder to gems list
2014-01-07 22:27:00 +00:00
Anthony Davis
4ff1674f20
Pulling out snapshot until it's finished
2014-01-07 14:42:39 -06:00
jam
2463be1f84
Remove -l arg from bash script
2014-01-07 14:37:22 -06:00
jam
1ac74eadb3
Icecast changes
2014-01-07 14:32:12 -06:00
jam
111ab5811a
Icecast changes
2014-01-07 14:31:52 -06:00
jam
66558b70e9
Icecast test models
2014-01-07 14:30:06 -06:00
jam
932f59cea6
Icecast models
2014-01-07 14:29:40 -06:00
Anthony Davis
8b3d1abd5c
VRFS-923 - pushing a pretend delete. will review Jenkins
2014-01-07 13:40:26 -06:00
Seth Call
9045e82530
* make runweb and update use login shell for better support with rvm
2014-01-07 16:20:52 +00:00
Seth Call
75eb3839ad
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-01-07 16:01:58 +00:00
Seth Call
8e8e699788
* fixing nil.publish test in mq_router.spec
2014-01-07 16:01:36 +00:00
Anthony Davis
7e1a6cd565
snapshot doesn't need to write to tmp subfolder
2014-01-06 21:22:54 -06:00
Seth Call
9c8bbe9c20
* MUSIC_SESSION_JOIN/DEPART are now SESSION_JOIN/SESSION_DEPART, VRFS-965
2014-01-06 22:34:16 +00:00
Seth Call
050af95b56
* fixing more tests
2014-01-06 22:15:02 +00:00
Seth Call
6aba436781
* fixing failing test
2014-01-06 21:51:48 +00:00
Seth Call
8cd679bea1
* VRFS-964 - fixed reconnect button
2014-01-06 21:08:37 +00:00
Seth Call
45a18c4449
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-01-06 20:35:41 +00:00
Seth Call
fa23c267f5
* VRFS-946 and VRFS-922 - in-session recording features complete
2014-01-06 20:35:35 +00:00
Chris Doughty
d8cb2c72c4
VRFS-951 Pushing only develop or master branch files as debians
2014-01-05 21:35:22 -06:00
Brian Smith
18d8ff8d3f
VRFS-933 notification bug fixes
2014-01-05 16:42:18 -05:00
Brian Smith
5d2ef909ce
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-01-05 08:26:29 -05:00
Brian Smith
c52e27c7d1
fix race condition on user profile screen
2014-01-05 08:26:24 -05:00
Seth Call
17486c6ed2
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-01-05 03:47:35 +00:00
Seth Call
ba3b9ab873
* VRFS-946 - in-session recording
2014-01-05 03:47:23 +00:00
Anthony Davis
f8aea9ac73
VRFS-433 - oops little typo
2014-01-04 20:52:32 -06:00
Anthony Davis
d8dd7fddb9
Merge remote-tracking branch 'origin/develop' into develop
2014-01-04 20:42:26 -06:00
Anthony Davis
c625c812e1
Laying groundwork for VRFS-433, refactoring and adding to recordings spec
2014-01-04 20:42:05 -06:00
Brian Smith
6dec9a5239
fix tests
2014-01-04 20:25:05 -05:00
Seth Call
cc4ecf097f
* forcing a build of develop branch
2014-01-05 00:02:48 +00:00
Brian Smith
fab83707b7
VRFS-933 notification work
2014-01-04 17:02:47 -05:00
Brian Smith
071ab4c0e9
Revert "VRFS-933 fix issues"
...
This reverts commit 1b3fdee99e .
2014-01-04 16:41:21 -05:00
Brian Smith
1b3fdee99e
VRFS-933 fix issues
2014-01-04 12:35:15 -05:00
Brian Smith
8b87b11f4d
VRFS-933 merge with develop
2014-01-04 12:24:11 -05:00
Brian Smith
a2b34d68dd
VRFS-933 notification bug fixes
2014-01-04 12:20:28 -05:00
jam
636a37694c
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-01-04 10:31:00 -06:00
Brian Smith
7ef959782e
VRFS-933 notifications
2014-01-04 10:40:21 -05:00
jam
57a9571483
resolve conflict
2014-01-04 08:04:24 -06:00
jam
b4260a4ed1
adde icecast file to gem library
2014-01-04 07:40:08 -06:00
Jonathan Kolyer
c94537da62
vrfs-927: added carrierwave-direct
2014-01-04 03:22:29 -06:00
Jonathan Kolyer
9e4995a55b
vrfs-927: carrrierwave integration
2014-01-04 03:15:19 -06:00
Jonathan Kolyer
b731bd84e0
vrfs-927: updated db cols for carrierwave integration
2014-01-04 03:11:31 -06:00
Jonathan Kolyer
4c9d2f0c29
vrfs-927: carrierwave integration fixes
2014-01-04 03:10:58 -06:00
Chris Doughty
a99d793e6c
VRFS-750 Starting generic page for 503 error
2014-01-02 19:35:50 -06:00
Brian Smith
3872898b95
VRFS-933 notification work
2014-01-02 14:57:16 -05:00
Brian Smith
452ddb3ff0
VRFS-933 more notification work; fixed test failures
2014-01-01 22:06:59 -05:00
Brian Smith
07abf26ced
VRFS-933 notification work
2014-01-01 20:02:40 -05:00
Daniel Weigh
2d51d04bbd
VRFS-948 Formatting updates
...
Will possibly need to revisit in the context of 294
2014-01-01 19:33:27 -05:00
Daniel Weigh
c00267f31c
VRFS-948 / VRFS-930 / VRFS-931 Formatting updates
...
Will possibly need to revisit in the context of 294
2014-01-01 15:41:40 -05:00
Daniel Weigh
e76244c360
VRFS-940 Change Avatar link borked.
...
Add in avatar.
2013-12-31 23:24:10 -05:00
Brian Smith
051b8eec5e
remove crash dump file
2013-12-30 22:36:00 -05:00
Brian Smith
5b31e802d6
VRFS-933 more notification work
2013-12-30 22:35:38 -05:00
Seth Call
c3954d65f0
* delete existing tracks on older migration that will break existing deployments
2013-12-30 19:16:08 +00:00
Seth Call
73b04ba5fc
* oomps--left in my local capybara-screenshot reference
2013-12-30 19:10:12 +00:00
Seth Call
e4ed571dcb
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2013-12-30 18:34:26 +00:00
Seth Call
ab70d15eaf
* the form VRFS-922, VRFS-918 (mix checks user permissions), VRFS-945 (verify download permissions for tracks)
2013-12-30 18:34:15 +00:00
Daniel Weigh
e22784c6c3
VRFS-294 Adjustments to HTML/ CSS.
...
Account Profile Avatar page
2013-12-29 21:04:07 -05:00
Brian Smith
102306e4d1
VRFS-933 notification work
2013-12-29 20:49:44 -05:00
Daniel Weigh
90f81e0994
VRFS-934 Remove extraneous scrollbar
...
due to explicit height in markup
2013-12-29 16:42:18 -05:00
Daniel Weigh
56bf445610
VRFS-935 Account identity screen borked.
2013-12-29 15:55:55 -05:00
Daniel Weigh
144f97f470
VRFS-935 Account identity screen borked.
2013-12-29 15:52:29 -05:00
Brian Smith
1806c5245f
VRFS-933 notification work
2013-12-29 14:40:21 -05:00
Daniel Weigh
7bb4b4a3c8
VRFS-936 Session header bar missing
2013-12-29 13:14:50 -05:00
Brian Smith
7e78163bb9
VRFS-933 notification work
2013-12-28 23:51:35 -05:00
Anthony Davis
4a9ad7b733
VRFS-937 - locking 'gon' to ~>4.1.0 to fix test failures
2013-12-28 11:54:53 -06:00
Brian Smith
75b9b97c60
fix warning related to ruby- prefix in .ruby-version files
2013-12-27 16:28:28 -05:00
Jonathan Kolyer
7212f20a0f
vrfs-927: admin editing buzz promotions
2013-12-22 10:19:39 -06:00
Jonathan Kolyer
ec126793c7
vrfs-927: added new promotional table for home page data
2013-12-22 05:22:04 -06:00
Jonathan Kolyer
fcd093f5a6
vrfs737: added first_recording_at
2013-12-21 23:23:33 -06:00
Jonathan Kolyer
fa05c3eb5d
vrfs737: added user progression admin panel
2013-12-21 23:22:54 -06:00
Jonathan Kolyer
8fa8895944
vrfs-743: dropped expire date for read to 20 years, as 25 years is too long for S3
2013-12-21 22:01:25 -06:00
Seth Call
d8a5dbd031
* making a test as pending that fails only on build server for now
2013-12-21 16:35:17 +00:00
Seth Call
182242c7fb
* VRFS-856 - hopefully the fix
2013-12-21 15:12:25 +00:00
Seth Call
9943e4518b
* oops. adding path to poltergeist gem
2013-12-21 02:43:55 +00:00
Seth Call
c784b9faa0
* fixing websocket tests
2013-12-21 00:17:35 +00:00
Seth Call
8deced77c7
* pinning aws-sdk to 1.29.1 everywhere because the gem released today is broken
2013-12-20 23:44:12 +00:00
Seth Call
a68235f280
* adding 'select' to dialog-inner so it'll look JKish
2013-12-20 22:24:14 +00:00
Seth Call
242016c38b
* VRFS-821 - recordings manager changes
2013-12-20 22:01:51 +00:00
Daniel Weigh
9c6ccee6f0
VRFS-294 Adjustments to HTML/ CSS.
2013-12-20 07:04:58 -05:00
Jonathan Kolyer
0ecbf9f047
vrfs-916: added toggles for fan/musician; misc fan tweaks
2013-12-18 22:12:28 -06:00
Jonathan Kolyer
4b3b8491b3
vrfs-916: added favorite_count method
2013-12-18 22:10:55 -06:00
Jonathan Kolyer
f7c08ce472
vrfs-916: added fan page branching logic
2013-12-18 17:59:02 -06:00
Jonathan Kolyer
4e136659e8
vrfs-916: added following? method
2013-12-18 17:48:55 -06:00
Brian Smith
56a02a24b2
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2013-12-18 22:47:34 -05:00
Brian Smith
d5b53c3406
remove hard-coded band ID
2013-12-18 22:33:56 -05:00
Seth Call
c0b5d63f55
* fixing steps typo
2013-12-18 21:58:11 +00:00
Seth Call
f578a3b8ec
* accidentally left out the security 'all-permissions' check
2013-12-18 18:09:36 +00:00
Seth Call
de4a2c8321
* VRFS-821; sending loggedin/loggedout events to backend from frontend
2013-12-18 17:18:23 +00:00
Seth Call
69da7ffe1e
* uncommenting all ping servers
2013-12-18 16:28:05 +00:00
Seth Call
dc5f5c48a8
* trying to fix admin based on stuff that broke in develop branch on Nov 5
2013-12-18 15:47:02 +00:00
Seth Call
5fee5e5f9c
* touching gitignore to get another build to go off on master branch
2013-12-18 14:43:51 +00:00
Seth Call
267664d2bf
* adding in updated jnlp files
2013-12-17 23:55:10 +00:00
Seth Call
463d7da0f2
* make tester page look a little more user-friendly
2013-12-17 22:34:31 +00:00
Seth Call
8bd715c7ea
* VRFS-821 many changes for upload apis, mostly
2013-12-17 19:44:30 +00:00
Seth Call
d97a960a0e
* VRFS-821 many changes for upload apis, mostly
2013-12-17 19:44:21 +00:00
Jonathan Kolyer
3c8dbf4d80
Merge branch 'web_pages' into develop
2013-12-17 11:00:57 -06:00
Anthony Davis
f442196f8d
Merge remote-tracking branch 'origin/develop' into develop
2013-12-17 22:07:48 -06:00
Anthony Davis
daf9b38a9e
VRFS-909 - pushing typo fix in legal email
2013-12-17 22:07:24 -06:00
Jonathan Kolyer
020f9d544e
vrfs-884: tweaking layout
2013-12-17 10:59:16 -06:00
Jonathan Kolyer
4329338fa8
vrfs-884: added check for client_id==undefined in participant_delete method
2013-12-17 10:58:35 -06:00
Brian Smith
a1983d9803
VRFS-877 band photo bug fixes
2013-12-16 23:23:59 -05:00
Brian Smith
932de5cc35
VRFS-877 band photo bug fixes
2013-12-16 23:22:30 -05:00
Jonathan Kolyer
d7a6253b76
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2013-12-16 20:32:31 -06:00
Jonathan Kolyer
60b59a88c7
vrfs-884: fixing tests for commit
2013-12-16 20:32:17 -06:00
Anthony Davis
64e0089960
Merge remote-tracking branch 'origin/develop' into develop
2013-12-16 14:43:08 -06:00
Anthony Davis
aec6e52ace
VRFS-907 - removed links to jeffkoke.com also fixing character
2013-12-16 14:42:34 -06:00
Jonathan Kolyer
742402dfa2
vrfs-884: merge conflict fixes
2013-12-16 12:47:59 -06:00
Jonathan Kolyer
196b895f32
vrfs-884: merge conflict
2013-12-16 12:36:41 -06:00
Jonathan Kolyer
fc6d12e9c8
vrfs-884: band filter page
2013-12-16 12:31:12 -06:00
Jonathan Kolyer
9dd631d05a
vrfs-884: added PARAM_BAND support
2013-12-16 12:29:16 -06:00
Jonathan Kolyer
a354f6c6d5
vrfs-884: updating sample data for bands
2013-12-16 12:28:21 -06:00
Jonathan Kolyer
65f3200fd7
vrfs-884: added :genres eager loading
2013-12-16 12:23:02 -06:00
Chris Doughty
7a3594a0cc
Merge branch 'develop' of bitbucket.com:jamkazam/jam-cloud into develop
2013-12-16 07:51:56 -06:00
Chris Doughty
836e786ebf
Correcting staging cloudfront distribution with correct s3 bucket
2013-12-16 07:51:46 -06:00
Brian Smith
0431c40e93
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2013-12-15 22:53:34 -05:00
Brian Smith
d583393598
VRFS-877 bug fixes
2013-12-15 22:53:16 -05:00
Chris Doughty
f10d43e41f
Merge branch 'develop' of bitbucket.com:jamkazam/jam-cloud into develop
2013-12-15 20:08:59 -06:00
Chris Doughty
d310484c3b
VRFS-719 fixing error case where path is incorrectly built
2013-12-15 20:01:13 -06:00
Brian Smith
5ea5fd3d63
VRFS-877 add missing sql file
2013-12-15 20:26:21 -05:00
Brian Smith
0aaa460934
VRFS-877 band photo work
2013-12-15 16:30:04 -05:00
Brian Smith
10d9232e3f
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2013-12-15 16:27:24 -05:00
Brian Smith
5b5aef15c8
VRFS-877 band photo work
2013-12-15 16:27:11 -05:00
Anthony Davis
9de0d84106
adding: bands_spec (oops, was not git added)
2013-12-14 17:59:48 -06:00
Anthony Davis
4e273759ba
adding: bands_spec, link ids, more in_session JS testing and refactoring
2013-12-14 17:53:18 -06:00
Chris Doughty
b5efad954d
Adding prd and dev cloudfront hosts
2013-12-14 13:07:38 -06:00
Chris Doughty
c0a6541039
Merge branch 'develop' of bitbucket.com:jamkazam/jam-cloud into develop
2013-12-12 20:47:33 -06:00
Chris Doughty
fa8df410da
VRFS-719 Added code to force downloads through cloudfront
2013-12-12 20:47:20 -06:00
Seth Call
a30bc2a022
* fix for VRFS-901 - when you remove a track there was a typo in the jamClient reference
2013-12-12 14:57:54 +00:00
Jonathan Kolyer
88f9339fe2
vrfs-884: removed commented code
2013-12-09 13:55:18 -06:00
Jonathan Kolyer
3968f4015a
vrfs-884: added bands view layout
2013-12-09 13:55:02 -06:00
Jonathan Kolyer
2a93ce7caf
vrfs-884: refactored search filter var names
2013-12-09 13:54:02 -06:00
Jonathan Kolyer
380e264a9a
vrfs-884: got band filter specs to work
2013-12-09 11:41:35 -06:00
Jonathan Kolyer
4c804d2f94
vrfs-884: added band geocoding; inital band filtering tests; refactoring musicians filter page
2013-12-09 07:15:59 -06:00
Brian Smith
6b4e42dfc5
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2013-12-08 22:32:02 -05:00
Brian Smith
833eb45379
VRFS-878 use IP address to default location for band setup
2013-12-08 22:31:49 -05:00
Daniel Weigh
1b77065826
VRFS-294 Resizing Create Session View tweaks for ~1024 px width.
...
tweak to content-icon
2013-12-08 13:07:36 -05:00
Daniel Weigh
0bad5573b2
VRFS-294 Resizing Create Session View tweaks for ~1024 px width.
...
enables scrolling within the session container for short screens.
2013-12-08 12:12:26 -05:00
Brian Smith
5856c5d176
VRFS-876 allow user to remove band members
2013-12-07 20:45:24 -05:00
Daniel Weigh
c49406d467
VRFS-294 Resizing Create Session View tweaks for ~1024 px width
2013-12-07 12:31:02 -05:00
Seth Call
adfc22364a
* fix for VRFS-885
2013-12-05 11:24:30 +00:00
Seth Call
4f97753f47
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2013-12-05 11:16:26 +00:00
Seth Call
73087f0f7a
* recordings manager - changes to download/upload REST APIs - VRFS-821
2013-12-05 11:16:21 +00:00
Jonathan Kolyer
c18848fa03
vtfs-884: cleanup of musicians page prepping for bands page clone
2013-11-29 18:34:00 -06:00
Jonathan Kolyer
7f302a6f0e
vrfs-774: removed the like button for results and commented out the message link for compliance with product spec
2013-11-29 15:07:15 -06:00
Brian Smith
cc4f2512bd
VRFS-867 bug fixes
2013-12-01 18:16:33 -05:00
Brian Smith
3e1e05e378
VRFS-867 preselect assigned genres when editing band details
2013-12-01 17:53:24 -05:00
Brian Smith
6e180b86d1
VRFS-867 preload location data correctly when editing band details
2013-12-01 16:53:05 -05:00
Brian Smith
95954f4789
VRFS-867 band edit feature
2013-12-01 15:09:44 -05:00
Brian Smith
63a5559689
VRFS-689 integrate email / Google+ invitation dialog
2013-12-01 01:25:01 -05:00
Brian Smith
4824ca4eb3
VRFS-689 show pending band invitations on Band Profile Members tab
2013-12-01 01:11:23 -05:00
Brian Smith
419ff2793d
VRFS-689 reset form when cancelling setup
2013-11-30 16:35:22 -05:00
Brian Smith
4fadedb04b
VRFS-689 added validations for required fields
2013-11-30 16:19:20 -05:00
Jonathan Kolyer
c3d49de7f1
vrfs-868: added auth_action route to enable GET-based actions requiring authentication
2013-11-28 06:15:22 -06:00
Jonathan Kolyer
1d0b07cbe1
vrfs-775: fixed arg handling in new musicians email
2013-11-27 23:35:16 -06:00
Jonathan Kolyer
4e6c0119ed
Merge branch 'musicians_page' into develop
2013-11-27 22:36:28 -06:00
Brian Smith
37c571d9ea
VRFS-689 city/state/country dropdowns should be dynamic using REST API
2013-11-28 00:36:32 -05:00
Jonathan Kolyer
01242f3c40
vrfs-775: added comments; minor code tweaks
2013-11-27 22:32:13 -06:00
Brian Smith
71eae1dbb2
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2013-11-27 00:57:56 -05:00
Brian Smith
2cd70405e0
fix bug introduced in create session friend selector
2013-11-27 00:57:49 -05:00
Jonathan Kolyer
ece8873e6e
Merge branch 'musicians_page' into develop
2013-11-26 09:07:12 -06:00
Jonathan Kolyer
6253b90697
vrfs-775: fixed title to pass test
2013-11-26 09:07:02 -06:00
Jonathan Kolyer
2c30b51048
Merge branch 'musicians_page' into develop
2013-11-26 09:01:08 -06:00
Jonathan Kolyer
e57a276144
vrfs-775: added rake task; updating plain text email
2013-11-26 09:00:50 -06:00
Jonathan Kolyer
c792b5216a
vrfs-775: tuning the new musician email
2013-11-26 08:40:06 -06:00
Jonathan Kolyer
cde19cde56
vrfs-775: formatting new musicians email
2013-11-26 03:08:22 -06:00
Jonathan Kolyer
ee9b203f99
vrfs-775: integrating new musician emails
2013-11-26 00:03:42 -06:00
Jonathan Kolyer
743048e95b
Merge branch 'musicians_page' into develop
2013-11-25 20:46:11 -06:00
Brian Smith
7aeb182f1f
VRFS-866 band invitations / notifications
2013-11-26 02:47:56 -05:00
Jonathan Kolyer
cc3994e950
Merge branch 'develop' into musicians_page
2013-11-25 15:57:36 -06:00
Jonathan Kolyer
2748588caa
testing updates
2013-11-25 15:56:54 -06:00
Jonathan Kolyer
114daf2818
vrfs-774: replaced raw HTML with rails helpers
2013-11-23 16:54:01 -06:00
Jonathan Kolyer
b50c46dd32
vrfs-774: converted raw html into rails helpers
2013-11-23 16:25:27 -06:00
Brian Smith
2586601a17
fix test
2013-11-23 15:38:34 -05:00
Brian Smith
ff4c25285e
VRFS-689 band creation works (minus avatar, form validations, and band invite notifications)
2013-11-23 15:06:42 -05:00
Jonathan Kolyer
9efefb485e
vrfs-774: refactored api tests; added geocoding support
2013-11-23 06:17:58 -06:00
Jonathan Kolyer
0eb9ddc4d6
vrfs-774: changed value of Search::PARAM_MUSICISN to srch_m
2013-11-23 06:17:23 -06:00
Jonathan Kolyer
1941c65b66
vrfs774: fixed bug in latlng/distance when city param used; added M_MILES_DEFAULT; changed value of PARAM_MUSICIAN
2013-11-23 06:16:40 -06:00
Jonathan Kolyer
58bed4bc04
vrfs774: added musicians_geocoded scope
2013-11-23 06:15:49 -06:00
Jonathan Kolyer
d9823eac3a
vrfs-774, vrfs-775: refactored tests into smaller it blocks; added contexts
2013-11-23 02:18:12 -06:00
Jonathan Kolyer
543ef29579
vrfs-775: include musicians scope in new_musicians method
2013-11-23 02:04:28 -06:00
Jonathan Kolyer
432e5ad59b
vrfs-774: added musicians scope
2013-11-23 01:44:13 -06:00
Jonathan Kolyer
68f6225461
vrfs-774: refactoring tests, using expect syntax over should
2013-11-23 00:04:33 -06:00
Jonathan Kolyer
5b1ea983fa
vrfs-774: added upper bound to the per_page param
2013-11-23 00:04:07 -06:00
Jonathan Kolyer
c0c6879833
updated rspec version to 2.11
2013-11-23 00:03:22 -06:00
Brian Smith
205d90e25b
VRFS-689 only show band setup link if user is on his own profile
2013-11-22 00:16:03 -05:00
Brian Smith
92d9999719
VRFS-689 add links on Profile Band tab to set up band
2013-11-21 22:12:08 -05:00
Brian Smith
5b21a8b1b8
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2013-11-21 01:24:53 -05:00
Brian Smith
69bf50ff28
VRFS-689 band setup work
2013-11-21 01:24:40 -05:00
Jonathan Kolyer
b1b2a2e360
vrfs-775: added new_musicians method and test
2013-11-17 17:29:23 -06:00
Jonathan Kolyer
a8f68c6396
Merge branch 'develop' into musicians_page
2013-11-16 15:10:39 -06:00
Jonathan Kolyer
9265a2c413
vrfs-774: fixed styles in musician page
2013-11-16 15:10:11 -06:00
Seth Call
f74ef61965
* trying reset sessions
2013-11-16 19:35:01 +00:00
Seth Call
7f4c15ea87
* fixing recording feature tests
2013-11-16 18:51:54 +00:00
Seth Call
9c9c427b75
* VRFS-852 fixed
2013-11-16 15:36:23 +00:00
Seth Call
95bc077634
* merging VRFS-813 into develop branch; mostly dealing with configureTracks.js and change from client-first on track state (VRFS-852)
2013-11-16 14:05:23 +00:00
Seth Call
9805775496
* VRFS-813 - done for this feature
2013-11-16 04:35:40 +00:00
Jonathan Kolyer
555d4f1139
vrfs-774: added orderby for plays/playing; ui tweaks
2013-11-15 16:35:55 -06:00
Jonathan Kolyer
a8160cca5c
vrfs-774: implementing musician search result actions like/follow/friend
2013-11-15 14:03:03 -06:00
Jonathan Kolyer
673507458c
vrfs-774: changed blank search critieria to allow multiple results
2013-11-15 13:54:54 -06:00
Jonathan Kolyer
2783336e65
vrfs-774: changed city for Kolyer to Austin
2013-11-15 13:53:34 -06:00
Jonathan Kolyer
7be8435dc7
vrfs-774: added check for @user_counters in is_{liker,friend,follower}; change M_PER_PAGE to 10
2013-11-15 13:52:53 -06:00
Jonathan Kolyer
ac2d4770f5
vrfs-774: added top_followings; removed order_by from user_followings; fixed inverse_likes association typo which used :through => :followings instead of :through => :likes
2013-11-15 13:52:06 -06:00
Jonathan Kolyer
2c7d7bb5a4
Merge branch 'develop' into musicians_page
2013-11-14 11:57:05 -06:00
Jonathan Kolyer
a097fdbd98
vrfs-774: fixed broken test; fixed bug editing distance text
2013-11-14 11:56:20 -06:00
Anthony Davis
ecdc5dfe05
Build failing, out of memory. Disabling the four-client test
2013-11-13 08:35:26 -06:00
Anthony Davis
cd912c9b48
VRFS-850 adding integration tests and refactoring utilities.
2013-11-13 00:58:28 -06:00
Anthony Davis
a3dff94f47
MiXeD case email test, I decided the problem was with the test
2013-11-11 23:56:04 -06:00
Anthony Davis
64509f8592
VRFS-829 + adding "in session" tests. will watch Jenkins...
2013-11-11 22:57:04 -06:00
Jonathan Kolyer
4e262de50a
vrfs-774: fixed counters
2013-11-06 07:50:34 -06:00
Jonathan Kolyer
897e83fd73
vrfs-774: added pagination support; fixed some layout issues
2013-11-06 04:16:47 -06:00
Jonathan Kolyer
d33b6d13fb
Merge branch 'develop' into musicians_page
2013-11-05 19:14:21 -06:00
Jonathan Kolyer
6a62bef3a4
vrfs-774: fixed layout of filtering controls; added is_{following,friend,liker} to results data
2013-11-05 19:13:20 -06:00
Seth Call
826f89d4f3
* working through all the dependency issues with admin
2013-11-05 20:10:59 +00:00
Anthony Davis
250933490b
removing 'unf' in admin Gemfile in case it's breaking the build
2013-11-05 22:21:12 -06:00
Brian Smith
5370f8853b
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2013-11-05 22:14:38 -05:00
Brian Smith
e40b26d919
VRFS-837 check for undefined session
2013-11-05 22:14:30 -05:00
Seth Call
297bce049d
* working through all the various dependency issues of admin project
2013-11-05 20:06:38 +00:00
Jonathan Kolyer
a885582bf4
vrfs-774: removed redundant code in user_mappings, and updated test to check user_mappings
2013-11-05 09:07:02 -06:00
Jonathan Kolyer
496b63b68c
vrfs-774: updated *_count JSON attributes; added post-search processing for current_user/result likes/follow/friend settings
2013-11-05 08:49:31 -06:00
Jonathan Kolyer
0813c6efd0
vrfs-774: changed search counter names to use search_ prefix; added recording and sessions counters
2013-11-05 06:25:36 -06:00
Jonathan Kolyer
16cddf67d2
vrfs-774: added search tests, ui integration
2013-11-05 04:23:01 -06:00
Jonathan Kolyer
4379ab4283
vrfs-774: replaced User with Search as root search class; added friend counter
2013-11-05 04:14:34 -06:00
Jonathan Kolyer
1893d85e76
vrfs-774: added friend count, followings; sel_str var
2013-11-05 04:13:50 -06:00
Jonathan Kolyer
3329f8067e
vrfs-774: added order_by to followings association
2013-11-05 04:13:07 -06:00
Brian Smith
e2c59d6543
VRFS-687 fix issue with band profile social tab, added logging
2013-11-04 22:53:44 -05:00
Seth Call
21b338a5ea
* merged
2013-11-05 03:02:42 +00:00
Jonathon Wilson
a544aba19a
Merge branch 'develop' into ftue_redux
2013-11-05 19:51:30 -07:00
Jonathon Wilson
c6802c4e40
New FTUE: Prevent save if bad or unknown latency. If unknown, link to old FTUE.
2013-11-05 19:50:32 -07:00
Anthony Davis
cfb6a6133f
adding optional 'fog' dependency 'unf' to suppress warnings
2013-11-05 20:03:43 -06:00
Jonathon Wilson
1aeb358d29
Add proper showing of FTUE on Create/Join session if id hasn't been done.
2013-11-05 15:44:40 -07:00
Jonathon Wilson
443593a9ee
New FTUE. Cancel and Save buttons working with notification if you haven't selected an audio device.
2013-11-04 20:26:24 -07:00
Seth Call
6198bccf3b
* refactoring relavent tests to use create_session/find_session utility
2013-11-05 03:00:43 +00:00
Jonathon Wilson
36b561e9a5
Merge branch 'develop' into ftue_redux
2013-11-04 19:26:41 -07:00
Seth Call
f4401fc36a
* wip
2013-11-05 02:25:03 +00:00
Jonathan Kolyer
d6e4732604
vrfs-774: musician instrument api search
2013-11-04 10:18:57 -06:00
Jonathan Kolyer
a78c57424a
vrfs-774: moving search logic into api_search/Search
2013-11-04 08:58:34 -06:00
Jonathan Kolyer
76c1b4ce0a
vrfs-774: integrating results with UI
2013-11-04 08:47:30 -06:00
Jonathan Kolyer
462e4034ec
vrfs-774: changed Montana to MT for geocoding
2013-11-04 01:45:19 -06:00
Jonathan Kolyer
a8dbca3552
Merge branch 'develop' into musicians_page
2013-11-03 23:43:21 -06:00
Jonathan Kolyer
b809a75e53
vrfs-774: added current_city method
2013-11-03 23:42:41 -06:00
Jonathan Kolyer
f192bb8d56
vrfs-774: incremental ui edits
2013-11-03 23:42:02 -06:00
Seth Call
db76c34ba5
* VRFS-813 -most all frontend changes needed for start/stop recordings
2013-11-03 14:55:55 -06:00
Jonathon Wilson
f7aeca4f8f
Merge branch 'develop' into ftue_redux
2013-11-03 11:02:08 -07:00
Jonathan Kolyer
ca65a3d50e
vrfs-774: fixed inconsistent test failures
2013-11-03 08:08:25 -06:00
Jonathan Kolyer
d071ea9381
vrfs-774: added testing for populating user lat/lng when creating a connection
2013-11-03 07:10:21 -06:00
Jonathan Kolyer
f164a750c3
vrfs-774: fixed infinite loop issue setting lat/lng
2013-11-03 06:28:52 -06:00
Jonathan Kolyer
b48a298af5
merge conflict
2013-11-03 03:16:14 -06:00
Seth Call
aea3434d02
* VRFS-831 - looks finished
2013-11-03 15:23:46 -06:00
Jonathan Kolyer
2b19744683
vrfs-774: replaced original max_geo_isp db cols
2013-11-03 02:45:54 -06:00
Jonathan Kolyer
a3ee0eb533
vrfs-774: fixed location-based tests
2013-11-03 02:25:41 -06:00
Jonathan Kolyer
fdf213ec66
vrfs-774: updating musician_search logic
2013-11-03 01:52:23 -06:00
Jonathan Kolyer
6f9f72c9b5
vrfs-774: changing country value from USA to US for max_mind_geo support
2013-11-03 01:49:51 -06:00
Jonathan Kolyer
291a3a8ac2
vrfs-774: changing country value from USA to US for max_mind_geo support
2013-11-03 01:49:10 -06:00
Jonathan Kolyer
d045ae4b53
vrfs-774: geocoding tests
2013-11-03 01:43:09 -05:00
Brian Smith
5e79e34634
added biography to user model
2013-11-02 23:35:18 -04:00
Jonathan Kolyer
6513293969
vrfs-774: fixed max_mind_geo loading
2013-11-02 22:07:16 -05:00
Seth Call
2481172acb
* VRFS-831 - moving to other machine. can't tell if my mac is being strange atm
2013-11-02 20:54:32 +00:00
Brian Smith
80086efad2
VRFS-686 band profile members module
2013-11-02 09:59:04 -04:00
Brian Smith
d063ba2a37
VRFS-819 VRFS-76 band profile updates
2013-11-02 02:10:35 -04:00
Brian Smith
cb44901c03
Merge branch 'feature/vrfs_76_bands' into develop
2013-11-01 21:48:41 -04:00
Jonathan Kolyer
418f5b5109
vrfs-774: adding back old db col names
2013-11-01 18:42:21 -05:00
Jonathan Kolyer
a0cc0f83eb
vrfs-774: changed back to old db col names
2013-11-01 18:35:28 -05:00
Jonathan Kolyer
ab1645bd4c
vrfs-774: put back ip_address_to_int mapping
2013-11-01 18:13:48 -05:00
Jonathon Wilson
33eed269ed
New FTUE panel controls mostly working.
2013-10-31 12:08:05 -06:00
Brian Smith
f93685aaff
VRFS-782 fix validation bug
2013-10-29 01:30:51 -04:00
Jonathan Kolyer
e69cd18fe1
vrfs-774: fixed tests
2013-10-28 22:32:58 -05:00
Jonathan Kolyer
9f09674d77
vrfs-774: added geokit-rails and postgres_ext for geocoded user searches
2013-10-28 21:44:14 -05:00
Jonathan Kolyer
e1bce5eed8
vrfs-774: impl musician searches
2013-10-28 21:42:36 -05:00
Jonathan Kolyer
dd5be13e9f
vrfs-774: updated max_mind_geo/users table for geocoded searches
2013-10-28 21:41:52 -05:00
Jonathan Kolyer
9af93fda1e
vrfs-774: updating max_mind_geo/users data model for geocoded searches
2013-10-28 21:41:05 -05:00
Jonathan Kolyer
4ccd3b9091
vrfs-774: instrument query filtering
2013-10-28 17:19:36 -05:00
Jonathan Kolyer
f6674cfc64
vrfs-774: second musician searches working properly (likers)
2013-10-28 13:44:56 -05:00
Jonathan Kolyer
72d6d4e699
vrfs-774: second musician searches working properly (likers)
2013-10-28 12:21:07 -05:00
Jonathan Kolyer
5d4ab42906
vrfs-774: first musician searches working properly
2013-10-28 12:03:58 -05:00
Jonathan Kolyer
fe5dc2c6ab
vrfs-774: incremental commit
2013-10-28 09:22:06 -05:00
Brian Smith
5beddc7a85
VRFS-76 band profile work
2013-10-27 21:50:31 -04:00
Jonathon Wilson
1d168257d0
Visual work for new FTUE screen
2013-10-27 18:37:55 -06:00
Brian Smith
a6c1b0d79d
VRFS-76 band profile work
2013-10-27 19:53:49 -04:00
Brian Smith
3fd187c88f
VRFS-595 retrieve session when Join is clicked to check for modified session settings
2013-10-27 15:07:26 -04:00
Brian Smith
a0d8c1e1b5
VRFS-76 initial dev for band feature
2013-10-27 13:02:41 -04:00
Jonathan Kolyer
fd04b3a7b5
Merge branch 'develop' into musicians_page
2013-10-26 16:03:47 -05:00
Brian Smith
86ccc55ee5
VRFS-782 fix bug with track 2 instrument icon
2013-10-26 10:39:22 -04:00
Brian Smith
a875c98a9b
VRFS-782 removed settings gear on each track / allow track 2 input to be empty now
2013-10-26 09:38:03 -04:00
Brian Smith
dea3a37652
VRFS-782 consolidate add/configure track dialogs
2013-10-25 21:34:40 -04:00
Seth Call
9e7e905c87
Merge commit 'dcbaf4d329fac3870b64925a8b89a40ff8ec1843'
2013-10-25 07:20:38 -05:00
Seth Call
54a371a859
Merge branch 'master' of bitbucket.org:jamkazam/jam-cloud
2013-10-25 07:19:52 -05:00
Seth Call
77d38a41a8
* I can't keep straight what's pending and what's not
2013-10-24 14:59:21 -05:00
Seth Call
3afeb75297
* fixing path for /client prefix
2013-10-24 14:57:58 -05:00
Seth Call
087d4e62c5
* music_session_spec fails too much on build server. marking pending for all ests
2013-10-24 13:27:11 -05:00
Seth Call
48f7441bb3
* music_session_spec fails too much on build server. marking pending for all ests
2013-10-24 13:24:06 -05:00
Jonathan Kolyer
2a76abccf4
vrfs-492: disabled tests to avoid build failures
2013-10-24 12:40:02 -05:00
Jonathan Kolyer
fec91d1e99
merge conflict
2013-10-24 12:29:37 -05:00
Jonathan Kolyer
72e7193e1c
vrfs-774: added geokit gems
2013-10-24 12:25:55 -05:00
Jonathan Kolyer
362b60cbe9
vrfs-774: musicians page
2013-10-24 12:25:27 -05:00
Seth Call
dcbaf4d329
* VRFS-644 using icheck methods to set check/uncheck status
2013-10-23 13:45:46 -05:00
Seth Call
e0c542efae
* VRFS-644 unchecking intellectual property the 'icheck' way for case when you re-enter create session screen after a previous successful create session atempt
2013-10-23 11:57:38 -05:00
Seth Call
e843989e76
* VRFS-644 jamkazam custom png added
2013-10-23 11:39:49 -05:00
Seth Call
299d24e992
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2013-10-23 11:32:31 -05:00
Seth Call
690c547c09
* VRFS-644 - these checkboxes/radio buttons using icheck work on normal browser; switching to windows to test
2013-10-23 11:32:15 -05:00
Seth Call
362a76653d
* VRFS-796 - fixed by removing email_confirmed restirction on show/index user APIs
2013-10-23 16:22:15 +00:00
Seth Call
550a1ae6df
* VRFS-798 - close connection if a heartbeat can not be correlated to a connection, or memory state
2013-10-23 15:46:30 +00:00
Seth Call
aff6df7028
* VRFS-797; don't allow the add track handler to be registered > 1 times
2013-10-23 14:59:18 +00:00
Anthony Davis
959af51f27
VRFS-792 - nudge "change avatar" link in account page
2013-10-22 20:40:31 -05:00
Seth Call
a632682d16
* VRFS-791; making footer invisible until it's styled; only to make it possible to test that it's showing or not
2013-10-22 19:51:47 -05:00
Seth Call
efa0f064f9
* VRFS-791 - fix with no test
2013-10-22 19:37:20 -05:00
Seth Call
2d28227b9f
* VRFS-783 - the filepicker service behaves different; workaround added. test attempted, but does not work because phantomjs crashes
2013-10-22 14:27:20 -05:00
Seth Call
7a710a64c0
* fix broken music_session test because I enforce 'client' prefix everywhere
2013-10-22 13:06:04 -05:00
Seth Call
7812970343
* VRFS-778; defining all possible images for download page in template, so that rails precompile error is avoided
2013-10-22 13:03:37 -05:00
Seth Call
b918406edf
* VRFS-767, VRFS-781 - create account page updated, web layout will now expand black bar as needed
2013-10-22 12:38:21 -05:00
Seth Call
333d158fc6
* VRFS-780; forgot db migrations too. sheesh
2013-10-21 17:17:19 -05:00
Seth Call
fe5d579e67
* VRFS-780; forgot images
2013-10-21 17:14:15 -05:00
Seth Call
32a4297569
* VRFS-780 - finished, tested, etc
2013-10-21 17:13:53 -05:00
Seth Call
4b455b6d77
* removing extra 'it's which only add more test count but slower tests
2013-10-21 11:32:05 -05:00
Seth Call
ed2303b916
* VRFS-790; removing database cleaner before every test to fix alter table collisions, as well as speed up tests
2013-10-21 11:13:00 -05:00
Jonathan Kolyer
e954132043
vrfs-492: running test to detect random failures
2013-10-20 22:50:32 -05:00
Seth Call
00308c2c73
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2013-10-20 14:31:48 -05:00
Seth Call
2d29aa483f
* addng the 'you have registered as a fan' info'
2013-10-20 14:24:59 -05:00
Anthony Davis
61ae54048a
typos
2013-10-19 23:45:43 -05:00
Anthony Davis
9c00d65b2f
Merge remote-tracking branch 'origin/develop' into develop
2013-10-19 23:04:26 -05:00
Anthony Davis
bd478a2f5a
Fix find sessions spec for Jenkins
2013-10-19 23:00:40 -05:00
Seth Call
7492315f3a
* VRFS-776 - home screen updated for new spec for native client; no more disable of create/find tiles
2013-10-19 16:02:27 -05:00
Seth Call
94eac00783
* marking failing tests as pending
2013-10-19 15:11:44 -05:00
Seth Call
481514e301
* VRFS-778, VRFS-777, VRFS-788, VRFS-787-to create new downloads page, I needed to add a new layout 'web', and make user dropdown more reusable
2013-10-19 14:46:06 -05:00
Seth Call
33ce8f2959
* VRFS-789 - updated favicon in. still need to update nginx recipe via chef
2013-10-19 13:50:19 -05:00
Anthony Davis
199619edf1
Removing errant beta character
2013-10-16 23:56:03 -05:00
Anthony Davis
a641496261
Merge remote-tracking branch 'origin/develop' into develop
2013-10-16 23:53:07 -05:00
Anthony Davis
09e046e033
Cleaned up/sped up two-session test
2013-10-16 23:52:41 -05:00
Brian Smith
0517ae9ba3
VRFS-758 fix unit test - still need to clean up message
2013-10-16 21:39:00 -04:00
Jonathan Kolyer
9341b077e3
vrfs-492: added sleep in second-to-last tests
2013-10-15 15:33:26 -05:00
Jonathan Kolyer
fc8fc068d7
vrfs-492: merge conflict fix
2013-10-15 14:54:11 -05:00
Seth Call
7c7eca0964
* fixing up admin tests after changing their menu label
2013-10-16 12:28:44 -05:00
Seth Call
dffab0bc71
* marking connection failing test as pending for now
2013-10-16 11:26:00 -05:00
Seth Call
482c2cece3
* VRFS-773 - isp page avaible
2013-10-16 11:20:37 -05:00
Seth Call
f7d31668d4
* marked pending to clear up builds VRFS-758
2013-10-16 09:56:22 -05:00
Jonathan Kolyer
282c43eca8
vrfs-492: added second-to-last-person test cases; refactored test methods; added contexts
2013-10-15 14:50:57 -05:00
Seth Call
44f1ca0153
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2013-10-15 13:57:24 +00:00
Jonathan Kolyer
ed4d6cc3c6
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2013-10-15 09:54:28 -05:00
Seth Call
e0a00e9fda
* VRFS-772; partly done; I need to switch to mac to test
2013-10-16 06:22:33 -05:00
Brian Smith
0dab797948
VRFS-758 change dialog title
2013-10-16 04:09:43 -04:00
Brian Smith
8f21ead048
VRFS-758 bug fixes
2013-10-16 04:07:30 -04:00
Brian Smith
a0f4dd9e0b
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2013-10-16 03:23:51 -04:00
Brian Smith
6dd0df75d9
VRFS-758 join request notification logic
2013-10-16 03:23:43 -04:00
Anthony Davis
7b481516de
Getting latest from repo before pushing new RSpec test
...
Merge branch 'develop' of ssh://bitbucket.org/jamkazam/jam-cloud into develop
2013-10-16 01:17:01 -05:00
Anthony Davis
a67eee6ca4
Prototype two-client headless Create/Find Session test
2013-10-16 01:15:34 -05:00
Jonathan Kolyer
db5804d1cf
vrfs-768: changed url param for admin toggle to just admin; added h2 title with instructions for toggling
2013-10-15 09:54:16 -05:00
Jonathan Kolyer
360b68afc5
vrfs-492: updated stale_client to be fault-tolerant when music_session_id is nil
2013-10-15 09:35:30 -05:00
Jonathan Kolyer
6d73d27ed5
vrfs-492: added check for pre-existing MSUH record in self.save
2013-10-15 09:30:43 -05:00
Seth Call
24286b621e
* VRFS-772; the client launches but it doesn't do or say anything. I don't think it's due to web problems, thoug
2013-10-15 13:57:15 +00:00
Jonathan Kolyer
b4aa568351
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2013-10-15 08:37:14 -05:00
Jonathan Kolyer
c9618ba816
vrfs-492: fixed breaking tests for single user session
2013-10-15 08:35:11 -05:00
Jonathan Kolyer
90160381b6
added id=session-leave to LEAVE link
2013-10-15 02:59:00 -05:00
Brian Smith
17c7e73894
VRFS-727 fix syntax error in selector resulting in duplicate friend list
2013-10-14 22:25:15 -04:00
Brian Smith
520a8616bc
fix build issue with protocol buffers
2013-10-13 21:03:01 -04:00
Brian Smith
ecd247c1f7
VRFS-705 fix issue with input disappearing
2013-10-13 21:01:44 -04:00
Brian Smith
e0cfe9cb6e
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2013-10-13 19:57:42 -04:00
Brian Smith
7b027eff45
updates
2013-10-13 19:57:37 -04:00
Jonathan Kolyer
712e748218
vrfs-768: added check for user_admin_eq in scoped_collection
2013-10-10 14:42:40 -05:00
Jonathon Wilson
daaf1ca01f
Remove unnecessary call.
2013-10-12 16:38:55 -06:00
Jonathon Wilson
d741d293c8
VRFS-293. Respond to connection status changes.
2013-10-12 16:35:12 -06:00
Jonathon Wilson
6ddab3926c
Merge branch 'develop' into vrfs-293
2013-10-12 15:45:20 -06:00
Jonathon Wilson
e6c2f78f83
Start of connection indicators. Cleanup CSS.
2013-10-09 19:56:04 -06:00
Seth Call
2888d4989a
* VRFS-770 - add context.ga if a developer build of the client
2013-10-10 01:34:19 +00:00
Seth Call
025ae0cdc8
* VRFS-770 - easy fix; if a developer client build, make sure to create a context.ga
2013-10-10 01:32:35 +00:00
Seth Call
035a1213d7
Merge branch 'develop'
2013-10-08 10:19:43 -05:00
Jonathan Kolyer
f9068c63e4
VRFS-743: changed perf data link timeout to 25 years
2013-10-07 10:29:21 -05:00
Seth Call
f193e3f325
* VRFS-766 - fixed broken footer links in landing pages
2013-10-08 16:05:19 -05:00
Jonathan Kolyer
68a42393e7
VRFS-743: changed expires date to 90 days for perf data link
2013-10-07 00:22:20 -05:00
Seth Call
6472fa95ad
* adding log statement to TrackGetDevices in the configure tracks dialog
2013-10-06 13:36:25 +00:00
Brian Smith
2dc5e4073e
VRFS-640 Find Session filter changes
2013-10-06 01:22:28 -04:00
Jonathon Wilson
f4fe19809d
VRFS-583. Visually reflect mute state from peers
2013-10-05 12:24:22 -06:00
Brian Smith
7e2d4cc739
fix syntax error
2013-10-05 10:33:51 -04:00
Brian Smith
01b8c90f55
fix build issue
2013-10-05 09:06:41 -04:00
Brian Smith
70cba2d98d
VRFS-595 session invitations / fix bug with session join notifications arriving twice
2013-10-05 09:04:07 -04:00
Brian Smith
6ab0c1383d
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2013-10-04 13:32:40 -04:00
Brian Smith
28d9ae3f34
VRFS-755 fix javascript error
2013-10-04 13:32:23 -04:00
Anthony Davis
c93aa7bf3f
VRFS-665 - adding CSS to take precedence over user agent stylesheet
2013-10-04 00:02:46 +00:00
Seth Call
71349e0e2b
* VRFS-749 - simple admin smoke test added
2013-10-03 13:51:57 +00:00
Seth Call
2ec38a81ac
* VRFS-749 - hotfix by adding stub function for ga function
2013-10-03 13:00:24 +00:00
Seth Call
af94c3ad21
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2013-10-03 12:58:49 +00:00
Seth Call
ff602e4294
* VRFS-749 - fix by adding stub function
2013-10-03 12:58:39 +00:00
Brian Smith
6192a1f20c
VRFS-595 fix format of session invitation notification
2013-10-03 08:51:25 -04:00
Brian Smith
0f70fe2eb2
VRFS-755 fix issue with undefined session invitations
2013-10-03 08:09:31 -04:00
Brian Smith
73dcac9a67
VRFS-595 added session invitation notification
2013-10-03 03:16:27 -04:00
Seth Call
e4e1ed7459
* VRFS-718 fix for undefined count
2013-10-03 01:39:32 +00:00