Commit Graph

3468 Commits

Author SHA1 Message Date
developer 8f06168f1c VRFS-1654 - configure feed layout 2014-05-08 23:18:57 +08:00
Scott Comer 6be0791adb merge 2014-05-02 15:20:21 -05:00
Scott Comer 5cc515d615 a small cleanup of connection fields and fix broken tests 2014-05-02 13:44:29 -05:00
Seth Call 7515b1c3bd * moving new migration to end of manifest 2014-05-02 11:36:51 -05:00
Bert Owen 7d3ac6fc54 VRFS-1503 implement session chat feature 2014-05-03 00:33:27 +08:00
Bert Owen bf04fca205 VRFS-1503 implement session chat feature 2014-05-03 00:30:56 +08:00
Seth Call 65fb0511c6 * merging manually database migrations from the master branch now, because I need to preserve db lineage with www as a priority 2014-05-01 15:04:23 -05:00
Scott Comer a11dd664ce Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-04-30 22:01:57 -05:00
Scott Comer fe59865bd9 change join_the_session api to add tracks; move the impl to connection; a few bug fixes 2014-04-30 22:01:43 -05:00
Seth Call 6463512420 * a fix for race condition that can hang eventmachine startup 2014-04-30 03:03:37 +00:00
Brian Smith c0834c92c7 Merge branch 'feature/widget_fixes_1558' into develop 2014-04-29 03:37:01 -04:00
Brian Smith 4b98350f48 remove debug logs 2014-04-29 03:36:09 -04:00
Brian Smith 8b43e63800 VRFS-1558 added tests 2014-04-29 03:33:37 -04:00
Scott Comer e82ae132bd fix method for adding connection to music session 2014-04-28 22:38:30 -05:00
Brian Smith 8eedd63d7f Merge branch 'develop' into feature/widget_fixes_1558 2014-04-28 23:22:08 -04:00
Brian Smith 4e188d74b7 VRFS-1562 make avatars clickable links (this commit addresses Feed and comment dialog only) 2014-04-27 20:28:25 -04:00
Brian Smith 2b7ef1df55 VRFS-1350 hover bubble style improvements 2014-04-27 19:00:18 -04:00
Brian Smith 15e8ddb706 VRFS-1558 comment dialog work 2014-04-27 10:06:01 -04:00
Brian Smith 9b810310f9 VRFS-1558 implement comment dialog 2014-04-27 04:09:55 -04:00
Brian Smith 37c23d4ee2 VRFS-1558 wire up share button dialog / hide new share icon if session has ended 2014-04-26 23:59:38 -04:00
Brian Smith 7e2d37bac5 VRFS-1555 VRFS-1556 do not show private sessions and recordings 2014-04-26 16:31:51 -04:00
Brian Smith c06458550c VRFS-1436 allow unauthenticated uses to share recordings and sessions from landing pages 2014-04-26 14:21:17 -04:00
Brian Smith ce80b1a09b VRFS-1558 convert SESSION and RECORDING text into clickable links 2014-04-25 02:11:46 -04:00
Brian Smith 23137ec423 VRFS-1558 widget enhancement work 2014-04-25 01:56:24 -04:00
Seth Call 26dc80436c * merging build script 2014-04-24 18:07:52 +00:00
Seth Call 26a9f9a162 * commenting 'Measurement Protocol' into related classes 2014-04-24 02:27:31 +00:00
Seth Call 2496c051a3 * doubting approach of using sessionModel as trigger handler; changing to document 2014-04-23 22:13:37 +00:00
Seth Call fb662e82be * sessionModel to send out events on start/stop 2014-04-23 22:03:00 +00:00
Seth Call f9e035e621 * adding db 1/0 to test mode 2014-04-23 21:52:35 +00:00
Seth Call bc006b8c71 * adding some error logs for recording missing scenarios (VRFS-1643), and merging email redirect problem manually 2014-04-23 19:48:40 +00:00
Seth Call 29dfba8276 * fix startup of eventmachine when in unicorn/production mode (fixes or could fix: VRFS-1636 VRFS-1637 VRFS-1642 VRFS-1643 2014-04-23 15:08:19 +00:00
Bert Owen 3921324b32 VRFS-1503 added protocol buffer, chat message model & controller, rest api 2014-04-23 14:34:59 +02:00
Bert Owen ddf3c9cc5f VRFS-1503 added protocol buffer, chat message model & controller, rest api 2014-04-23 14:27:58 +02:00
Bert Owen 07e141cc8f VRFS-1503 added protocol buffer, chat message model & controller, rest api 2014-04-23 14:27:49 +02:00
Jonathan Kolyer ed09892284 merging develop and vrfs1576 2014-04-23 07:50:50 +00:00
Jonathan Kolyer 55b149827a VRFS-1576 report layout 2014-04-23 07:43:35 +00:00
Jonathan Kolyer a7d83064df VRFS-1576 fixing redirect paths to use active_admin_template 2014-04-23 06:39:49 +00:00
Jonathan Kolyer 7b2d124b33 VRFS-1576 affiliate report view integration 2014-04-23 06:38:49 +00:00
Jonathan Kolyer 22566f1b29 VRFS-1576 added block to referrals_by_date 2014-04-23 06:34:21 +00:00
Brian Smith 5fa2319daa VRFS-1558 make play/comment/like icons clickable in feed and add share icon 2014-04-23 02:07:46 -04:00
Brian Smith 7180516e75 fix formatting issue in feed where time was indented too far 2014-04-23 02:00:55 -04:00
Jonathan Kolyer c66f5879cf VRFS-1576 fixed referrals_by_date to support pagination 2014-04-23 02:43:13 +00:00
Seth Call 5b92445021 * release branch pushes from jenkins 2014-04-22 17:59:42 +00:00
Seth Call 5695338266 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-04-22 17:53:49 +00:00
Seth Call 30ca8d7c5c * wip still on new ftue. also push release branches to repository VRFS-1639 2014-04-22 17:53:41 +00:00
Jonathan Kolyer b232344336 VRFS-1576 added referrals_by_date and associated test 2014-04-22 07:12:05 +00:00
Bert Owen b95e1a7f1b fix band setup view for band spec 2014-04-22 07:30:53 +02:00
Jonathan Kolyer af63b03d6a VRFS-1576 case insensitive codes 2014-04-22 02:14:22 +00:00
Jonathan Kolyer 6ee83f8dcc VRFS-1576 error handling; referral page; new admin menu 2014-04-22 01:55:40 +00:00
Bert Owen 15064ad6c0 VRFS-1567 fix default sender, add new migration for email_batches table 2014-04-21 10:39:08 -07:00