Commit Graph

123 Commits

Author SHA1 Message Date
Brian Smith a1828cd93d trying to fix tests 2014-02-16 13:06:36 -05:00
Brian Smith 36287d0b5f VRFS-1028 hover bubble / like and follow refactor 2014-02-16 02:28:35 -05:00
Brian Smith c173582aa3 more work on like/follow refactor 2014-02-15 20:24:51 -05:00
Seth Call 84ce286588 * fixing test. no such thing as find\! 2014-02-14 12:04:02 -06:00
Brian Smith c8f7141c13 Merge branch 'feature/hover_bubbles' into develop 2014-02-13 20:52:47 -05:00
Brian Smith f6aaa3dcbd VRFS-1028 session / recording hover bubbles 2014-02-13 20:50:56 -05:00
Seth Call 240967f7ce * VRFS-1098 - fixed case where registering as a musician in the native interface sends you to downloads (goofy). Also refactoder is_native_client? into a helper 2014-02-13 18:27:38 +00:00
Seth Call 5ba4e97dca * VRFS-1089 - jamadmin creation of recordings done 2014-02-13 16:41:50 +00:00
Jonathan Kolyer 3efe5ab575 VRFS-152 a couple of minor code tweaks before closing this ticket out 2014-02-10 12:12:03 -06:00
Seth Call 7661fc5e39 * VRFS-1082 and VRFS-1083 - centralize facebook logic for invitationDialog, and add twitter integration into share dialog 2014-02-07 21:28:47 +00:00
Seth Call e8fe86e504 * VRFS-1083 user_authorizations require user now; found some bugs 2014-02-07 17:18:57 +00:00
Seth Call b668e54f57 * VRFS-1083 - twitter mostly working; need to deal with edge cases 2014-02-07 14:07:08 +00:00
Seth Call 7e1d5c1e4e * fixing controller 2014-02-06 21:44:49 +00:00
Seth Call 9598c06e1f * moved shareable_resolver into new controller, and made tests 2014-02-06 21:02:04 +00:00
Seth Call 4c39e45708 * merged 2014-02-06 16:35:33 +00:00
Seth Call 17961e676d * VRFS-1077 done 2014-02-06 16:31:52 +00:00
Brian Smith bc305cac5e VRFS-1020 fix share token design 2014-02-06 00:45:48 -05:00
Seth Call 148009ece5 * VRFS-1018 - audiomixer ruby runner generates an mp3 with metadata using ffmpeg 2014-02-04 20:28:00 +00:00
Seth Call ea19fe002d * VRFS-1026 and VRFS-1024 resolved (signin and dropdown scooted back 2014-02-04 03:06:46 +00:00
Seth Call d82b0b6fd9 * VRFS-1026 - putting user dropdown back to where it belonged 2014-02-04 02:45:52 +00:00
Seth Call d4a5737c51 * VRFS-1025 finished 2014-02-03 21:19:14 +00:00
Seth Call 3ded3ff39c Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-02-02 13:35:33 -06:00
Seth Call b256182cc6 * VRFS-1055 and VRFS-1056 - fixing tests that hardcode / instead of /client, and updating pg gem to 17.1 from 15.1 2014-02-02 13:34:53 -06:00
Jonathan Kolyer 61de77c7e1 vrfs152: fixed broken tests 2014-02-01 21:48:46 -06:00
Daniel Weigh 177220bae8 VRFS-1047 Implement the new landing page.
Setup core layout.
2014-02-01 14:26:16 -05:00
Brian Smith edebf42e73 VRFS-1020 share dialog work 2014-01-31 01:39:09 -05:00
Jonathan Kolyer c22331c010 conflict merge 2014-01-29 23:05:09 -06:00
Jonathan Kolyer 13df76e136 vrfs152: added dynamic fetching of facebook invited_user signup url 2014-01-29 22:49:36 -06:00
Brian Smith 374a9da957 VRFS-986 landing page dev complete 2014-01-28 02:35:35 -05:00
Seth Call a26b93a54b * adding requires bugsnag in needed locations to fix VRFS-1023- jam-web won't start 2014-01-25 17:48:17 -06:00
Seth Call e63e718091 * merged 2014-01-25 14:19:12 -06:00
Seth Call 96768b7979 * VRFS-1022 finished 2014-01-25 14:03:14 -06:00
Brian Smith 73875a4950 merge develop 2014-01-25 13:26:56 -05:00
Brian Smith 30b13ed538 merge develop 2014-01-22 21:21:40 -05:00
Brian Smith aa056d53fd VRFS-986 recent history sidebar for landing pages 2014-01-21 01:45:51 -05:00
Brian Smith 6660102982 VRFS-986 landing page work 2014-01-20 09:28:06 -05:00
Seth Call e57946afd2 * fixing tests, and adding a bunch more jam-admin page work for managing icecast, as well as the beginnings of the REST API for icecast (VRFS-1002 and VRFS-1006) 2014-01-19 02:20:44 +00:00
Jonathan Kolyer 42713f4c9d vrfs152: allowing invited_users to have null email 2014-01-15 04:10:13 -06:00
Jonathan Kolyer ccdad1c81a vrfs1008: fixed failing test 2014-01-14 14:06:43 -06:00
Jonathan Kolyer d2f71dd874 Merge branch 'vrfs1008' into develop 2014-01-14 02:31:48 -06:00
Seth Call fcec0a776b * icecast working locally on my mac (VRFS-1002) 2014-01-21 14:51:03 +00:00
Brian Smith 59f6e10e55 VRFS-986 recording landing page work 2014-01-14 02:49:21 -05:00
Jonathan Kolyer a8b7f3e5a6 vrfs1008: integration bug fixing 2014-01-13 23:18:09 -06:00
Jonathan Kolyer 33c64c2881 vrfs1008: fixing integration bugs 2014-01-13 22:33:32 -06:00
Jonathan Kolyer 8958663987 vrfs1008: removed debug stmt 2014-01-13 19:01:11 -06:00
Jonathan Kolyer 3e2ae677fe vrfs1008: integration with active session 2014-01-13 19:00:42 -06:00
Seth Call a7fa73cfb3 * VRFS-801 still working out some mixer devops issues now; 2014-01-13 22:48:55 +00:00
Seth Call 50595d155c * VRFS-801 - closer to all fixes required for mixing 2014-01-13 13:44:28 +00:00
Brian Smith 753dc22e8b fix syntax error 2014-01-12 13:00:57 -05:00
Brian Smith 6d42e42c18 VRFS-987 backend support for session/recording likes, plays, and comments 2014-01-12 12:51:06 -05:00