Commit Graph

246 Commits

Author SHA1 Message Date
Daniel Weigh 77e7b60ca5 VRFS-1012 Fix band profile navigation. 2014-02-06 08:03:44 -05:00
Jonathan Kolyer 0d675b16dc Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-02-04 02:53:04 -06:00
Seth Call 636ca9b891 * VRFS-1076 - fix for leave session being broken 2014-02-04 21:45:34 +00: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 9ce300db56 * fix for welcome.js not being in assets 2014-02-04 19:10:31 +00:00
Seth Call 389b6d5635 * rename it all back to Sharedialog 2014-02-04 18:04:12 +00:00
Seth Call ff8eea553f * finish rename of ShareDialog to ShareSessionDialog 2014-02-04 17:28:49 +00:00
Seth Call ae8b6ebbc7 * renaming all ShareDialog to ShareSessionDialog 2014-02-04 17:05:38 +00:00
Seth Call 5df00b2883 * VRFS-1012-fixing any URLs that don't start with /client 2014-02-04 13:48:13 +00:00
Jonathan Kolyer 5be1742d11 vrfs-1012: changed band profile url back from website to /profile 2014-02-04 02:52:52 -06:00
Jonathan Kolyer 7797b6907c vrfs152: added GA tracking for FB invites 2014-02-04 01:16:16 -06: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 aa68a4e2f4 * adding welcome.js 2014-02-02 22:25:59 +00:00
Seth Call ef6e3f5fa8 * signup dialog js included now 2014-02-02 21:19:45 +00:00
Seth Call 05e5a8cc11 * working on signup on welcome page 2014-02-02 15:06:41 -06:00
Seth Call 3a5321dc5c * merging manifest and user 2014-01-30 15:53:22 -06:00
Seth Call 6ccfc4cc08 * VRFS-1010 possibly done 2014-01-30 15:51:05 -06:00
Jonathan Kolyer c22331c010 conflict merge 2014-01-29 23:05:09 -06:00
Jonathan Kolyer 1a965b298b vrfs152: integrated fb invites to dropdown 2014-01-29 23:03:12 -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 b457babf79 VRFS-1020 share dialog work 2014-01-29 21:37:36 -05:00
Jonathan Kolyer 7c39c3cd4c vrfs152: integration fb login into view code 2014-01-29 19:55:16 -06:00
Brian Smith 374a9da957 VRFS-986 landing page dev complete 2014-01-28 02:35:35 -05:00
Daniel Weigh a7f10d8141 VRFS-930 Musician fixes
VRFS-931 Band fixes

Allows for (temporary?) hiding of buttons when FOLLOW is clicked.
2014-01-26 13:44:06 -05:00
Daniel Weigh b98e6439d9 VRFS-930 Musician fixes
"Oops". removed accidentally committed test text.
2014-01-26 13:35:03 -05:00
Daniel Weigh f2d0801908 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-01-26 13:26:01 -05:00
Daniel Weigh 31a18a1f95 VRFS-931 Band tweaks 2014-01-26 13:25:19 -05:00
Seth Call ad1521c98b * VRFS-1022 make sure to use resolve_string mime_type, subtype, bitrate, and again try to disable tests in rspec 2014-01-25 17:38:03 -06:00
Brian Smith 73875a4950 merge develop 2014-01-25 13:26:56 -05:00
Brian Smith dcea238631 VRFS-1020 share dialog work 2014-01-25 10:37:15 -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 6d482a034d VRFS-986 more landing page work 2014-01-16 02:50:13 -05:00
Brian Smith 4f9e36a332 VRFS-986 more landing page work 2014-01-16 01:55:36 -05:00
Seth Call 7d90425864 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-01-15 22:20:29 +00:00
Seth Call b8829b417a * VRFS-997 - mix complete notification 2014-01-15 18:00:45 +00:00
Daniel Weigh 703da937e8 VRFS-930 Musician fixes 2014-01-23 06:10:40 -05:00
Jonathan Kolyer a32697b2e4 vrfs1008: fixed typo 2014-01-14 03:19:21 -06:00
Jonathan Kolyer d2f71dd874 Merge branch 'vrfs1008' into develop 2014-01-14 02:31:48 -06:00
Daniel Weigh b8a51e9f6c VRFS-930 Musician fixes 2014-01-21 21:55:38 -05:00
Seth Call fcec0a776b * icecast working locally on my mac (VRFS-1002) 2014-01-21 14:51:03 +00:00
Jonathan Kolyer 91007055a0 vrfs1008: fixed updating invites bug 2014-01-14 02:29:07 -06:00
Jonathan Kolyer ea6391e46e vrfs1008: styled the invite dialog box; fixed bug updating invites 2014-01-14 01:52:22 -06:00
Brian Smith 59f6e10e55 VRFS-986 recording landing page work 2014-01-14 02:49:21 -05:00
Jonathan Kolyer 3c6af2e028 vrfs1008: sending updated invites 2014-01-14 01:31:20 -06:00
Jonathan Kolyer 61a7dcd50f vrfs1008: added existingInvites storage for updates 2014-01-14 01:01:37 -06:00
Jonathan Kolyer cfeed312bf vrfs1008: refactoring 2014-01-14 00:12:00 -06:00
Jonathan Kolyer 28d346fe23 vrfs1008: refactoring, cleanup, bug fixes 2014-01-14 00:02:54 -06:00
Jonathan Kolyer a8b7f3e5a6 vrfs1008: integration bug fixing 2014-01-13 23:18:09 -06:00