seth
/
jam-cloud
mirror of https://bitbucket.org/jamkazam/jam-cloud.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
6,457 Commits 118 Branches 1,306 Tags 359 MiB
Commit Graph

139 Commits

Author SHA1 Message Date
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 599d26f883 * VRFS-3912 - apis for jamblaster pairing 2016-02-03 10:56:14 -06:00
Seth Call 641a553dcc merged teacher search 2016-01-28 13:55:17 -06:00
Seth Call 48a54b812c * merged ratings 2016-01-12 21:06:23 -06:00
Seth Call fb24f3beae merged from master 2015-12-28 07:19:40 -06:00
Seth Call bd02774db9 GiftCards are purchable 2015-11-29 13:58:10 -06:00
Seth Call 7fbb215fca * VRFS-3708 - allow redemption of gift cards 2015-11-13 07:12:58 -06:00
Seth Call f002864a08 * most of VRFS-3674 (detect browser-based fraud) done 2015-10-23 14:42:51 -05:00
Seth Call 4a647b8bd1 * VRFS-3519 - client and server jamtrack mixdown support 2015-09-21 20:01:39 -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 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
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 6edb4b6012 Merge with develop 2015-08-15 17:18:15 -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 98110f68bc VRFS-3359 : Save and test other segments of teacher profile. 2015-07-27 17:00:39 -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
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
Steven Miers cfda14e16e VRFS-3190 : Merge with latest develop branch 2015-06-16 12:23:57 -05:00
Seth Call 0dbbfc0ee7 * VRFS-2855 - broadcast notifications done 2015-06-10 08:26:45 -05:00
Steven Miers d5a8959677 Merge with develop. 2015-06-03 14:22:21 -05:00
Seth Call d959a17be4 * affiliate program in place VRFS-3030 2015-05-28 08:20:14 -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 294c01d44a Merge with latest develop 2015-05-11 17:25:37 -05:00
Seth Call 12eeb460a3 * VRFS-3212 - track counts of concurrent packaging attempts 2015-05-07 08:49:15 -05:00
Seth Call 821ca9d76a * VRFS-2875 - sales record keeping as well as recurly hook processing 2015-04-03 15:34:12 -05:00
Seth Call 5bd05321ef * add user to PlayablePlay factor 2015-03-25 14:20:52 -05:00
Seth Call 661c4ed446 * wip 2015-03-20 08:48:00 -05:00
Seth Call 97d469cc85 * wip 2015-03-16 13:27:39 -05:00
Seth Call 9279d88d8d * VRFS-2876 - pro licensing added and 20 second snippet 2015-03-10 22:10:22 -05:00
Seth Call a10705c163 * VRFS-2909 - jam tracks importer 2015-03-09 09:44:12 -05:00
Seth Call 9415593244 * merged 2015-02-27 08:41:49 -06:00
Seth Call dbaeb8d996 merged 2015-02-25 10:43:21 -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 39415cdf22 * remove BPM from jam_tracks 2015-02-17 10:41:49 -06:00
Seth Call 42a2abe99c * merged 2015-02-15 22:01:06 -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
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
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
Seth Call 2ff30946e8 * VRFS-2606 - add new tap in fields, support them in activeadmin 2015-01-07 09:30:05 -06:00
Seth Call d83a632d0b Conflicts: 
db/manifest
	web/app/assets/javascripts/jam_rest.js
 2014-12-18 15:13:55 -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
Steven Miers 6c825db79f Merge update 2014-11-10 17:10:01 -06:00
Seth Call 164fe8db61 * recording cleanup logic VRFS-2393 2014-11-06 11:26:13 -06:00
Steven Miers 433fe0be74 Initial merge and manual conflict and fix for tests. 2014-11-04 14:55:12 -06: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
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
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 b87ff571ce * VRFS-1073 - support multiple websocket gateways 2014-09-24 14:27:56 -05:00
Seth Call 61f0bd2aa0 * merged 2014-09-22 14:20:58 -05:00