seth
/
jam-cloud
mirror of https://bitbucket.org/jamkazam/jam-cloud.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
5,008 Commits 118 Branches 1,306 Tags 359 MiB
Commit Graph

1176 Commits

Author SHA1 Message Date
Brian Smith 354f6320fc VRFS-2463 (1) prevent duplicate claimed recordings from showing in sidebar, (2) only show public recordings and sessions with fan_access=true, (3) exclude recording / session being shown on landing page in the sidebar 2014-12-06 09:34:30 -05:00
Jonathan Kolyer 9f60327d20 VRFS-2424 added user.genres; refactored band_genres to genre_players; incorporated editing of user genres in profile 2014-12-05 07:50:03 +00:00
Jonathan Kolyer 868ca0b476 VRFS-1442 sessions band selection 2014-12-03 08:22:35 +00:00
Jonathan Kolyer 9bdddc22ff VRFS-1442 band deletion; band member layout; invitations; band admin support 2014-12-03 08:22:35 +00:00
Jonathan Kolyer 465fd6fa94 VRFS-1442 prepend users bands to band search results 2014-12-03 08:22:34 +00:00
Seth Call e0688ac6f1 * VRFS-2520 - recordings can be cleaned up now 2014-12-02 17:13:47 -06:00
Seth Call 589a2f6cc6 * VRFS-2520 - recordings can be cleaned up now 2014-12-02 17:13:34 -06:00
Steven Miers 41096f08ad VRFS-2480: Additional back-end and UI functionality required for checking out. 2014-12-01 18:45:41 -06:00
Seth Call 6ad844035d Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-11-21 17:16:21 -06:00
Seth Call eedc5ae970 * VRFS-1491 - finishing up dealing with refactor of monitor vs master tracks 2014-11-21 17:16:00 -06:00
Brian Smith f0b60f28e4 VRFS-2467 dedup users and instruments on session hover bubble 2014-11-21 01:20:27 -05:00
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 d1d059b4c5 * disable score_histories for now 2014-11-17 13:28:43 -06:00
Steven Miers b01b3ecd7d VRFS-2352 : JamTracks - merge from feature/jam_tracks_merge. 2014-11-16 16:23:31 -06:00
Brian Smith d65358cea6 VRFS-2442 suppress "Recurs once..." text for non-recurring sessions 2014-11-15 13:01:28 -05:00
Brian Smith 118ed7c39c undo last change re: other instrument id 2014-11-15 11:59:51 -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 8707bb2f16 set instrument ID for unstructured rsvp 2014-11-15 11:33:26 -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
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 6c825db79f Merge update 2014-11-10 17:10:01 -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 c6bfd59999 VRFS-2462 fixed session count on musician hover bubble 2014-11-07 13:05:07 -05:00
Seth Call 164fe8db61 * recording cleanup logic VRFS-2393 2014-11-06 11:26:13 -06:00
Seth Call ea601711fa * make desk keys configurable 2014-11-05 20:32:37 -06: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 ace7ac15c8 * VRFS-2432 notify when stream mix is done 2014-11-03 10:00:42 -06: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 33a431f822 VRFS-2427 fixed broken test 2014-11-02 14:26:56 -05:00
Brian Smith eb56be97dd VRFS-2427 fix sorting / paging issue on Feeds screen 2014-11-02 12:57:43 -05:00
Seth Call 5f8953011c * VRFS-2439 fix spurious -i argument in normalize-ogg and mp3 command 2014-11-01 21:21:42 -05:00
Seth Call f0d675c10d * fix typo in exist check 2014-11-01 21:10:12 -05:00
Brian Smith a310c46288 Merge branch 'develop' into feature/rsvp_slot_conflict 2014-10-29 20:41:05 -04:00
Seth Call 4ee75adcf2 * make intermediary mp3 higher bitrate 2014-10-29 13:51:33 -05:00
Seth Call 62833198b3 * VRFS-2431 - run normalize-ogg and normalize-mp3 to bump up master mix 2014-10-29 11:28:13 -05:00
Seth Call 149967f877 * VRFS-2375 - share button works now in master mix complete msg 2014-10-29 10:27:29 -05:00
Seth Call 28e752629a * show private recording on recording landing page to someone who was in the session 2014-10-29 07:22:45 -05:00
Brian Smith 6d8ec70087 VRFS-2401 text links in emails should be yellow 2014-10-29 07:12:43 -04:00
Brian Smith 300bc2cd82 Merge branch 'develop' into feature/rsvp_slot_conflict 2014-10-27 21:37:28 -04:00
Seth Call 53706aec71 * VRFS-2405 - cleanup more files in audiomixer, and input/output files in quickmixer 2014-10-27 17:52:56 -05:00
Seth Call 004674c562 * VRFS-2405 - cleanup files after successful audiomix 2014-10-27 17:49:14 -05:00
Seth Call fb36b8e380 * VRFS-2408 - remove dup tracks from interfrace 2014-10-27 17:14:40 -05:00
Seth Call 5f87fdab00 * bah adding junk to AudioMixer file 2014-10-27 13:51:29 -05:00
Seth Call bbff3ccab5 * remove debug print 2014-10-27 13:50:44 -05:00
Seth Call 970401374b * VRFS-2399 - fixed recording sync track issue 2014-10-27 12:42:30 -05:00
Brian Smith 709150edac Merge branch 'develop' into feature/rsvp_slot_conflict 2014-10-26 12:41:17 -04:00
Brian Smith c57ea372ac VRFS-2311 allow session creator to add and approve slots on the fly when there are no available slots 2014-10-25 22:23:52 -04:00
Seth Call 68b9008ba8 * fix wrong class name in AudioMixerRetry 2014-10-25 11:35:59 -05:00
Seth Call 48dea5688e * commit out fault audiomixer tests 2014-10-25 09:07:20 -05:00
Seth Call 58d96fc171 * VRFS-2192 - export recording button added to file sync dialog 2014-10-23 16:45:25 -05:00
Seth Call fe7edbba5d * many recording features/improvements: VRFS-2151, VRFS-1551, VRFS-2360, VRFS-2290, VRFS-2002, VRFS-2181 2014-10-22 23:10:49 -05:00
Brian Smith d8a8a0d33b remove byebug reference 2014-10-21 19:51:55 -04:00
Jonathan Kolyer af2159fe72 VRFS-1945 added create_type to music_sessions; filtering session search based on create_type 2014-10-21 07:27:26 +00:00
Brian Smith a8987efaa1 VRFS-2337 added latency badge to musician hover bubble 2014-10-19 21:18:05 -04:00
Steven Miers cce9fc1577 VRFS-2029 : Fix issue where a nil (instead of false) 
is causing claimed_recording not to save properly.
 2014-10-15 17:59:59 -05:00
