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

953 Commits

Author SHA1 Message Date
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 5e04f72d8e paypal support 2016-12-15 12:47:08 -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 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
Seth Call abf3c6f0f5 fix jamclass posa cards 2016-10-07 11:56:48 -05:00
Seth Call 1652dabb53 fixes for retailer 2016-10-07 08:28:17 -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 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 2173a8821d various fixes for emails for second ed program 2016-09-08 18:06:04 -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
Seth Call c5f7711850 VRFS-4189 - non free jamtrack support 2016-08-02 20:46:15 -05:00
Seth Call 510d157262 * upgrade to Rails 4 as well as support JjamBlaster 2016-07-17 10:16:27 -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
Jonathan Kolyer 8592894f7a Merge branch 'develop' into VRFS-3936 2016-06-19 22:10:30 +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 c6b11e64ad VRFS-4142 - works with logged in user 2016-06-03 09:45:11 -05:00
Seth Call 88ebada41c VRFS-4142 - test drive packaging feature 2016-06-02 23:32:09 -05:00
Seth Call d4aa3bef2b bunch of jamclass fixes 2016-06-02 09:04:56 -05:00
Seth Call 920d648a2b slew of jamclass fixes 2016-05-31 19:20:03 -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 5d68fe322a VRFS-4126 - update teacher rating/student ratig post session dialog 2016-05-27 21:33:26 -05:00
Seth Call cc3576f70f attach notations, audio, and recordings done 2016-05-26 16:25:51 -05:00
Seth Call e2073b49b9 user origin tracking VRFS-4072 2016-05-23 12:26:32 -05:00
Seth Call 0c0e22df8c VRFS-4041 - side bubble for teacher help reach out 2016-05-17 20:29:56 -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
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 309ebb4e5a VRFS-3965 - manage payment features for students 2016-05-11 16:03:55 -05:00
Seth Call fe16d513be session controller 2016-05-10 12:59:01 -05:00
Seth Call 6f9d39ef16 VRFS-4050 - countdown timer 2016-05-09 16:47:55 -05:00
Seth Call 5ce780f03b Fix easydropdown oopsies 2016-05-07 13:45:02 -05:00
Seth Call e46a4b01cd 3 versions of test drive available now 2016-05-04 21:20:38 -05:00
Seth Call 2e7e4dccf9 teacher profile improvements 2016-04-30 22:12:25 -05:00
Seth Call fea26d82f5 VRFS-4037 - create a interested in school landing page 2016-04-25 22:01:15 -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 5701e888a8 Updating lessons with barely working version 2016-04-21 09:23:29 -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 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 40df9eed6f * better error reporting for bad connections on join session 2016-03-29 05:50:14 -05:00
Jonathan Kolyer bf59f4ac62 jtx ios batch purchase loading 2016-03-17 12:30:44 +00:00
Jonathan Kolyer 3d9bc9f541 jamtracks ios performance 2016-03-16 21:11:10 +00:00
Seth Call 681b27a4b4 * VRFS-3968 - refine responses for jamblaster pairing API 2016-02-29 11:35:18 -06:00
Seth Call 78c00604f3 * jamblaster user API VRFS-3918 2016-02-26 09:04:00 -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 b8a190c889 VRFS-3800 removed comment 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 d7ddff9bb7 * fix validation 2016-02-08 20:47:01 -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 2e95682b10 * wip 2016-02-01 14:14:06 -06:00
Seth Call 0f4be88677 * wip 2016-01-30 16:08:54 -06:00
Seth Call 641a553dcc merged teacher search 2016-01-28 13:55:17 -06:00
Seth Call e451c4be3d * ios purchase finalization 2016-01-28 11:31:57 -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 5a0259aa54 * VRFS-3865 - initial version of jam class student landing page 2016-01-21 06:14:13 -06:00
Seth Call 491bc8cda5 * fix null mark by specifying client = true 2016-01-16 20:54: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 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 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 48a54b812c * merged ratings 2016-01-12 21:06:23 -06:00
Seth Call 14643531dc * working minus ratings 2016-01-12 20:37:00 -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 6344e14f7d * wip 2016-01-07 05:12:11 -06:00
Seth Call 427bcd6e56 * treat risky users differently 2016-01-04 20:44:14 -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
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 fb24f3beae merged from master 2015-12-28 07:19:40 -06:00
Seth Call 89b48619a6 * working on new jamblaster landing page 2015-12-27 10:03: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
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 69363e6fd6 * revert back how free jamtracks are made 2015-12-09 12:02:22 -06:00
Seth Call 886df5d092 * master mix controls for creator or delegated 2015-12-07 20:25:43 -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 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 2a74d7ec9a * record crash dump description 2015-11-19 11:22:41 -06:00
Seth Call 7fbb215fca * VRFS-3708 - allow redemption of gift cards 2015-11-13 07:12:58 -06:00
Seth Call bb9beb9cab Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2015-11-09 15:33:14 -06:00
Jonathan Kolyer f41aced15f VRFS-3681 reverted changes for develop branch merge 2015-11-08 22:44:15 +00:00
Jonathan Kolyer 57314a9b1c VRFS-3681 reverting edits prior to develop branch merge 2015-11-08 22:24:31 +00:00
Seth Call 99cd31ea78 * whitespace change 2015-11-01 16:22:43 -06:00
Jonathan Kolyer 1fe20d6c2b merging develop 2015-10-24 01:58:49 +00:00
Seth Call f002864a08 * most of VRFS-3674 (detect browser-based fraud) done 2015-10-23 14:42:51 -05:00
Seth Call 95ec9ce66e * VRFS-3667 - put download buttons in client app view 2015-10-22 09:04:49 -05:00
Jonathan Kolyer 8e88e7fe7e Merge branch 'develop' into feature/mobile 2015-10-22 09:02:42 +00:00
Jonathan Kolyer 7a2dd6ea0b VRFS-3459 merging develop 2015-10-19 19:58:41 +00: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 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
Jonathan Kolyer c700f856e5 Merge branch 'develop' into feature/mobile 2015-10-13 17:34:12 +00:00
Seth Call 276442a9b4 * VRFS-3512 - upload videos to youtube 2015-10-07 21:12:26 -05:00
Jonathan Kolyer 0c25d0e40b merging develop 2015-10-05 14:06:39 +00:00
Seth Call 9abee035be * VRFS-3513 - start/stop video possible from frontentd 2015-09-30 11:26:03 -05:00
Seth Call a0feb09509 * check in missing images 2015-09-22 05:48:00 -05:00
Seth Call 4a647b8bd1 * VRFS-3519 - client and server jamtrack mixdown support 2015-09-21 20:01:39 -05:00
Jonathan Kolyer 5534ec0224 VRFS-3459 mixdown merging 2015-09-21 01:00:38 +00:00
Jonathan Kolyer 4b01097c97 VRFS-3393 register api--first draft 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
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 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 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 544ab4539e * wip 2015-09-10 06:08:29 -05:00
Seth Call 2260350fc4 * wip 2015-09-09 06:11:16 -05:00
Seth Call c802759e42 * wip 2015-09-08 15:30:44 -05:00
Seth Call e29050b0db wip 2015-09-08 09:59:53 -05:00
Seth Call 0076f0205a * VRFS-352 - instrument-centric landing page 2015-09-04 15:00:45 -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 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
Seth Call e7b50ca4a8 * VRFS-3449 - updates for direct landing pages 2015-08-20 14:19:07 -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 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 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
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 968722bf80 VRFS-3359 : Routes and controller API, with test. 2015-08-08 15:00:16 -05:00
Jonathan Kolyer aa36b2f215 merging develop 2015-08-04 13:44:47 +00: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 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
Steven Miers 2d4ce4cf3c VRFS-3316 : Review cleanup, new tests 2015-07-21 16:55:40 -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 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
Seth Call 5c79bdab5c * make unsubscribed work, and only dump first_name 2015-06-20 14:49:11 -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
Jonathan Kolyer 3eca6aeee5 Merge branch 'feature/musician_profile_enhancements' into feature/musician_search2 2015-06-04 05:59:31 +00:00
Steven Miers d5a8959677 Merge with develop. 2015-06-03 14:22:21 -05:00
Steven Miers d60eff50ba VRFS-3246 : Support online presences and performance samples through sub-widget. Incremental. 2015-06-02 15:13:41 -05:00
Seth Call cdaac868de * JamPermissionError instead of PermissionError 2015-05-30 13:30:32 -05:00
Seth Call d959a17be4 * affiliate program in place VRFS-3030 2015-05-28 08:20:14 -05:00
Jonathan Kolyer da58ac6eab merging 2015-05-22 08:20:07 +00:00
Jonathan Kolyer 777d4a39cb VRFS-3036 tohire builder 2015-05-21 06:42:27 +00:00
Seth Call c96f0a7859 * VRFS-3260 - fraud check code and admin helpers complete 2015-05-20 09:24:17 -05:00
Steven Miers d684ecda3b Merge with latest from develop and manually fix. 2015-05-18 16:02:07 -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 792212e952 * VRFS-3260 - disable fraud 2015-05-15 23:28:46 -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 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 193888f960 VRFS-3242 : Merge with latest develop 2015-05-13 20:56:58 -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 8c04a601ab * add required websocket configs 2015-05-11 09:50:45 -05: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 6c82e7e3d7 * VRFS-3183 - website home page to have signin 2015-05-05 09:31:11 -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 12ea7312a7 * VRFS-3168 - fix sidebar on session/recording landing pages 2015-05-04 21:36:40 -05:00
Steven Miers 4c4121e4d7 Merge with latest develop 2015-05-01 20:00:08 -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 2260d21fc1 VRFS-3007 : Merge with latest develop 2015-04-28 16:43:38 -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 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 2fc8041f3f * VRFS-3077 - fix issue with no null check of current_user 2015-04-22 14:04:20 -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 022304c6af * VRFS-3065 - permission error name change 2015-04-20 10:42:09 -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 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 13027649f4 * VRFS-3023 - i want a jamblaster functionality 2015-04-15 21:37:22 -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 06c964a151 * VRFS-2977 - make facebook signup work with checkout flow 2015-04-14 14:12:24 -05:00
Brian Smith b81222278d merge develop 2015-04-13 08:16:45 -04:00
Jonathan Kolyer 252beca091 VRFS-2895 added unsubscribe link to email footer that doesnt require login 2015-04-12 11:03:12 +00: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
Seth Call 42dac058e1 VRFS-2884 - Update things in session and FTUE for default profile 2015-04-08 14:34:05 -05:00
Brian Smith 0a451742ef merge develop 2015-04-06 21:26:54 -04: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 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
Seth Call 821ca9d76a * VRFS-2875 - sales record keeping as well as recurly hook processing 2015-04-03 15:34:12 -05: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
Brian Smith a87c08afe3 Merge branch 'develop' into feature/musician_profile_enhancements 2015-04-01 23:09:51 -04:00
Seth Call 80a48c60c6 * VRFS-2879 - adding 3 product pages (jamblaster, platform, jamtracks) 2015-03-31 21:08:09 -05: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 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 83c00ea6e4 merge develop 2015-03-29 10:12:42 -04:00
Steven Miers 401fd43849 Merge branch 'feature/jam_track_ui_2' into develop 2015-03-27 15:48:08 -05:00
Seth Call e2957592ea VRFS-2605 - audiomixer manifest updated for volume and offsets 2015-03-26 17:45:23 -05:00
Jonathan Kolyer 9eeb0e454b VRFS-2795 merging with feature/musician_profile_enhancements 2015-03-26 03:31:21 +00:00
Seth Call 0848a59082 * merged develop again 2015-03-25 14:32:03 -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
Steven Miers adef8c8c45 VRFS-2830 : Payment History 
API, client, view, styles and test
 2015-03-24 17:13:09 -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
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 96a816f317 merge develop 2015-03-21 10:06:53 -04: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 661c4ed446 * wip 2015-03-20 08:48:00 -05: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
Seth Call 97d469cc85 * wip 2015-03-16 13:27:39 -05:00
Brian Smith b91bc09817 Merge branch 'develop' into feature/musician_profile_enhancements 2015-03-15 11:09:21 -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 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