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

996 Commits

Author SHA1 Message Date
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