Steven Miers e3dadf9c4b VRFS-2032 : Youtube test account app name/developer key. 2014-10-15 15:17:03 -05:00
Steven Miers c1f2a2083f VRFS-2029 : Update REST API ApiRecordingsController#claim 
to accept and distribute upload_to_youtube flag as appropriate.  Spec
to verify.
 2014-10-15 13:54:10 -05:00
Steven Miers d95a063648 VRFS-2029 : Rails model attribute for upload_to_youtube flag 
Also includes Rails validation.
 2014-10-15 13:45:30 -05:00
Steven Miers 077d3f4253 VRFS-2033 - YouTube client library 2014-10-15 12:25:05 -05:00
Steven Miers 5691fbc51f Require new scheduled_music_session_cleaner at class level. 
Fixes broken unit test.
 2014-10-14 14:54:18 -05:00
Brian Smith 3641521740 VRFS-2244 handle duplicate friend requests better 2014-10-14 02:12:33 -04:00
Jonathan Kolyer 649027cda7 VRFS-2282 tests and music session time queries 2014-10-14 03:54:58 +00:00
Jonathan Kolyer 6f27455b02 Merge branch 'develop' into VRFS-2282 2014-10-13 16:18:47 +00:00
Brian Smith ab66504532 VRFS-2344 show musician hover on pages 2-n on Find Session screen 2014-10-13 20:58:30 -04:00
Seth Call 1673d88760 * fix broken mixer behavior 2014-10-13 09:49:52 -05:00
Seth Call 078de098ce * fix test 2014-10-13 09:48:34 -05:00
Brian Smith 257421a1d0 VRFS-2318 show JOIN button for non-scheduled (future) session 2014-10-13 08:40:10 -04:00
Jonathan Kolyer 9f869f200f VRFS-2282 added resque schedule cleaner test 2014-10-13 02:32:45 +00:00
Jonathan Kolyer 95b26e9c00 Merge branch 'develop' into VRFS-2282 2014-10-13 02:15:01 +00:00
Jonathan Kolyer aef2b873f2 VRFS-1430 changed db default sender back to noreply; changed text for batch mails to FFFFFF from AAAAAA 2014-10-13 00:51:13 +00:00
Jonathan Kolyer 26b124dde8 VRFS-2282 first pass purging stale sessions 2014-10-12 07:49:31 +00:00
Brian Smith c2c157a0ba VRFS-2124 fix feed issue when session switches from fan_access=true to fan_access=false 2014-10-11 13:57:05 -04:00
Brian Smith bdd8c6db5a VRFS-2219 activate session in feed when the active_music_session record is created 2014-10-11 08:53:26 -04:00
Steven Miers 4d08359ef1 Fixes VRFS-2334 : re-add filter for users 
Includes spec to reproduce, and additional specs that uncovered a
problem with setting the client_video_source_id.
 2014-10-10 11:07:36 -05:00
