 Seth Call
|
ae30cedcb1
|
* add has-mix to non-ajax recordings
|
2014-11-11 20:41:19 -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 |
Jonathan Kolyer
|
2c3fab9b34
|
VRFS-2362 replaced class selector with id selector
|
2014-11-10 14:59:30 +00:00 |
|
Seth Call
|
f0b70b1bb7
|
* fix issues with music session 'other count' and tests
|
2014-11-09 10:59:31 -06:00 |
|
Seth Call
|
8a5a40db9c
|
* fix check for existence in array
|
2014-11-09 10:52:25 -06:00 |
|
Seth Call
|
485b7d35c1
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2014-11-09 09:52:23 -06:00 |
|
Seth Call
|
948eaecc23
|
* VRFS-2468 - fix record others count
|
2014-11-09 09:50:28 -06:00 |
Brian Smith
|
5d78939002
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2014-11-08 21:32:09 -05:00 |
|
Brian Smith
|
9c30becc11
|
VRFS-1712 fix issue with wrapping buttons on musician hover bubble
|
2014-11-08 21:32:04 -05: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
|
c6bfd59999
|
VRFS-2462 fixed session count on musician hover bubble
|
2014-11-07 13:05:07 -05: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
|
0732216a0d
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2014-11-06 21:18:30 -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 |
Steven Miers
|
7dc80c10ce
|
VRFS-1849: Check for google authorization using AJAX and show/hide the google login button / "signed in" label as appropriate:
|
2014-11-06 13:16:58 -06: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 |
|
Seth Call
|
ea601711fa
|
* make desk keys configurable
|
2014-11-05 20:32:37 -06:00 |
|
Steven Miers
|
f1b32336cd
|
VRFS-1849 : Hide UI for youtube upload until the rest of feature implemented.
|
2014-11-04 15:55:50 -06:00 |
|
Steven Miers
|
5ee531d944
|
More resilient reference to image.
|
2014-11-04 14:59:53 -06:00 |
|
Steven Miers
|
cbb1a71ffa
|
Check current_user for nil, as this dialog is included at a higher level than originally expected.
|
2014-11-04 13:28:04 -06:00 |
|
Steven Miers
|
34695c716b
|
VRFS-1849 : Show google login link beside the "Upload to Youtube" link.
|
2014-11-04 12:31:38 -06:00 |
|
Steven Miers
|
df9352d608
|
One more merge artifact.
|
2014-11-03 18:38:06 -06:00 |
|
Steven Miers
|
2400a8869e
|
Remove them for real.
|
2014-11-03 18:32:45 -06:00 |
|
Steven Miers
|
c24b5df66d
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2014-11-03 18:31:57 -06:00 |
|
Steven Miers
|
9222ac5843
|
Remove merge artifacts.
|
2014-11-03 18:31:42 -06:00 |
|
Steven Miers
|
8c2fe619ea
|
Remove screenshot files.
|
2014-11-03 18:29:14 -06:00 |
|
Steven Miers
|
b2219da522
|
Merge feature/video_mvp to develop and resolve conflicts.
|
2014-11-03 18:28:28 -06:00 |
|
Steven Miers
|
fe9bd594b4
|
Merge feature/video_mvp to develop and resolve conflicts.
|
2014-11-03 18:25:33 -06:00 |
|
Seth Call
|
c11ae11c99
|
* fix my sorry teaspoon tests
|
2014-11-03 15:45:29 -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 |
|
Steven Miers
|
b2441ec7d6
|
Fix test; re-enable factory.
|
2014-11-03 14:17:20 -06:00 |
|
Steven Miers
|
608b0337c6
|
This is now unnecessary as it is done at a lower level.
|
2014-11-03 14:16:58 -06:00 |
|
Steven Miers
|
19a19a57a7
|
Whack thin as we no longer need it.
|
2014-11-03 14:16:36 -06:00 |
|
Steven Miers
|
0172f1c370
|
Better lining up of checkbox labels.
|
2014-11-03 14:15:36 -06:00 |
|
Steven Miers
|
fdf42259f1
|
Convert to HAML.
|
2014-11-03 14:15:23 -06:00 |
|
Seth Call
|
f402f630e1
|
* added test for VRFS-2432 notification of steram mix and share dialog
|
2014-11-03 10:29:22 -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 |
|
Steven Miers
|
dde5a75a45
|
VRFS-1849 : Add checkboxes for upload_to_youtube and save_to_computer.
|
2014-11-02 23:07:11 -06:00 |
|
Steven Miers
|
809e5e7443
|
Hook tested youtube client library to recording api controller. Completes: (VRFS-2030, VRFS-2031, VRFS-2032)
|
2014-11-02 23:00:37 -06:00 |
|
Steven Miers
|
83de0b920e
|
VRFS-2031 : Verify upload when complete and mark fully_uploaded. Spec to verify.
|
2014-11-02 22:34:02 -06:00 |
|
Brian Smith
|
c629f3d8bf
|
fix typo
|
2014-11-02 21:20:44 -05:00 |
|
Brian Smith
|
baf976e1b6
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2014-11-02 21:18:36 -05:00 |
|
Brian Smith
|
2688bba63e
|
VRFS-2296 ensure hover bubble is displayed fully on screen
|
2014-11-02 21:18:30 -05:00 |
|
Seth Call
|
1327229048
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2014-11-02 20:08:12 -06:00 |
|
Steven Miers
|
5c281c11c5
|
Proper status check of uploaded file and working spec to verify. (VRFS-2030, VRFS-2031, VRFS-2032)
|
2014-11-02 19:49:53 -06:00 |