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

679 Commits

Author SHA1 Message Date
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 ae9249532b ACH payment consideration in teacher payments 2016-05-28 18:48:40 -05:00
Seth Call 5d68fe322a VRFS-4126 - update teacher rating/student ratig post session dialog 2016-05-27 21:33:26 -05:00
Seth Call cc3576f70f attach notations, audio, and recordings done 2016-05-26 16:25:51 -05:00
Seth Call 7737f0977e VRFS-4091 VRFS-4089 VRFS-4088 - test drive payment screen is correct now, student can always join session 2016-05-20 10:31:43 -05:00
Seth Call 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 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 5ce780f03b Fix easydropdown oopsies 2016-05-07 13:45:02 -05:00
Seth Call fea26d82f5 VRFS-4037 - create a interested in school landing page 2016-04-25 22:01:15 -05:00
Seth Call 5701e888a8 Updating lessons with barely working version 2016-04-21 09:23:29 -05:00
Seth Call 10c3571cd8 * make network test optional, add help for no audio 2016-04-13 12:05:04 -05:00
Seth Call 90c167fb91 * disable influx 2016-04-06 13:35:38 -05:00
Seth Call adf0274b73 * fixes for some tests, and also some broken functionality in the school maangement page 2016-04-06 07:06:52 -05:00
Seth Call 399d010310 * lessons 90% done, but still mostly hidden 2016-04-05 21:23:15 -05:00
Seth Call 18a92e4cc1 * iphone/mobile optimzation of landing pagse 2016-02-23 15:48:55 -06:00
Seth Call 7f6b41d8b1 * jamblaster apis VRFS-3912 2016-02-18 06:12:28 -06:00
Seth Call 0aecf7345f * code review time\! 2016-02-09 15:17:52 +00:00
Seth Call 2e81bafb01 * try out chat blast with no inactivity. fix 5 instrument validation pain 2016-02-08 06:56:54 -06:00
Seth Call 853d359a7e * VRFS-3919 - teacher testdrive settings in on pricing profile 2016-02-06 17:32:20 -06:00
Seth Call 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 5a0259aa54 * VRFS-3865 - initial version of jam class student landing page 2016-01-21 06:14:13 -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 48a54b812c * merged ratings 2016-01-12 21:06:23 -06:00
Seth Call 40de0ef04f * precompile modern 2016-01-08 16:46:50 -06:00
Seth Call 6344e14f7d * wip 2016-01-07 05:12:11 -06:00
Seth Call 3a95b22762 * add specific configs for sendgrid 2016-01-04 17:37:41 -06:00
Seth Call c5b8465012 * crash dum 2016-01-04 14:44:45 -06:00
Seth Call 4d41e2278d * screen emails 2016-01-04 13:42:11 -06:00
Seth Call 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 fb24f3beae merged from master 2015-12-28 07:19:40 -06:00
Seth Call 0305369944 * midi working for the most part 2015-12-22 21:28:19 -06:00
Seth Call 3aadfaaedb * strip out whitespace from csv 2015-12-18 15:57:27 -06:00
Seth Call ff6f133620 * import fixes for Paris 2015-12-18 11:35:56 -06:00
Seth Call 3707a3abd6 * stats working decently 2015-12-11 21:14:00 -06:00
Seth Call 03d71b0678 * disable midi via config 2015-12-11 06:45:30 -06:00
Seth Call 8e73c5bb80 * stats and vst together 2015-12-10 22:07:56 -06:00
Seth Call b07aedc9cc * merged 2015-12-10 20:54:09 -06:00
Seth Call 0376b206cf * stats workip 2015-12-10 20:52:13 -06:00
Seth Call 3388ec14db * stats wip 2015-12-10 05:21:59 -06:00
Seth Call 6314748225 * wip 2015-12-09 11:32:24 -06:00
Seth Call 34dcc27641 Merge branch 'develop' into feature/vst 2015-12-07 21:05:10 -06:00
Seth Call 886df5d092 * master mix controls for creator or delegated 2015-12-07 20:25:43 -06:00
Seth Call d9f1becb9b * merge 2015-12-04 11:37:59 -06:00
Seth Call bd02774db9 GiftCards are purchable 2015-11-29 13:58:10 -06:00
Seth Call 6d514c3df2 * api for marking purchase from ios 2015-11-28 19:38:39 -06:00
Seth Call 5fad4953bc * vst working 2015-11-13 14:00:37 -06:00
Seth Call 7fbb215fca * VRFS-3708 - allow redemption of gift cards 2015-11-13 07:12:58 -06:00
Jonathan Kolyer 57314a9b1c VRFS-3681 reverting edits prior to develop branch merge 2015-11-08 22:24:31 +00:00
Jonathan Kolyer 1bcee2e60c Merge branch 'develop' into feature/mobile 2015-11-01 02:28:10 +00:00
Seth Call fbc2e9498f * fix iphone/ipad actions, also stop doing popups anywhere 2015-10-26 16:03:43 -05:00
Seth Call 73a04d4d95 * typo added in video_upload 2015-10-24 05:13:33 -05:00
Jonathan Kolyer 1fe20d6c2b merging develop 2015-10-24 01:58:49 +00:00
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 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
Jonathan Kolyer 47def5113b VRFS-3459 config.middleware.use Rack::Deflater 2015-10-03 03:20:25 +00:00
Seth Call 4290d449ed * default to full avail 2015-09-30 12:26:24 -05:00
Seth Call 0f9b1c3f07 * don't find against notifications for a blank notify 2015-09-22 21:34:34 -05:00
Seth Call 4a647b8bd1 * VRFS-3519 - client and server jamtrack mixdown support 2015-09-21 20:01:39 -05:00
Jonathan Kolyer 4b01097c97 VRFS-3393 register api--first draft 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 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 3d2eeba638 * found some state/error transition bugs 2015-09-17 22:13:07 -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 c57e7fd527 * update show API 2015-09-12 12:38:18 -05:00
Seth Call 0741119a5d Merge branch 'develop' into feature/mixdown 2015-09-12 11:25:24 -05:00
Seth Call ad24f3d3b6 * packager working, apis working 2015-09-11 21:11:19 -05:00
Seth Call 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 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
Seth Call fc69242578 * VRFS-3427 - update FTUE to test video, not just audio 2015-08-24 16:18:31 -05:00
Seth Call e7b50ca4a8 * VRFS-3449 - updates for direct landing pages 2015-08-20 14:19:07 -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 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 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
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 a54e7cb0b4 * updated mute/volume icon 2015-07-17 09:36:47 -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
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
Seth Call 2cb01d8492 * VRFS-3268 - make bugsnag and recurly async 2015-05-29 21:33:45 -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 54a7cb40c9 * turn timing off, and track with GA 2015-05-28 11:10:50 -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
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
Seth Call 781a9838b7 * VRFS-3216 - add virtual page views for JamTrack funnels, add test mode for fraud check VRFS-3260 2015-05-18 10:33:58 -05:00
Jonathan Kolyer 737367b016 VRFS-3036 building out band search filter features, refactoring musician search filter 2015-05-18 04:00:12 +00:00
Seth Call f5595a03d5 * actually send email when fraud detected 2015-05-16 10:18:35 -05:00
Seth Call a62aaeef11 * VRFS-3260 - fraud check allowed in tests 2015-05-15 23:50:27 -05:00
Seth Call 792212e952 * VRFS-3260 - disable fraud 2015-05-15 23:28:46 -05:00
Seth Call 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
Seth Call 2723cd8a78 * VRFS-3215 - add checkoutComplete URL 2015-05-12 14:14:44 -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 62b6820e90 * VRFS-3220 - estimate taxes manually 2015-05-09 08:30:12 -05:00
Seth Call 10da152916 * VRFS-3225 - show sampler ate dropdown 2015-05-08 15:03:19 -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 12eeb460a3 * VRFS-3212 - track counts of concurrent packaging attempts 2015-05-07 08:49:15 -05:00
Seth Call f593a6d706 VRFS-3208 - let admins purchase anyway when pucrhase_nabled = false 2015-05-07 07:45:07 -05:00
Seth Call b523850296 * VRFS-3208 - add new config - purchases_enabled, so that we can stop purchases if needed 2015-05-06 22:09:07 -05:00
Seth Call a2d5c0a2b9 * VRFS-3166 - only play one widget at a time 2015-05-04 07:52:30 -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 51dc0c408a Merge branch 'develop' into feature/musician_profile_enhancements 2015-04-30 19:33:04 -05:00
Seth Call 68b4ab529a * VRFS-3118 - reload audio globally configurable 2015-04-29 22:03:02 -05:00
Steven Miers daef55d1a2 Merge branch 'develop' into feature/musician_profile_enhancements 2015-04-29 12:59:11 -05:00
Seth Call 72ff54213a * VRFS-2997 - added license to accounts link. also adding config to ignore high latency if in a pinch 2015-04-28 20:07:21 -05:00
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 13c3818c42 * add support for personal alerts email 2015-04-24 16:16:47 -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 d66f8e50d1 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2015-04-22 15:47:57 -05:00
Seth Call 091f2be556 * make the nobody@jamkazam.com configurable so that we can override it in chef to provide context clues 2015-04-22 15:43:36 -05:00
Steven Miers b916d4d997 VRFS-3055 : Multiple levels of config option video_available 
“none”, “mvp”, and “full”.  “mvp” mode is similar to full, except it
hides video recording functionality.
 2015-04-22 15:36:21 -05:00
