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,720 Commits 118 Branches 1,306 Tags 359 MiB
Commit Graph

1652 Commits

Author SHA1 Message Date
Seth Call 25bda4de4d * skip tracks that are messing audio path 2015-10-18 08:48:17 -05:00
Seth Call 0b6b2e1b86 * node number/node count support 2015-10-17 06:48:26 -05:00
Seth Call d2d1b8facc * anonymous check is correct now, as well as video in landing page 2015-10-16 16:50:08 -05:00
Seth Call 9a8aeced51 * VRFS-3660 - fix issue with jamtrack tile page not refreshing when user buys free jamtrack 2015-10-16 15:59:29 -05:00
Seth Call 801504be2b * fixing bug when referencing name instead of first/last for feed 2015-10-16 14:56:54 -05:00
Seth Call 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
Jonathan Kolyer 325768e5e1 VRFS-3459 added plan_code to jam_track_search json 2015-10-13 17:33:12 +00:00
Seth Call aa51114e8a * deal with no refresh token better 2015-10-08 11:36:16 -05:00
Seth Call 509cc56cdb * dont let refresh attempt bust API 2015-10-08 07:50:20 -05:00
Seth Call 276442a9b4 * VRFS-3512 - upload videos to youtube 2015-10-07 21:12:26 -05:00
Jonathan Kolyer 0c25d0e40b merging develop 2015-10-05 14:06:39 +00:00
Jonathan Kolyer 5d5ea51a16 VRFS-3459 mixdown ios 2015-10-03 03:17:43 +00:00
Seth Call 9abee035be * VRFS-3513 - start/stop video possible from frontentd 2015-09-30 11:26:03 -05:00
Seth Call cb76a6e28f * VRFS-3588 generating AAC's for master previews 2015-09-29 19:57:31 -05:00
Seth Call 38aa35765d * allow someone to make a replica of the master mix if the boolean 'full' is passed with true 2015-09-26 14:37:05 -05:00
Seth Call 1733c8689d * fix typo in JamTrackCleaner 2015-09-22 09:42:53 -05:00
Seth Call 032d30c3f3 * fix query in db cleaner 2015-09-22 06:03:55 -05:00
Seth Call a0feb09509 * check in missing images 2015-09-22 05:48:00 -05:00
Seth Call 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 23bf15eb50 VRFS-3390 fixed quoting issue and text search 2015-09-21 01:00:38 +00:00
Jonathan Kolyer c1b8bf9ff7 VRFS-3391 fixing glitches from mobile tests 2015-09-21 01:00:38 +00:00
Jonathan Kolyer 5c0178df8f VRFS-3393 jam_track has_many genres support 2015-09-21 01:00:37 +00:00
Jonathan Kolyer 7e911bdb32 VRFS-3393 added KEY_RESULTS field to filter 2015-09-21 01:00:37 +00:00
Jonathan Kolyer 3c16949615 VRFS-3389 changed results schema 2015-09-21 01:00:37 +00:00
Jonathan Kolyer dd420527c0 VRFS-3398 fixing queries, api integration 2015-09-21 01:00:37 +00:00
Jonathan Kolyer af662fa714 VRFS-3389 jamtrack search 2015-09-21 01:00:37 +00:00
Jonathan Kolyer 10d4d99953 VRFS-3389 fetch genres/instrumnets only with jamtracks; initial search impl 2015-09-21 01:00:37 +00:00
Seth Call 077b5a700d * allow jamblaster to fetch http 2015-09-21 01:00:37 +00:00
Seth Call 468b0c4998 * adding guess code and fixing importer 2015-09-20 15:14:45 -05:00
Steven Miers 2e4dfaa728 Squashed commit of the following: 
commit 30965c6351
Author: Seth Call <sethcall@gmail.com>
Date:   Tue Sep 15 05:23:27 2015 -0500

    * allow jamblaster to fetch http

commit 5c8fb6b01e
Author: Seth Call <sethcall@gmail.com>
Date:   Fri Sep 11 13:43:07 2015 -0500

    * don't issue stop video in session end

commit 3e27680ea9
Author: Seth Call <sethcall@gmail.com>
Date:   Fri Sep 11 13:40:34 2015 -0500

    * decommision webcam_viewer in session page

commit ac1cc0c828
Author: Seth Call <sethcall@gmail.com>
Date:   Thu Sep 10 07:24:42 2015 -0500

    * VRFS-3541 - don't use HTML to store data sent to server for genre
ID bug in profile

commit 004991119a
Author: Seth Call <sethcall@gmail.com>
Date:   Wed Sep 9 15:10:51 2015 -0500

    * set 'are you our user' cookie to do better job with ad tracking

commit 13a950e65f
Author: Seth Call <sethcall@gmail.com>
Date:   Wed Sep 9 07:58:46 2015 -0500

    * align disable vide obutton better

commit 9722c6cbc6
Author: Seth Call <sethcall@gmail.com>
Date:   Wed Sep 9 07:45:18 2015 -0500

    * whitesapce

commit 3976707b14
Author: Seth Call <sethcall@gmail.com>
Date:   Wed Sep 9 07:13:51 2015 -0500

    * check for video enabled better

commit b483dd537f
Author: Seth Call <sethcall@gmail.com>
Date:   Wed Sep 9 07:02:12 2015 -0500

    * better text for video test

commit a4f465b6d1
Author: Seth Call <sethcall@gmail.com>
Date:   Tue Sep 8 20:30:47 2015 -0500

    * VRFS-3530, VRFS-3531 - allow user to test and disable video

