Commit Graph

1087 Commits

Author SHA1 Message Date
Seth Call 76adc44a50 * wip 2014-11-17 17:16:30 -06:00
Seth Call b780b4a462 * merged 2014-11-17 13:32:13 -06:00
Seth Call 6ea19f35aa Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-11-16 21:40:50 -06:00
Seth Call 6b5cd42432 * VRFS-2097 - move around hover hookups 2014-11-16 21:40:21 -06:00
Steven Miers b01b3ecd7d VRFS-2352 : JamTracks - merge from feature/jam_tracks_merge. 2014-11-16 16:23:31 -06:00
Jonathan Kolyer 38bf21ad6b VRFS-2125 prevent duplicate clicks from create band button 2014-11-16 05:40:24 +00:00
Seth Call f27673eb31 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-11-15 15:10:43 -06:00
Seth Call 94efaf8a8e * use hover events (js) instead of CSS to detect if hovering VRFS-2097 2014-11-15 15:07:13 -06:00
Brian Smith 719aa2b411 fix getInstrumentId logic 2014-11-15 13:05:01 -05:00
Brian Smith d65358cea6 VRFS-2442 suppress "Recurs once..." text for non-recurring sessions 2014-11-15 13:01:28 -05:00
Brian Smith 1c23f095ab fix null instrument tooltips 2014-11-15 13:00:13 -05:00
Brian Smith 3c18d7cf65 VRFS-2442 suppress "Recurs once..." text for non-recurring sessions 2014-11-15 12:24:37 -05:00
Brian Smith 12ca12f3cf Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-11-15 11:33:43 -05:00
Brian Smith a46664acfe VRFS-2489 scheduled session with is_unstructured_rsvp=true should not prompt user to add slots when approving 2014-11-15 11:05:12 -05:00
Seth Call 92b617898f * VRFS-2485 - allow user to tweak to lower framesizes if they experience bad i/o or audio quality 2014-11-14 20:47:56 -06:00
Steven Miers 6b206cfa4a VRFS-2478 : Fix JS timing error causing intermittent test failure. 2014-11-14 16:25:58 -06:00
Seth Call 3fc0329e79 * wip 2014-11-13 09:20:08 -06:00
Seth Call 26ec97f7af *wip 2014-11-12 08:46:21 -06:00
Seth Call ae30cedcb1 * add has-mix to non-ajax recordings 2014-11-11 20:41:19 -06:00
Seth Call 27800d17fd wip 2014-11-11 20:39:46 -06:00
Seth Call ec37e630c7 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-11-11 16:24:48 -06:00
Seth Call 6277708bb4 VRFS-1491 - create personal/master mix toggle, and beef up user.mods 2014-11-11 16:21:46 -06:00
Seth Call c3cd742c17 * wip 2014-11-11 16:21:29 -06:00
Steven Miers c2b2a7c6ef More test fixes. 2014-11-11 13:17:33 -06:00
Steven Miers 6c825db79f Merge update 2014-11-10 17:10:01 -06:00
Jonathan Kolyer 2c3fab9b34 VRFS-2362 replaced class selector with id selector 2014-11-10 14:59:30 +00:00
Seth Call 3c53eab168 *wip 2014-11-09 09:13:22 -06:00
Seth Call 4e00863de6 * merged 2014-11-07 16:16:25 -06:00
Seth Call 8cad33a303 * recording file/manager fixes and aging of recordings 2014-11-07 16:12:36 -06:00
Brian Smith 7071177f3f VRFS-2297 show instrument tooltips in session and recording hover bubbles 2014-11-07 12:39:45 -05:00
Brian Smith a7cabbe924 VRFS-2311 fix bug 2014-11-06 21:15:04 -05:00
Brian Smith f9d23f77fa VRFS-2426 one more try at latency badge on hover bubble 2014-11-06 20:43:47 -05:00
Seth Call 164fe8db61 * recording cleanup logic VRFS-2393 2014-11-06 11:26:13 -06:00
Brian Smith 415805c4eb VRFS-2256 allow invited and approved RSVP users to join approval_required sessions without having to send a join request 2014-11-05 21:54:08 -05:00
Steven Miers 433fe0be74 Initial merge and manual conflict and fix for tests. 2014-11-04 14:55:12 -06:00
Steven Miers b2219da522 Merge feature/video_mvp to develop and resolve conflicts. 2014-11-03 18:28:28 -06:00
Seth Call 4f9bdb2c5c * VRFS-2404 There are cases where a session can incorrectly get stuck in a 'I'm still recording' state 2014-11-03 15:24:46 -06:00
Seth Call fc4d55ba84 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-11-03 10:02:40 -06:00
Seth Call ace7ac15c8 * VRFS-2432 notify when stream mix is done 2014-11-03 10:00:42 -06:00
Brian Smith c629f3d8bf fix typo 2014-11-02 21:20:44 -05:00
Brian Smith 2688bba63e VRFS-2296 ensure hover bubble is displayed fully on screen 2014-11-02 21:18:30 -05:00
Brian Smith 0007930936 VRFS-2401 revert to inline styles for email links for now, need to revisit better solution 2014-11-02 16:43:56 -05:00
Brian Smith ae20d53d3d Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-11-02 14:27:07 -05:00
Brian Smith 33a431f822 VRFS-2427 fixed broken test 2014-11-02 14:26:56 -05:00
Seth Call e654aba980 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-11-02 13:16:12 -06:00
Seth Call daecbd8a2d * VRFS-2440 - open FTUE immediately after dialog 2014-11-02 13:15:56 -06:00
Brian Smith eb56be97dd VRFS-2427 fix sorting / paging issue on Feeds screen 2014-11-02 12:57:43 -05:00
Brian Smith ba80b25727 VRFS-2297 added tool tip to band tab of musician profile, couple of other bug fixes 2014-11-01 23:56:52 -04:00
Brian Smith 1bfd3f653c VRFS-2297 create help bubbles / tool tips for all instrument and friends/followers/recordings/sessions icons throughout app 2014-11-01 23:03:20 -04:00
Brian Smith a310c46288 Merge branch 'develop' into feature/rsvp_slot_conflict 2014-10-29 20:41:05 -04:00