Commit Graph

640 Commits

Author SHA1 Message Date
Seth Call b884ef3296 * notes 2015-11-12 20:42:56 -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
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
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
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
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