commit ba99f88048
Author: Seth Call <sethcall@gmail.com>
Date:   Tue Sep 8 10:05:26 2015 -0500

    * VRFS-3534 - fix start recording API signature

commit 386ed8144c
Author: Seth Call <sethcall@gmail.com>
Date:   Sun Sep 6 19:03:08 2015 -0500

    * VRFS-3528 - make sure open jamtrack dialog passes
'show_purchased_only'

commit 6d010a561b
Author: Seth Call <sethcall@gmail.com>
Date:   Fri Sep 4 20:43:15 2015 -0500

    * deal with too-few tracks on landing page, and the 3rd CTA bubble
clipping off text

commit 0076f0205a
Author: Seth Call <sethcall@gmail.com>
Date:   Fri Sep 4 15:00:45 2015 -0500

    * VRFS-352 - instrument-centric landing page

commit 3ee71634b3
Author: Seth Call <sethcall@gmail.com>
Date:   Wed Sep 2 09:40:06 2015 -0500

    * remove test stuff

commit d07ac009bf
Author: Seth Call <sethcall@gmail.com>
Date:   Tue Sep 1 08:11:35 2015 -0500

    * VRFS-3509 - case where no device is configured handled

commit 9420cebad4
Author: Seth Call <sethcall@gmail.com>
Date:   Sun Aug 30 05:00:00 2015 -0500

    * VRFS-3494 - show popup when video window launches for the 1st
time to offer guidance

commit c3f81a4d23
Author: Seth Call <sethcall@gmail.com>
Date:   Thu Aug 27 10:35:43 2015 -0500

    * build bump

commit e782d5f9bb
Author: Seth Call <sethcall@gmail.com>
Date:   Thu Aug 27 09:43:40 2015 -0500

    * VRFS-3419 - check better for window opener

commit 36b6699cde
Author: Seth Call <sethcall@gmail.com>
Date:   Thu Aug 27 08:12:47 2015 -0500

    * validate popup VRFS-3419

commit 8948f0498f
Author: Seth Call <sethcall@gmail.com>
Date:   Thu Aug 27 07:59:21 2015 -0500

    * fix changed path

commit 2bce35d604
Author: Seth Call <sethcall@gmail.com>
Date:   Wed Aug 26 20:38:34 2015 -0500

    * fix jamtrack test

commit 63ef63c20d
Author: Seth Call <sethcall@gmail.com>
Date:   Wed Aug 26 20:34:40 2015 -0500

    * fix typo again in webcamViewer. need to go to bed

commit 8566cc5bc9
Author: Seth Call <sethcall@gmail.com>
Date:   Wed Aug 26 20:31:34 2015 -0500

    * fix typo added in webcamViewer

commit 22ea6e89fd
Author: Seth Call <sethcall@gmail.com>
Date:   Wed Aug 26 20:26:39 2015 -0500

    * VRFS-3488 - jamtrack search by artist and song need to pin to the
match, not do a sloppy search

commit a4bd28e168
Author: Seth Call <sethcall@gmail.com>
Date:   Wed Aug 26 16:43:34 2015 -0500

     VRFS-3474 - watch for USB events and refresh video pages

commit d2edfd22c5
Author: Seth Call <sethcall@gmail.com>
Date:   Wed Aug 26 12:01:52 2015 -0500

    * VRFS-3467 - previews are 20 seconds long indicator on jamtracks

commit defdfa8ce9
Author: Seth Call <sethcall@gmail.com>
Date:   Wed Aug 26 06:04:53 2015 -0500

    * VRFS-3473 - fix 'videoShared' state in webcamViewer

commit 090cfa17c0
Merge: 7560b34 818596a
Author: Seth Call <sethcall@gmail.com>
Date:   Tue Aug 25 14:53:35 2015 -0500

    Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into
develop

commit 7560b340c7
Author: Seth Call <sethcall@gmail.com>
Date:   Tue Aug 25 14:52:05 2015 -0500

    * VRFS-3466 - updated frontend to pass in GUIDs

commit 1252dbe178
Author: Seth Call <sethcall@gmail.com>
Date:   Tue Aug 25 05:28:15 2015 -0500

    * use new bridge calls to handle current FPS and resolution
VRFS-3428

commit 818596ae36
Author: Jonathan Kolyer <jonathan@jamkazam.com>
Date:   Tue Aug 25 08:23:52 2015 +0000

    VRFS-3451 musician_search verifying instrument and genres inputs

commit 6918eaf095
Author: Seth Call <sethcall@gmail.com>
Date:   Mon Aug 24 17:55:06 2015 -0500

     more UI tweaks for video settup in account screen VRFS-3428

commit fc69242578
Author: Seth Call <sethcall@gmail.com>
Date:   Mon Aug 24 16:18:31 2015 -0500

    * VRFS-3427 - update FTUE to test video, not just audio

commit 729974013a
Author: Seth Call <sethcall@gmail.com>
Date:   Mon Aug 24 16:17:53 2015 -0500

    * VRFS-3428 - fix button text

commit db1f1d60d5
Merge: 04825d2 90c8d05
Author: Seth Call <sethcall@gmail.com>
Date:   Mon Aug 24 15:56:42 2015 -0500

    Merge branch 'feature/video_frontend' into develop

commit 04825d2659
Author: Seth Call <sethcall@gmail.com>
Date:   Mon Aug 24 15:54:59 2015 -0500

    * VRFS-3428 - update how we query backend for frame rates

commit 39d0731d74
Author: Seth Call <sethcall@gmail.com>
Date:   Sat Aug 22 05:44:59 2015 -0500

    * VRFS-3456 - remove special chars from search

