seth
/
jam-cloud
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity
7,883 Commits 118 Branches 1,252 Tags 359 MiB
Commit Graph

2306 Commits

Author SHA1 Message Date
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
Seth Call 9abee035be * VRFS-3513 - start/stop video possible from frontentd 2015-09-30 11:26:03 -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 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 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 1dce984247 * VRFS-3519 - 2-player sessions working with custom mix 2015-09-22 15:25:48 -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
Steven Miers b3b3e46dc9 VRFS-3359 : Fix page not loading due to input tag formatting 2015-09-19 18:37:33 -05: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 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 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 004991119a * set 'are you our user' cookie to do better job with ad tracking 2015-09-09 15:10:51 -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 a4f465b6d1 * VRFS-3530, VRFS-3531 - allow user to test and disable video 2015-09-08 20:30:47 -05:00
Seth Call ba99f88048 * VRFS-3534 - fix start recording API signature 2015-09-08 10:05:26 -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
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
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 cf6f4046da VRFS-3359 : More react behavior and view updates to generic and specialized components. 2015-08-28 13:30:01 -05:00
Steven Miers 6c25907a58 VRFS-3359 : New react components for profile setup. Incremental 2015-08-27 11:25:48 -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 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
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
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
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 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 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 3fa58715fc * fix open jamtrack dialog for people with less than 10 jamtracks 2015-08-19 07:36:04 -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 f6101f3621 VRFS-3422, VRFS-3423, VRFS-3424, VRFS-3429 - JamTrack search/listing 2015-08-18 14:26:41 -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 b2b9022f50 VRFS-3359 : Styling and markup for react components, incremental. 2015-08-15 16:36:42 -05:00
Steven Miers 86a196e7c8 VRFS-3359 : Solid navigation for teacher setup steps. 2015-08-14 16:56:36 -05:00
Steven Miers fee62c225b VRFS-3359 : Navigation and additional styling/markup. 2015-08-12 13:03:32 -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
Jonathan Kolyer aa36b2f215 merging develop 2015-08-04 13:44:47 +00: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 557e19e5e7 * allow better onboarding of JamTracks including audio from Tency Music (VRFS-3296, VRFS-3386) 2015-08-09 13:37:43 -05:00
Seth Call 0c58a0c1d3 * VRFS-3364 - show metronome while jamtrack is open 2015-07-27 15:35:21 -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 82b0272786 * VRFS-3374 - relative move of media group 2015-07-23 14:12:44 -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 80edd3f8f5 * VRFS-3356 temmporary patch for MyTracks being missing 2015-07-21 21:01:13 -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
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
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 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
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 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 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 d8e712e85c * fixing more tests and slight style issues 2015-07-17 11:52:46 -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 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 be26beae09 * fix band_spec intermittent test 2015-07-16 13:12:48 -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 ef949590fe Remove stray log. 2015-07-15 17:07:24 -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 3b71931e73 merge conflict from feature/new_session (VRFS-3283) 2015-07-15 10:04:45 -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
Steven Miers 75779da846 VRFS-3190 : Fix saveInvitations method 2015-06-17 15:05:19 -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
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
Steven Miers 4e8d563184 VRFS-3247 : JS rendering of band instruments, current interests and experience. 2015-06-10 15:34:43 -05: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 b49b44f724 VRFS-3036 CSS tuning 2015-06-09 04:56:14 +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 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 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 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 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 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 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 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 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 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 caca4165fe merge feature/musician_profile_enhancements 2015-05-27 02:21:25 +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 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 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 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 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 0264c539b1 *hardcoding https where http is found 2015-05-15 18:25:47 -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 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 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
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
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
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 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 5a6049c935 VRFS-3036 more refactoring 2015-05-07 18:08:36 +00: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
Seth Call 12eeb460a3 * VRFS-3212 - track counts of concurrent packaging attempts 2015-05-07 08:49:15 -05: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 6e5472f219 * VRFS-3206 - cancel out of StopRecording earlier 2015-05-06 21:08:17 -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 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 8f445883fd VRFS-3146 - fixes for the get ready spiner 2015-05-05 10:29:30 -05:00
Seth Call 5970fae4fa * VRFS-3188 - sort instrument appropriately 2015-05-05 09:22:15 -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 99fa64f4b0 * initialize inviter when user is logged in - VRFS-3180 2015-05-04 18:24:46 -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 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 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 a2d5c0a2b9 * VRFS-3166 - only play one widget at a time 2015-05-04 07:52:30 -05:00
Seth Call 4cadabe19e * VRFS-3149 - paginator arrows now working 2015-05-03 22:27:48 -05:00
Seth Call 4cc9dbb896 * VRFS-3130 - slider shows 0 on stop 2015-05-03 22:07:23 -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 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
Seth Call 7dec27083b * VRFS-3139 - hide jamkazam virtual input text in account summary screen 2015-05-01 12:16:13 -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 51dc0c408a Merge branch 'develop' into feature/musician_profile_enhancements 2015-04-30 19:33:04 -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
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 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
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 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 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 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 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
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 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
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
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 7a760e087b Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2015-04-21 14:29:43 -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 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
Seth Call c29af72938 * fix jamtrack landing page formatting VRFS-3056 2015-04-20 22:13:30 -05:00
Seth Call 6991e8afaf * VRFS-3057 - shopping cart to reflect real price 2015-04-19 12:19:05 -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
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
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
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 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
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 eee6be5d0b * VRFS-2978 - give temporary pass to payment screen if you just filled out info 2015-04-13 15:54:23 -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 e882bb272c * VRFS-3050 - disable configure button for playback profile 2015-04-17 16:32:53 -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
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
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 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 42b58a97e8 * VRFS-3034 - workaround QtWebkit crash by conditionalizing the 'crashy' rule 2015-04-15 15:14:41 -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
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 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
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 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 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
Steven Miers 6e971b159c Fix bug found in spec. 2015-04-06 15:52:34 -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 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 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 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
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 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 80a48c60c6 * VRFS-2879 - adding 3 product pages (jamblaster, platform, jamtracks) 2015-03-31 21:08:09 -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 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 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
Jonathan Kolyer ddc4decfd3 merging feature/musician_profile_enhancements 2015-03-30 06:07:43 +00: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 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
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 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
Steven Miers 5f953d1b19 VRFS-2830 : Merge / manual fix 2015-03-25 10:56:24 -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 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
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 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 6df6165bb7 remove jamblaster notice from site 2015-03-20 09:55:35 -05:00
Seth Call 393f05f9b0 * wip 2015-03-20 09:21:29 -05:00
Seth Call 661c4ed446 * wip 2015-03-20 08:48:00 -05: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
Brian Smith 82f35e221f VRFS-2701 fixed cancel and back buttons 2015-03-18 21:42:18 -04:00
Steven Miers abb31c4e40 VFFS-2830 : Jam tracks account overview 2015-03-17 13:52:30 -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
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
Steven Miers 07b74cc3e7 VRFS-2823 : Enable proper back button behavior. 2015-03-16 00:29:57 -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 f4cd225142 VRFS-2823 : Bugfix and cleanup. 2015-03-15 19:45:58 -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
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
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
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 1b36fb812f wip 2015-03-13 09:12:33 -05: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 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 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 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 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
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 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 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 02e22ba7f3 VRFS-2795 add interests, studios selectors; some refactoring 2015-03-05 05:50:10 +00: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
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
Steven Miers 5396e66c67 Merge with develop 2015-02-27 11:51:45 -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 80e942d69e VRFS-2701 wip musician profile enhancements 2015-02-26 22:33:53 -05:00
Brian Smith 0c599ca023 Merge branch 'develop' into feature/musician_profile_enhancements 2015-02-25 21:55:57 -05:00
Seth Call 4a7d6925da * wip 2015-02-25 19:56:26 -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
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
Brian Smith 52c2128721 VRFS-2701 user website should be included for online presence check 2015-02-22 22:52:25 -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