Brian Smith d08475c34e VRFS-2321 comment out session join email notification 2014-10-08 20:27:28 -04:00
Jonathan Kolyer f06ef0c716 VRFS-1430 fixed broken tests 2014-10-08 03:48:05 +00:00
Brian Smith b30d71de6a VRFS-2320 use from_user_mailer template for session comment 2014-10-07 21:16:56 -04:00
Brian Smith eddd8a526c VRFS-2320 include from user info in session comment emails 2014-10-07 20:39:13 -04:00
Steven Miers 9473ffa352 Merge branch 'feature/video_mvp' into develop 2014-10-07 17:37:06 -05:00
Steven Miers e26c254d36 VRFS-2028 : Tests for verifying both types are there and have expected attributes in the hash. 
I.E., type is “recorded_track” or “recorded_video” as appropriate, and
videos have client_video_source_id attribute.  Also test pagination.
 2014-10-07 15:36:16 -05:00
Steven Miers 94963f2ad1 VRFS-2028 : Add videos to list_uploads, in addition to tracks. 
This is accomplished using a SQL union via arel.
 2014-10-07 15:34:05 -05:00
Steven Miers 160108a217 Merge video_mvp branch 2014-10-07 11:33:34 -05:00
Brian Smith bffba5fcbc VRFS-2219 changes based on Seth code review 2014-10-06 21:03:19 -04:00
Steven Miers e25e3b16a9 VRFS-2027: Create video recordings from source in ApiRecordingsController#start 
Also includes spec.
 2014-10-06 18:17:08 -05:00
Steven Miers 8ec75bb4e7 VRFS-2025 : Specs for video_sources park. 2014-10-06 17:02:33 -05:00
Steven Miers 1ce0ac34ef VRFS-2025 : Add video_sources to join_the_session and its callers. 
Creates and attaches video_sources just as it does tracks.
 2014-10-06 17:02:10 -05:00