commit 1874720ee8
Author: Seth Call <sethcall@gmail.com>
Date:   Sat Aug 22 05:32:28 2015 -0500

    * VRFS-3456 - protect special chars from tsquery

commit 29104ff09b
Author: Seth Call <sethcall@gmail.com>
Date:   Fri Aug 21 05:02:48 2015 -0500

    * VRFS-3446 - bug fix for no genre specified on join of session;
also fix search bar in jamtrack dialog

commit 3b6d1febdb
Author: Seth Call <sethcall@gmail.com>
Date:   Thu Aug 20 15:44:21 2015 -0500

    * forget cta image

commit 6ac622853c
Author: Seth Call <sethcall@gmail.com>
Date:   Thu Aug 20 15:02:55 2015 -0500

    * VRFS-3449 - a little more tweaking of JamTrack landing page

commit d7fcadcd0d
Author: Seth Call <sethcall@gmail.com>
Date:   Thu Aug 20 14:49:07 2015 -0500

    * VRFS-3450 - fix 'show all tracks' when pagination occurs by not
doubleregistering

commit e7b50ca4a8
Author: Seth Call <sethcall@gmail.com>
Date:   Thu Aug 20 14:19:07 2015 -0500

    * VRFS-3449 - updates for direct landing pages

commit 0d075a9568
Author: Seth Call <sethcall@gmail.com>
Date:   Thu Aug 20 09:19:17 2015 -0500

    * fix spacing issue

commit 9c17d9a024
Merge: 9873450 0b67ef5
Author: Seth Call <sethcall@gmail.com>
Date:   Thu Aug 20 09:06:48 2015 -0500

    Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into
develop

commit 98734506df
Author: Seth Call <sethcall@gmail.com>
Date:   Thu Aug 20 09:06:36 2015 -0500

    * VRFS-3448 - fix invisible downloader

commit 90c8d05d00
Author: Seth Call <sethcall@gmail.com>
Date:   Wed Aug 19 14:17:10 2015 -0500

    * wip

commit bf4044d92e
Author: Seth Call <sethcall@gmail.com>
Date:   Wed Aug 19 09:24:14 2015 -0500

    * VRFS-3422 - don't die if the user has on sale_line_items

commit 87c62b4db2
Author: Seth Call <sethcall@gmail.com>
Date:   Wed Aug 19 08:29:22 2015 -0500

    * a fix for linux? hfa code

commit 3fa58715fc
Author: Seth Call <sethcall@gmail.com>
Date:   Wed Aug 19 07:36:04 2015 -0500

    * fix open jamtrack dialog for people with less than 10 jamtracks

commit d045c94f54
Author: Seth Call <sethcall@gmail.com>
Date:   Wed Aug 19 07:17:37 2015 -0500

    * more HFA request polish

commit dc343f10e3
Author: Seth Call <sethcall@gmail.com>
Date:   Wed Aug 19 07:01:47 2015 -0500

    * don't show free jamtrack notice on landing page if
redeemed_jamtrack cookie is set

commit e6618da456
Author: Seth Call <sethcall@gmail.com>
Date:   Tue Aug 18 21:29:15 2015 -0500

    * fix a bug in figuring out if the user should be show GET IT FREE

commit 5ba03a2755
Author: Seth Call <sethcall@gmail.com>
Date:   Tue Aug 18 20:41:37 2015 -0500

    * VRFS-3431 - better response when creating HFA request

commit 37d6c3e57c
Author: Seth Call <sethcall@gmail.com>
Date:   Tue Aug 18 15:19:40 2015 -0500

    * add csv to dump released JamTracks

commit f6101f3621
Author: Seth Call <sethcall@gmail.com>
Date:   Tue Aug 18 14:26:41 2015 -0500

    VRFS-3422, VRFS-3423, VRFS-3424, VRFS-3429 - JamTrack search/listing

commit 0b67ef5f52
Author: Jonathan Kolyer <jonathan@jamkazam.com>
Date:   Sat Aug 15 15:03:00 2015 +0000

    fixed test for instruments in musician search
 2015-09-19 16:33:39 -05:00
