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,466 Commits 118 Branches 1,306 Tags 359 MiB
Commit Graph

4466 Commits

Author SHA1 Message Date
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
Brian Smith d4655cd65a renamed file with .sql extension 2014-10-06 19:26:06 -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 57ddb86379 * fixing .sql/.rb in manifest 2014-10-06 16:45:14 -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 2d71a12a79 * pinning back oj for now 2014-10-06 14:53:50 -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
Seth Call 49170d31a0 * instrument hover 2014-10-05 16:48:54 -05:00
Brian Smith e7a220fe00 VRFS-2278 action buttons should not wrap on Session Details screen 2014-10-05 15:31:43 -04:00
Brian Smith a719670add VRFS-2278 show correct hover bubble in Session Musicians section of Session Details screen; avatars should link to profile page 2014-10-05 15:14:35 -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
Seth Call 2d6f2e606d * remove console.trace; IE 10 breaks on it 2014-10-03 11:31:29 -05:00
Seth Call 0fdb932db1 * VRFS-2298 - tack on JamKazam Staff to username in vanilla forums if admin 2014-10-02 14:04:36 -05:00
Jonathan Kolyer 20d4fa2a01 VRFS-2262 removed dialog.min-height style constraint; tested on several dialogs, nobody needs it 2014-10-02 06:40:06 +00: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 b5aeb87bda Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-10-01 09:32:29 -05:00
Seth Call e63369d072 * fix discard scores 2014-10-01 09:32:17 -05:00
Anthony Davis f58a410233 VRFS-2289 - reclaim 21px 2014-09-30 22:32:55 -05:00
Seth Call a75546a5be * fix order of migrations 2014-09-30 16:37:47 -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 e7a719ffd1 VRFS-2278 added spinner while retrieving session details 2014-09-28 21:29:37 -04:00
Seth Call 0e274e8687 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-09-28 13:14:16 -05:00
Seth Call 3d169d083e * rename to geoiplocation 2014-09-28 13:14:06 -05:00
Brian Smith 5622966918 fix test 2014-09-28 13:39:56 -04:00
Brian Smith 5159480eb8 VRFS-2265 include alert.js in web.js and landing.js 2014-09-28 12:35:22 -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 83b1777e65 * ga tracker code for display/remarketing VRFS-2242 2014-09-26 17:13:04 -05:00
Seth Call 3e8008224e * changing test ports all around for websocket-gateway 2014-09-26 14:09:25 -05:00
Seth Call cdf9579ada * fix port clash on tests 2014-09-26 12:57:37 -05:00
Seth Call 74a27e14cf * fix websocket tests 2014-09-26 09:20:35 -05: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
Seth Call f4ef6b2360 * websocket-gateway GATEWAY_NAME fixes 2014-09-25 20:40:31 -05:00