Commit Graph

92 Commits

Author SHA1 Message Date
Brian Smith a1828cd93d trying to fix tests 2014-02-16 13:06:36 -05:00
Brian Smith 5ba98b93ab fixing tests in progress 2014-02-16 08:40:03 -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
Brian Smith c03404d520 like/follow refactor 2014-02-15 18:23:00 -05:00
Brian Smith 5a03ec87ae follow/like refactor to use polymorphic associations 2014-02-15 11:55:01 -05:00
Seth Call 9f7dfa4fcc * adding in piano to list of instruments 2014-02-14 23:10:39 -06:00
Seth Call 108a9564b6 * adding band create error reporting, better styling of 500 errors, and upping region size 2014-02-13 22:57:48 +00:00
Seth Call 5ba4e97dca * VRFS-1089 - jamadmin creation of recordings done 2014-02-13 16:41:50 +00:00
Seth Call 52f9bde0a3 * taking gon to 5.0.1 for now 2014-02-13 14:19:08 +00:00
Seth Call fa7f83a371 * VRFS-1090 all_discarded add to db schema 2014-02-08 03:05:16 +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 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 4549282f0d * trying no-https rubygems for a bit, see if it helps build 2014-02-04 21:53:37 +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 d4a5737c51 * VRFS-1025 finished 2014-02-03 21:19:14 +00:00
Seth Call 513fb2b8d4 * intsall to vendor/bundle 2014-02-02 14:03:31 -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
Seth Call 6806d6f0d3 * VRFS-1016 2014-01-31 14:25:17 -06:00
Brian Smith edebf42e73 VRFS-1020 share dialog work 2014-01-31 01:39:09 -05: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
Seth Call 956b25c577 * fixing bug when icecast.xml exists VRFS-1010 2014-01-30 09:32:12 -06:00
Jonathan Kolyer b0a8da15b6 vrfs152: moved invited_users_facebook_support.sqlto bottom 2014-01-29 23:05:55 -06:00
Jonathan Kolyer c22331c010 conflict merge 2014-01-29 23:05:09 -06:00
Jonathan Kolyer a73d4d758d vrfs152: created one FB invite constraint 2014-01-29 21:22:37 -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 d6a38f6bee VRFS-986 bug fixes 2014-01-23 21:43:49 -05:00
Brian Smith 30b13ed538 merge develop 2014-01-22 21:21:40 -05:00
Seth Call fcec0a776b * icecast working locally on my mac (VRFS-1002) 2014-01-21 14:51:03 +00:00
Brian Smith aa056d53fd VRFS-986 recent history sidebar for landing pages 2014-01-21 01:45:51 -05:00
Seth Call c91940852b * going to 'hide' integrate icecast into sessions.sql' from staging for now 2014-01-19 05:20:40 +00:00
Seth Call dea36d897f * VRFS-982 and VRFS-1003 - making every table that's directly related to music_session be UNLOGGED 2014-01-19 05:17:30 +00:00
Seth Call 5c8e315ee5 * pending didn't take 2014-01-19 03:32:36 +00: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
Seth Call 8644f4cbc3 * VRFS-1006 admin pages added to icecast 2014-01-17 19:55:26 +00:00
Seth Call 5d6e34f374 * VRFS-1000 - mapped all the castles, got the xml working, and added more tests 2014-01-17 04:51:19 +00:00
Jonathan Kolyer 42713f4c9d vrfs152: allowing invited_users to have null email 2014-01-15 04:10:13 -06:00
jam 10687093c1 Resolve conflicts 2014-01-14 21:24:45 +00:00
jam b15604c148 Icecast modules and test 2014-01-14 21:22:05 +00:00
Brian Smith 59f6e10e55 VRFS-986 recording landing page work 2014-01-14 02:49:21 -05:00
Seth Call a7fa73cfb3 * VRFS-801 still working out some mixer devops issues now; 2014-01-13 22:48:55 +00:00
Brian Smith 6d42e42c18 VRFS-987 backend support for session/recording likes, plays, and comments 2014-01-12 12:51:06 -05:00
Seth Call f5a271c35b Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-01-11 04:57:30 +00:00
Seth Call d89ce4c140 * VRFS-801 - almost working on my dev machine 2014-01-11 04:57:07 +00:00
jam 7ec4be3063 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-01-10 23:53:25 +00:00