Seth Call a597671712 * send out event when it kicks off 2015-09-17 22:20:37 -05:00
Seth Call 3d2eeba638 * found some state/error transition bugs 2015-09-17 22:13:07 -05:00
Seth Call db34ac1611 * fix sbsms invocation 2015-09-17 20:06:14 -05:00
Seth Call b107df2478 * fix bugs 2015-09-17 17:31:00 -05:00
Seth Call ac7f762a1d * edit mixdown API handles 'active' boolean 2015-09-15 12:44:43 -05:00
Seth Call 30965c6351 * allow jamblaster to fetch http 2015-09-15 05:23:27 -05:00
Seth Call 8bcef09ae4 * wip 2015-09-15 05:07:41 -05:00
Seth Call 7e28b115a2 * allow jkz's to be built 2015-09-12 14:59:21 -05:00
Seth Call d5fd7b6384 * make aac work, validate that pitch & speed are integer 2015-09-12 13:49:30 -05:00
Seth Call 0741119a5d Merge branch 'develop' into feature/mixdown 2015-09-12 11:25:24 -05:00
Seth Call ad24f3d3b6 * packager working, apis working 2015-09-11 21:11:19 -05:00
Seth Call 9bce6964bd * wip 2015-09-11 12:53:00 -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 50684890cb * wip 2015-09-07 14:00:04 -05:00
Seth Call 386ed8144c * VRFS-3528 - make sure open jamtrack dialog passes 'show_purchased_only' 2015-09-06 19:03:08 -05:00
Seth Call 0076f0205a * VRFS-352 - instrument-centric landing page 2015-09-04 15:00:45 -05:00
Seth Call ff01b6df0e * wip 2015-09-04 13:11:42 -05:00
Steven Miers 3f2fd94c58 VRFS-3359 : Update schema and models with per-month and per-lesson price for each interval. Update tests to match. 2015-09-03 01:53:28 -05:00
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 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 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
Jonathan Kolyer 818596ae36 VRFS-3451 musician_search verifying instrument and genres inputs 2015-08-25 08:23:52 +00:00
Seth Call 39d0731d74 * VRFS-3456 - remove special chars from search 2015-08-22 05:44:59 -05:00
Seth Call 1874720ee8 * VRFS-3456 - protect special chars from tsquery 2015-08-22 05:35:25 -05:00
Seth Call e7b50ca4a8 * VRFS-3449 - updates for direct landing pages 2015-08-20 14:19:07 -05:00
Seth Call bf4044d92e * VRFS-3422 - don't die if the user has on sale_line_items 2015-08-19 09:24:14 -05:00
Seth Call 87c62b4db2 * a fix for linux? hfa code 2015-08-19 08:29:22 -05:00
Seth Call d045c94f54 * more HFA request polish 2015-08-19 07:17:37 -05:00
Seth Call 5ba03a2755 * VRFS-3431 - better response when creating HFA request 2015-08-18 20:41:37 -05:00
Seth Call 37d6c3e57c * add csv to dump released JamTracks 2015-08-18 15:19:40 -05:00
Seth Call f6101f3621 VRFS-3422, VRFS-3423, VRFS-3424, VRFS-3429 - JamTrack search/listing 2015-08-18 14:26:41 -05:00
Steven Miers 6edb4b6012 Merge with develop 2015-08-15 17:18:15 -05:00
Steven Miers c1927dd20a VRFS-3359 : Teacher API detail method 
* Now includes sub-records: genres, instruments, languages, subjects
* Test to verify
 2015-08-15 16:35:51 -05:00
Seth Call efbecded54 * fix importer on oriental/asian 2015-08-15 14:26:54 -05:00
Seth Call e62d9e126f * VRFS-3435 allow multiple onboarders to execute 2015-08-15 06:22:46 -05:00
Seth Call ee6493afd3 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2015-08-13 11:10:04 -05:00
Seth Call d36999032f * expand part size 2015-08-13 11:09:54 -05:00
Seth Call 40f3b7d83e * correct part deduplicator 2015-08-12 10:14:54 -05:00
Seth Call 03f5407727 * deal with duplicate instrument/parts better than failing 2015-08-12 09:36:42 -05:00
Seth Call 5300f62063 * don't eat up horns part if specified 2015-08-11 05:51:58 -05:00
Seth Call 795f0b5375 * allow a non-video client into a session on a server configured with video 2015-08-10 11:05:24 -05:00
Seth Call aec3d106fa * more scopes for onboarding 2015-08-09 17:27:30 -05:00
Seth Call da726a574b * remove unique constraint on jamtrack name 2015-08-09 14:20:21 -05:00
Seth Call af355ec096 * get activeadmin working for JamTracks after onboarding enhancements were added 2015-08-09 13:47:49 -05:00
Seth Call 557e19e5e7 * allow better onboarding of JamTracks including audio from Tency Music (VRFS-3296, VRFS-3386) 2015-08-09 13:37:43 -05:00
Steven Miers 8908ef3081 VRFS-3359 : Validations and tests for introductory video. 2015-08-08 15:01:38 -05:00
Jonathan Kolyer c11cc5eb9e added fixmes for sql injection vulnerabilities 2015-08-04 14:11:46 +00:00
Jonathan Kolyer aa36b2f215 merging develop 2015-08-04 13:44:47 +00:00
Steven Miers c89d537904 VRFS-3359 : Teacher profile, staged validations and specs. 2015-07-28 14:00:14 -05:00
Steven Miers 98110f68bc VRFS-3359 : Save and test other segments of teacher profile. 2015-07-27 17:00:39 -05:00
Steven Miers 460783a5aa VRFS-3359 : Teacher models, relationships, some validations, and initial tests. 2015-07-27 10:02:37 -05:00
Seth Call 6fede36b04 * protect against double-activation of search of find session screen 2015-07-22 08:16:00 -05:00
Seth Call bade8884f3 * stop influxdb prints in web tests 2015-07-22 07:52:41 -05:00
Steven Miers 82aa6bb244 Use scopes to clean up. 2015-07-21 19:14:18 -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 bd4b3380c2 VRFS-3316 : Review query method and spec to verify. 2015-07-20 20:33:20 -05:00
Steven Miers 74b8c81a8a VRFS-3316 : Review query method and spec to verify. 2015-07-20 19:11:52 -05:00
Steven Miers 2c594bf783 VRFS-3316 : Reduce method to roll up reviews 
* Creates review_summaries
* Calculate and store wilson score
* Unit tests
 2015-07-20 16:49:22 -05:00
Steven Miers 4b52d97a64 VRFS-3316 : Review summary uniqueness validation and spec. 2015-07-20 11:35:16 -05:00
Steven Miers 0beb386bea VRFS-3316 : Review Uniqueness validation and spec. 2015-07-20 11:29:19 -05:00
Steven Miers 91a8b4ab9c VRFS-3316 : Reviews/Ratings 
* schemas for reviews and review_summaries
* migrations
* models
* validations
* initial specs to verify creation of reviews and review_summaries with
a jamtrack and subsequently, various validations.
 2015-07-20 11:01:08 -05:00