Seth Call 71f6b7edc6 * VRFS-2304 - create scoring timeout when doing a network test 2014-10-06 16:44:30 -05:00
Steven Miers 47490ea3d9 VRFS-2025 Incremental 2014-10-06 16:17:46 -05:00
Steven Miers dffdb78f71 Merge develop into this branch. 2014-10-06 16:17:36 -05:00
Seth Call d5eeb03bd3 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-10-06 09:37:04 -05:00
Seth Call 993074b136 * pinning back devise 2014-10-06 09:36:55 -05:00
Brian Smith 7856e43f1e VRFS-2219 active sessions should sort to top of Feed 2014-10-06 09:20:31 -04:00
Brian Smith 14c9a5b469 VRFS-2278 show tooltip for instrument icons on Find Session and Session Detail screens, show user friendly error when unable to approve RSVP 2014-10-05 22:12:50 -04:00
Steven Miers 66feb39de8 VRFS-2023 - Migration, models and spec for recorded_video, a video analog to recorded_track. 2014-10-03 14:12:09 -05:00
Steven Miers 5135fe7faf VRFS-2024 - Migration, model and spec for video source. 2014-10-03 13:36:51 -05:00
Jonathan Kolyer 3080a92096 VRFS-1430 merge conflict correction 2014-10-01 22:12:48 +00:00
Jonathan Kolyer 5d524cd7b0 VRFS-1430 added email from alias to JamKazam <{noreply,support}@jamkazam.com>; updated link colors to be 588C98 2014-10-01 22:10:54 +00:00
Seth Call 40506afaa0 * fix score tests 2014-10-01 09:55:51 -05:00
Seth Call 8889b8ce42 * merge in faster score searches (VRFS-2202) 2014-09-30 10:51:23 -05:00
Brian Smith 6442674c91 VRFS-2216 fix tests; include pending RSVPs and invites for session details screen 2014-09-28 22:37:52 -04:00
Brian Smith a07fdfe2a8 Merge branch 'develop' into feature/sprint_12_work 2014-09-28 12:00:32 -04:00
Brian Smith 38b336c707 VRFS-2216 fix issue with sms_index function 2014-09-28 11:59:59 -04:00
Seth Call 39ed460d14 * VRFS-2280 - fix locations getting invalidated, and VRFS-1806 fixed by detecting no login data 2014-09-25 23:13:34 -05:00
Brian Smith da771acdaf merge develop 2014-09-25 09:09:44 -04:00
Seth Call b87ff571ce * VRFS-1073 - support multiple websocket gateways 2014-09-24 14:27:56 -05:00
Seth Call 350f7ae19a * poke for build 2014-09-24 09:15:52 -05:00
Brian Smith 3f1eb86684 Merge branch 'develop' into feature/sprint_12_work 2014-09-23 21:27:52 -04:00
Seth Call 51b5923022 * fix broken tests 2014-09-22 15:55:02 -05:00
Seth Call 61f0bd2aa0 * merged 2014-09-22 14:20:58 -05:00
Brian Smith 096c43c0e4 Merge branch 'develop' into feature/sprint_12_work 2014-09-19 00:25:20 -04:00
Brian Smith 1858e0da49 VRFS-2218 VRFS-2197 allow unstarted scheduled sessions to be listed up to 12 hours after start time; allow completed sessions to be listed up 2 to hours after completion time 2014-09-19 00:24:38 -04:00
Seth Call a396671f8b * VRFS-2223 typo in music_session 2014-09-17 20:38:33 -05:00
Seth Call 0db38e17d6 * adding tests for VRFS-2221 2014-09-17 10:22:05 -05:00
Seth Call 6b96bdcd05 * VRFS-2221 - fix bad reconnect path 2014-09-17 10:22:00 -05:00
Brian Smith 1203a26271 Merge branch 'develop' into feature/opt_out_notification_fix 2014-09-15 23:02:53 -04:00
Brian Smith 4ddd4e4c13 VRFS-2066 fixed some issues with session landing and feed 2014-09-14 19:17:16 -04:00
Brian Smith 03fe5e8a1e VRFS-2066 consolidate users if they are listed multiple times in MSUH for the same session 2014-09-14 15:52:17 -04:00
Brian Smith f296932f27 fix more session join/leave bugs 2014-09-14 15:12:25 -04:00
Brian Smith e5a6ad862b fix notification bugs - active_music_session vs. music_session confusion 2014-09-14 14:41:32 -04:00
Brian Smith 072f3101c7 VRFS-2179 minor refactor of offline notifications to prevent a second loop from executing 2014-09-13 08:04:40 -04:00
Seth Call 9824fa2c61 * VRFS-2159 - rewriting some expectations for build server 2014-09-12 22:45:07 -05:00
Seth Call 2bd189b697 * VRFS-2159 merge 2014-09-12 22:30:51 -05:00
Brian Smith d8d987e21f VRFS-2179 send email to friends/followers when user joins a session 2014-09-12 22:57:03 -04:00
Brian Smith a47ffea5ad VRFS-2136 added tests 2014-09-12 22:34:59 -04:00
Brian Smith 4bdcf103ce VRFS-2136 only return recordings that have at least 1 claimed recording 2014-09-11 21:52:26 -04:00
Brian Smith c55413d349 added more tests, minor refactor, only send scheduled session notifications if target user is online 2014-09-11 21:29:48 -04:00
Brian Smith 632d806825 remove debug statement 2014-09-11 09:04:14 -04:00
Brian Smith abc8f18c00 VRFS-2140 added more tests, fixed bug in band recording notification 2014-09-11 09:03:32 -04:00
Brian Smith 71487d989b Merge branch 'develop' into feature/opt_out_notification_fix 2014-09-11 08:38:56 -04:00
Brian Smith 0b1f9d0c97 VRFS-2140 added more tests, fixed bug found in recording notification 2014-09-11 08:38:26 -04:00
Seth Call 7761c2e9a8 * VRFS-2155 fix passing of yellow 2014-09-10 09:25:43 -05:00
Seth Call 5b9987aa17 * fix broken artifacts path: VRFS-2153 2014-09-10 09:13:02 -05:00
Brian Smith a7623aac26 VRFS-2140 do not send any email notifications if the user has opted out of receiving emails 2014-09-10 03:04:35 -04:00
Seth Call 8c22d68b60 * sort by date, not the array VRFS-2130 2014-09-08 21:50:51 -05:00
Seth Call cab20ba017 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-09-08 21:39:04 -05:00
Seth Call 406c86be29 * VRFS-2098 - protect against dup sessions showing up in daily email 2014-09-08 21:38:35 -05:00
Brian Smith d547e4c2d6 VRFS-2094 fix tests 2014-09-08 22:23:35 -04:00
Brian Smith 850709e51a VRFS-2094 include hour, minutes, seconds in filename to avoid overwriting files in S3 added on the same day for different sessions 2014-09-08 21:13:08 -04:00
Seth Call 75d50b8286 * make notations private bucket; only allow access if user has can_join? permissions for session 2014-09-08 16:51:28 -05:00
Brian Smith 07024a44a6 VRFS-2094 wip notation upload bug fixes 2014-09-08 09:13:20 -04:00
Brian Smith 74763d53f3 VRFS-2094 fixed issue with notation file upload and tying it to music session; still need to fix download issue 2014-09-06 03:30:29 -04:00
Seth Call f0304f2ca3 * VRFS-1981 - delete old scores 2014-08-31 22:24:11 -05:00
Seth Call c35cfcf0f9 * VRFS-2104 make sure APP_CONFIG exists in websocket-gateway 2014-08-31 14:45:48 -05:00
Seth Call 5f85908c79 * VRFS-2104 - client update dialog happens when it needs to; not just on startup 2014-08-31 10:30:59 -05:00
Brian Smith f39312662d VRFS-2091 modified email regular expression to prevent 2 consecutive periods after the @ 2014-08-27 23:36:57 -04:00