Seth Call 763ade01dd * protect against webcamViewer from getting involved if video is not available 2015-04-22 10:18:33 -05:00
Steven Miers a9ab5bb730 Merge video_ui branch into develop. 2015-04-21 13:47:00 -05:00
Steven Miers ea45c286ea VRFS-3055 : Make video features optional via config option. 2015-04-21 09:21:55 -05:00
Seth Call c29af72938 * fix jamtrack landing page formatting VRFS-3056 2015-04-20 22:13:30 -05:00
Seth Call 022304c6af * VRFS-3065 - permission error name change 2015-04-20 10:42:09 -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 766568f8cb Merge and fix 2015-04-16 12:16:09 -05:00
Seth Call ec7cffbe49 * VRFS-2991 - fix bug in outputting recording links 2015-04-15 15:26:10 -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 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
Steven Miers d12b7efb38 VRFS-3018 : Resolve api_jam_tracks#purchased before api_jam_tracks/:plan_code as the wildcard was preventing resolution to the former. 2015-04-08 12:56:59 -05:00
Brian Smith 0a451742ef merge develop 2015-04-06 21:26:54 -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 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 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
Jonathan Kolyer 9eeb0e454b VRFS-2795 merging with feature/musician_profile_enhancements 2015-03-26 03:31:21 +00: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 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 96a816f317 merge develop 2015-03-21 10:06:53 -04:00
Seth Call d44236abc4 remove jamblaster notice from site 2015-03-20 09:58:58 -05:00
Seth Call 661c4ed446 * wip 2015-03-20 08:48:00 -05:00
Brian Smith 948174f19a VRFS-2701 musical experience bug fix 2015-03-12 21:34:20 -04:00
Seth Call 9279d88d8d * VRFS-2876 - pro licensing added and 20 second snippet 2015-03-10 22:10:22 -05:00
Jonathan Kolyer b998d28c37 VRFS-2795 merging with feature/musician_profile_enhancements 2015-03-10 04:33:37 +00:00
Brian Smith d865d0a1fa Merge branch 'develop' into feature/musician_profile_enhancements 2015-03-09 20:25:28 -04:00
Seth Call a10705c163 * VRFS-2909 - jam tracks importer 2015-03-09 09:44:12 -05:00
Jonathan Kolyer 0e9f78ccdd VRFS-2795 search filter front end start 2015-03-02 09:41:53 +00:00
Brian Smith 4d133e0043 merge develop 2015-02-28 02:24:23 -05:00
Steven Miers 5396e66c67 Merge with develop 2015-02-27 11:51:45 -06:00
Seth Call 8205b5ea58 * VRFS-2841 - load jmep into the backend 2015-02-27 08:37:12 -06:00
Seth Call dbaeb8d996 merged 2015-02-25 10:43:21 -06:00
Brian Smith 500af2bc05 merge develop (had lots of migration issues) 2015-02-20 08:35:59 -05:00
Seth Call 9345d65f06 * merged 2015-02-19 14:31:00 -06:00
Jonathan Kolyer 6a46ad5910 Merge branch 'develop' into feature/recording_selector 2015-02-16 02:20:38 +00:00
Seth Call 51689e3d61 * make backing tracks show on/off and fix migration 2015-02-16 14:59:58 -06:00
Seth Call b46dce5c29 Merge branch 'feature/backing_tracks' into develop 2015-02-16 10:35:46 -06:00
Seth Call e40c964d97 * merged 2015-02-15 22:15:34 -06:00