Steven Miers 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 c5033435f2 * fixing feed_spec 2015-07-17 07:18:27 -05:00
Seth Call be26beae09 * fix band_spec intermittent test 2015-07-16 13:12:48 -05:00
Seth Call efe3dea8e3 * updating Rails to 3.2.22 to allow compat with ruby 2.2.2 2015-07-16 10:58:03 -05:00
Steven Miers f389f07b52 VRFS-3338 : Tests for genre validation behavior. 2015-07-15 19:33:10 -05:00
Steven Miers 7f35bab8c7 Fixes VRFS-3338 : Set & validate genres on updates to a valid band. 2015-07-15 18:56:45 -05:00
Seth Call 393696a0f8 * fixing ruby tests and trying to harvest up db deb's better 2015-07-15 11:25:58 -05:00
Seth Call 3b71931e73 merge conflict from feature/new_session (VRFS-3283) 2015-07-15 10:04:45 -05:00
Steven Miers 2761ea8ed7 Merged session reminder feature branch. 
Squashed commit of the following:

commit 84293ed637
Author: Steven Miers <steven.miers@gmail.com>
Date:   Thu Jul 9 17:52:26 2015 -0500

    VRFS-3300 : Reminder notification functionality -- sends in-app/1-day/upcoming emails as necessary.

commit 521b0f4ba7
Author: Steven Miers <steven.miers@gmail.com>
Date:   Thu Jul 9 17:50:33 2015 -0500

    VRFS-3300 : Reminder mails on user mailer.   Also add tests to spec.

commit ed487e11a3
Author: Steven Miers <steven.miers@gmail.com>
Date:   Thu Jul 9 17:48:04 2015 -0500

    VRFS-3300 : Music session reminder job and spec

commit e5c7f50cd2
Author: Steven Miers <steven.miers@gmail.com>
Date:   Thu Jul 9 17:46:55 2015 -0500

    VRFS-3300 : Reminder cron setting
 2015-07-10 10:51:12 -05:00
Steven Miers 614cfcbe85 Merge feature/calendaring branch: 
commit 8023d6481c
    VRFS-3276 : Hook calendar creation into user controller API.  Add test to verify.

commit 3a35002a46
    VRFS-3276 : Calendar cleanup job

    * Add cleanup method to calendar manager
    * Create a daily job.
    * Add calendar cleanup to that job.
    * Add CRON entry
    * Daily job/ calendar cleanup test cases
    * Fix calendar manager spec for new required attribute

commit 3ff5910f1f
    VRFS-3276 : Add a delete-calendar directive when RSVP is canceled.
    VRFS-3276 : Include path to partial.  This fails depending on the method used to start the web server.

commit d2441cbf57
    VRFS-3276 : Test new calendar features. Use icalendar gem in test mode only to more deeply verify calendar in strict mode.

commit 9ac272a0fb
    VRFS-3276 : Calendar manager updates to include manual calendars.  Some refactoring to keep common stuff in one place.

commit b5d0c758f0
    VRFS-3276 : Schema, model updates and new calendar model.

commit 20472b6b26
    VRFS-3276 : Change initial submit behavior of RSVP dialog to display calendar info.  The user can then close the dialog after this prompt.

commit 77c99103d0
    VRFS-3276 : Calendar feed markup and styling.  Included as partial.

commit e632f48600
    VRFS-3276 : Routes and controller implementation of user calendar ICS feed, which uses calendar manager.

commit 21fd80a188
    VRFS-3276 : Initial tests for calendar manager

commit 92a2524c65
    VRFS-3276 : Calendar manager

    * Streamline logic
    * Enable recurring sessions through rrule
    * Implement method to create ics feed for user
    * Extract a type-safe scheduled duration method on music_session for
    external and internal use.

commit b71ad3a4cd
    VRFS-3276 : Include calendar manager

commit f8eaafd036
    VRFS-3276 : Calendar Manager - initial checkin

    * Create ICS events given individual parameters
    * Create calendar from music session
    * Also will create ICS “delete” events
 2015-07-06 15:34:27 -05:00
Jonathan Kolyer 832e716e8b Merge branch 'feature/musician_profile_enhancements' into feature/musician_search2 2015-06-28 19:52:45 +00:00
Jonathan Kolyer 4f2f37f7a9 removed latency as search; fixed regressions 2015-06-28 19:49:02 +00:00
Jonathan Kolyer 4f897fc6aa VRFS-3036 fixed typo referencing old constant SKILL_VAL_STRS 2015-06-28 04:00:44 +00:00
Steven Miers cfda14e16e VRFS-3190 : Merge with latest develop branch 2015-06-16 12:23:57 -05:00
Steven Miers 02be103694 VRFS-3190 : Fix band model tests 2015-06-15 19:09:25 -05:00
Steven Miers 8cd3b836ea VRFS-3247 : Band's online presence and performance samples specify foreign key so it won’t default to a nonexistent field name. 2015-06-10 15:31:36 -05:00
Jonathan Kolyer ebe620a3b3 VRFS-3036 fixed performance sample query and test 2015-06-10 16:35:39 +00:00
Seth Call 0dbbfc0ee7 * VRFS-2855 - broadcast notifications done 2015-06-10 08:26:45 -05:00
Jonathan Kolyer 745c448e6b VRFS-3036 CSS tuning and integration testing 2015-06-09 06:46:34 +00:00
Jonathan Kolyer 0691e079af VRFS-3036 description testing 2015-06-04 08:11:41 +00:00
Jonathan Kolyer 965ee2e0bc VRFS-3036 tests for description 2015-06-04 07:38:16 +00:00
Jonathan Kolyer 3eca6aeee5 Merge branch 'feature/musician_profile_enhancements' into feature/musician_search2 2015-06-04 05:59:31 +00:00
Jonathan Kolyer 56af10afb3 VRFS-3036 results / builder page swpping 2015-06-04 05:54:02 +00:00
Steven Miers 6c5ffd6644 VRFS-3246 : Cleanup code and style 2015-06-03 16:34:37 -05:00
Steven Miers d5a8959677 Merge with develop. 2015-06-03 14:22:21 -05:00
Jonathan Kolyer dde84587b9 VRFS-3036 syncing ui/json 2015-06-03 06:41:21 +00:00
Steven Miers d60eff50ba VRFS-3246 : Support online presences and performance samples through sub-widget. Incremental. 2015-06-02 15:13:41 -05:00
Steven Miers bd8287b528 VRFS-3246 : Remove references to current_user, change to target_player. 2015-05-31 21:50:04 -05:00
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
Seth Call de4411fbdd * add preview text and preload master on landing page 2015-05-28 13:52:20 -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
Jonathan Kolyer 4f5a39db18 VRFS-3036 band results display 2015-05-27 15:08:04 +00:00
Jonathan Kolyer 1bd1794318 VRFS-3036 band web search args 2015-05-27 08:20:46 +00:00
Jonathan Kolyer 8480f582ad VRFS-3036 tuning band search filter spec 2015-05-27 05:08:56 +00:00
Jonathan Kolyer f66cf79cf2 VRFS-3036 band search filter tests 2015-05-27 04:10:05 +00:00
Jonathan Kolyer 9757712977 VRFS-3036 testing filter by key 2015-05-27 02:58:04 +00:00
Jonathan Kolyer 7edee8d494 VRFS-3036 first pass testing 2015-05-26 08:43:11 +00:00
Jonathan Kolyer 2f28d3a342 VRFS-3036 band query 2015-05-26 06:39:43 +00:00
Jonathan Kolyer cb7b48b4ec VRFS-3036 band search querying 2015-05-22 12:09:14 +00:00
Jonathan Kolyer da58ac6eab merging 2015-05-22 08:20:07 +00:00
Jonathan Kolyer 3af55a3c14 VRFS-3036 tohire builder 2015-05-21 05:47:14 +00:00
Seth Call 8a82f86e64 fix the fully redeemed count 2015-05-20 10:17:01 -05:00
Seth Call c96f0a7859 * VRFS-3260 - fraud check code and admin helpers complete 2015-05-20 09:24:17 -05:00
Jonathan Kolyer 8d3247e084 VRFS-3036 to hire builder 2015-05-20 09:24:53 +00:00
Jonathan Kolyer 1a91704532 VRFS-3036 band search filters 2015-05-20 06:25:22 +00:00
Steven Miers f16bd28574 VRFS-3243 : Ability to selectively skip genre validation 2015-05-19 13:32:15 -05:00
Jonathan Kolyer e794ccc7af VRFS-3036 bands to_join builder controls 2015-05-19 05:48:29 +00:00
Jonathan Kolyer d76f54b40e VRFS-3036 fixed broken merge 2015-05-19 00:52:35 +00:00
Jonathan Kolyer 21f90d7352 merging 2015-05-19 00:45:53 +00:00
Steven Miers d684ecda3b Merge with latest from develop and manually fix. 2015-05-18 16:02:07 -05:00
Seth Call 781a9838b7 * VRFS-3216 - add virtual page views for JamTrack funnels, add test mode for fraud check VRFS-3260 2015-05-18 10:33:58 -05:00
Jonathan Kolyer 737367b016 VRFS-3036 building out band search filter features, refactoring musician search filter 2015-05-18 04:00:12 +00:00
Seth Call f5595a03d5 * actually send email when fraud detected 2015-05-16 10:18:35 -05:00
Seth Call 792212e952 * VRFS-3260 - disable fraud 2015-05-15 23:28:46 -05:00
Seth Call 0264c539b1 *hardcoding https where http is found 2015-05-15 18:25:47 -05:00
Seth Call 8e7ebcf3d6 * VRFS-3236 - update landing pages for jamtracks 2015-05-15 15:02:00 -05:00
Seth Call 939f8cdf82 * VRFS-3255 (shopping cart only on /client) , VRFS-3253 - frictionless shopping done with tests 2015-05-15 12:34:35 -05:00
Steven Miers c5ee5a58fd VRFS-3242 : Fix one last reference to user_id. 2015-05-13 23:23:30 -05:00
Steven Miers 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 831fdf8c8e * add https to artifact update 2015-05-12 11:55:55 -05:00
Seth Call 64a64e99bb * VRFS-2680 - try out audiomixer/quick mixer without secure PUT 2015-05-12 08:47:26 -05:00
Steven Miers 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 f2aba1e390 * VRFS-3235 - download helper 2015-05-11 11:15:57 -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 0b64986766 VRFS-3036 refactoring musician_search into base_search for band_search 2015-05-07 19:02:21 +00:00
Jonathan Kolyer 674d1de2d3 VRFS-3036 refactoring band search 2015-05-07 19:02:21 +00:00
Jonathan Kolyer 7e2e5241bf VRFS-3036 refactoring musician_search into base_search for band_search 2015-05-07 19:02:21 +00:00
Jonathan Kolyer 5a6049c935 VRFS-3036 more refactoring 2015-05-07 18:08:36 +00:00
Seth Call 4df95f45fe * jamtrack cleaner needs to be tested manually 2015-05-07 12:18:24 -05:00
Jonathan Kolyer 6a23477c4e VRFS-3036 more refactoring 2015-05-07 17:11:24 +00:00
Jonathan Kolyer 4658f72f98 VRFS-3036 refactoring musician_search into base_search for band_search 2015-05-07 14:41:27 +00: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 12eeb460a3 * VRFS-3212 - track counts of concurrent packaging attempts 2015-05-07 08:49:15 -05:00
Jonathan Kolyer 749c58f377 VRFS-3036 refactoring band search 2015-05-07 13:21:53 +00:00
Jonathan Kolyer ce3bf635f0 VRFS-3036 refactoring musician_search into base_search for band_search 2015-05-07 12:55:13 +00:00
Seth Call 05f5cd619a * VRFS-3193 - indicate on jamtrack browse page that 1st jamtrack is free 2015-05-05 16:38:29 -05:00
Seth Call ceb00c1735 * remove jamtrack download ready notification 2015-05-05 14:36:07 -05:00
Seth Call 6c40ede050 * bug in VRFS-3176 jamtrack preview regenerator 2015-05-05 11:46:58 -05:00
Seth Call 96df8cbfea * disabling teaspoon gemfile for now, because of weird errors; and also VRFS-3176 (jamtrack preview regen task) 2015-05-05 11:44:28 -05:00
Seth Call d13204336b * VRFS-3189 - don't include master track when checking for instruments 2015-05-04 22:06:35 -05:00
Seth Call f31a40343e * add jmep as warning to onboarding flags column 2015-05-04 21:45:26 -05:00
Seth Call 4d28915381 * VRFS-3177 - add spinner to playback and stop preloading all media on page 2015-05-04 17:48:14 -05:00
Seth Call 9144efb8fa * VRFS-3175 - order filter by band dropdown 2015-05-04 14:50:27 -05:00
Seth Call d77ee8cd23 * VRFS-3173 - stats on active sessions 2015-05-04 14:37:49 -05:00
Steven Miers 4c4121e4d7 Merge with latest develop 2015-05-01 20:00:08 -05:00
Steven Miers 571ae9a3d6 VRFS-3007 : Fix another musician search issue and a few tests. 2015-05-01 13:22:34 -05:00
Seth Call 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 5b43688443 VRFS-3007 : Fix failure on musician search spec. 2015-04-29 15:34:28 -05:00
Steven Miers cf515a9cf0 VRFS-3007 : Fix tests and models failing due to PermissionError 2015-04-29 12:56:16 -05:00
Steven Miers 2260d21fc1 VRFS-3007 : Merge with latest develop 2015-04-28 16:43:38 -05:00
Seth Call 1bd054d050 * VRFS-3094 - update style and minor issues in shopping cart screen 2015-04-27 15:42:38 -05:00
Seth Call 907e2a4552 * fix jamtrack shopping tests for the change in button text 2015-04-27 13:42:03 -05:00
Seth Call 933d56524c * poke downloaded_since_sign on jamtrackright page 2015-04-24 14:58:31 -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 091f2be556 * make the nobody@jamkazam.com configurable so that we can override it in chef to provide context clues 2015-04-22 15:43:36 -05:00
Seth Call 05b4b8f3fa * VRFS-2605 -tested mixer manifest with latest client with jamtrack offsets and all of that 2015-04-22 14:02:44 -05:00
Seth Call 49ef08ff5d * prepare production db for preview URLS, and save jam_track after setting duration in the sync task 2015-04-22 09:44:57 -05:00
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
Seth Call 655f59fc52 * remove puts 2015-04-21 14:08:16 -05:00
Seth Call ed0d69db13 * require tzinfo explicitely 2015-04-21 13:54:08 -05:00
Seth Call 556347f35b * VRFS-2605 compute offset and seeks in manifest 2015-04-21 13:46:33 -05:00
Seth Call 03072b2e8d * VRFS-2605 - compute offset and seek based on client info 2015-04-21 11:26:55 -05:00
Seth Call c29af72938 * fix jamtrack landing page formatting VRFS-3056 2015-04-20 22:13:30 -05:00
Seth Call 2480be23ab * make the addition of duration column to jam tracks failable, since this has been applied to production in advance of the real migration 2015-04-20 20:40:50 -05:00
Seth Call 35ccd39979 * fix id-generator 2015-04-20 17:39:45 -05:00
Seth Call 8bb37c5a65 * fix incrementer 2015-04-20 14:56:10 -05:00
Seth Call b60ded91d7 * fix typo in JamTrack download notification VRFS-3064 2015-04-20 13:58:58 -05:00
Seth Call 0236353ee7 VRFS-3048 - resync task for audio updates to existing jamtracks 2015-04-20 13:56:05 -05:00
Seth Call 9480aadaae Conflicts: 
ruby/lib/jam_ruby/models/jam_track_track.rb
 2015-04-20 13:55:33 -05:00
Seth Call 022304c6af * VRFS-3065 - permission error name change 2015-04-20 10:42:09 -05:00
Seth Call 375ec7008d * wip 2015-04-20 10:42:00 -05:00
Seth Call 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 fc99fbce6c * VRFS-3058 - fix uniqueness constraint on ShoppingCart and test 2015-04-19 11:43:54 -05:00
Seth Call 3c37cbbf59 * VRFS-3042 - remove duplicate registrations on pagination 2015-04-17 14:01:07 -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
Steven Miers 4db40f6d3b VRFS-2874 : Some prerequisite functionality required for analytics. 2015-04-15 18:22:55 -05:00
Seth Call 19ad2fbcc5 * VRFS-2991 - sitemap generator done (but still vetting other parts of the site for basic SEO) 2015-04-14 16:39:39 -05:00
Seth Call 06c964a151 * VRFS-2977 - make facebook signup work with checkout flow 2015-04-14 14:12:24 -05:00
Brian Smith 75f1098ca3 Merge branch 'develop' into feature/musician_profile_enhancements 2015-04-14 03:13:27 -04:00
Seth Call 1183d0790c * add default to exiting sales databases 2015-04-13 16:05:43 -05:00
Seth Call eee6be5d0b * VRFS-2978 - give temporary pass to payment screen if you just filled out info 2015-04-13 15:54:23 -05:00
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
Brian Smith 5a4157c563 check for nil 2015-04-10 20:19:53 -04:00
Seth Call e42b926a5e * VRFS-3028 - switch to using Recurly Adjustments for JamTrack purchases 2015-04-10 15:19:08 -05:00
Brian Smith 246efbdaa8 merge develop 2015-04-09 20:47:01 -04:00
Seth Call fd02e23572 * updated home page VRFS-2868 2015-04-08 22:44:21 -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 3fd659c3df VRFS-3019 : Fix :group_artist option on JamTrack query to not also group by id, like the regular version of the query. 2015-04-08 12:53:09 -05:00
Brian Smith 0a451742ef merge develop 2015-04-06 21:26:54 -04: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 e4795d9297 VRFS-2795 fixed filter description issue 2015-04-04 15:36:15 +00:00
Jonathan Kolyer e563ad0d8b Merge branch 'feature/musician_profile_enhancements' into feature/musician_search2 2015-04-04 14:56:36 +00:00
Brian Smith 91e9e73644 VRFS-2701 adding SoundCloud/YouTube sources fully functional 2015-04-04 21:46:37 -04: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
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 c0e541b49d * importer 2015-04-01 20:38:54 -05:00
Seth Call d3cc9fa6af * download master command 2015-04-01 20:35:23 -05:00
Steven Miers 4c2d4958fe VRFS-2894 Update email / user info in recurly upon finalize. Test to verify. 2015-03-31 20:25:54 -05:00
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
Seth Call 3d43f123b1 * VRFS-2992 -make mp3 as well as ogg preview 2015-03-29 21:51:14 -05: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
Steven Miers 4f08f6acad Merge and fix 2015-03-27 09:54:01 -05:00
Seth Call e2957592ea VRFS-2605 - audiomixer manifest updated for volume and offsets 2015-03-26 17:45:23 -05:00
Steven Miers 3f994e3993 Merge branch 'develop' into feature/jam_track_ui_2 2015-03-26 11:59:49 -05:00
Steven Miers bb4ea7cd94 Merge branch 'feature/jam_track_ui_2' of bitbucket.org:jamkazam/jam-cloud into feature/jam_track_ui_2 2015-03-26 11:59:42 -05:00
Seth Call ef78471b59 Merge cherry pick 2015-03-26 11:58:41 -05:00
Seth Call 4a36bc6982 * VRFS-2988 - relax position duplication constraint 2015-03-26 10:16:14 -05:00
Jonathan Kolyer 21322318d8 VRFS-2795 latency ordering 2015-03-26 06:28:38 +00:00
Jonathan Kolyer f3344affaf VRFS-2795 distance sort order 2015-03-26 05:56:43 +00:00
Jonathan Kolyer 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 f0c4647ef5 * VRFS-2981 - check for create_type = nil in scheduled_rsvp 2015-03-25 11:26:32 -05:00
Seth Call 53ef0f1b4f VRFS-2975 - change jam track Id to varchar(64) 2015-03-25 11:11:10 -05:00
Steven Miers 5f953d1b19 VRFS-2830 : Merge / manual fix 2015-03-25 10:56:24 -05:00
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 9face3b3f9 VRFS-2701 wip presence/sample edit 2015-03-23 16:27:36 -04: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
Seth Call 04aa1a9b3c * wip 2015-03-23 08:52:52 -05:00
Brian Smith 96a816f317 merge develop 2015-03-21 10:06:53 -04:00
Seth Call b137d7586f * VRFS-2973 - fix pagination in jam trackdialog 2015-03-20 21:27:11 -05:00
Seth Call 36b4179492 * VRFS-2972 - adding test purchase feature to jam-admin for buying all JamTracks (admin users only) 2015-03-20 17:26:56 -05:00
Seth Call f29a9d7465 * wip 2015-03-20 16:15:13 -05:00
Seth Call 49368e2e66 Merge branch 'hotfix/recording_fix' into develop 2015-03-20 11:26:50 -05:00
Seth Call 301b365044 * VRFS-2968 - escape strings passed to JamTrack builder 2015-03-20 09:44:25 -05:00
Seth Call 10f25be8c4 * replace old style of volume changes VRFS-2964 2015-03-20 08:53:34 -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 bb35535262 * VRFS-2941 - fix meddling of mount_uplaoder with existing URS 2015-03-17 10:55:16 -05:00
Brian Smith c91fd0cb0e merge develop 2015-03-17 03:10:22 -04:00
Seth Call ab72438a3f * VRFS-2932 - make preview apply to all jam track tracks 2015-03-16 17:50:38 -05:00
Seth Call 97d469cc85 * wip 2015-03-16 13:27:39 -05:00
Steven Miers f4cd225142 VRFS-2823 : Bugfix and cleanup. 2015-03-15 19:45:58 -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
Jonathan Kolyer 41626860a9 VRFS-2795 replacing musician page with new search filter 2015-03-12 04:39:20 +00:00
Seth Call 9c2a0c79f6 * VRFS-2866 - making listing of JamTracks not require a logged in user 2015-03-11 21:30:56 -05:00