Commit Graph

22 Commits

Author SHA1 Message Date
Seth Call 3517cf048b * re-establish pg connection before/after fork 2014-01-31 12:37:43 -06:00
Seth Call fcec0a776b * icecast working locally on my mac (VRFS-1002) 2014-01-21 14:51:03 +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
Seth Call 01e50b45b3 * fixes for EventMachine initialization to work in ruby-only context (without web) 2014-01-16 02:21:28 +00: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
jam 7ec4be3063 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-01-10 23:53:25 +00:00
jam 09f30e3880 Support for xml with attr_accessor 2014-01-10 21:02:52 +00:00
Jonathan Kolyer c576901d0d fixed merge conflict 2014-01-08 21:32:23 -06:00
Jonathan Kolyer e5d23cc3bd merge conflicts 2014-01-08 18:45:34 -06:00
Seth Call 207481ffbd * audiomixer move 2014-01-08 21:49:04 +00:00
jam ae1fd60bbf add builder to gems list 2014-01-07 22:27:00 +00:00
jam 111ab5811a Icecast changes 2014-01-07 14:31:52 -06:00
jam b4260a4ed1 adde icecast file to gem library 2014-01-04 07:40:08 -06:00
Jonathan Kolyer 4c9d2f0c29 vrfs-927: carrierwave integration fixes 2014-01-04 03:10:58 -06:00
Jonathan Kolyer ec126793c7 vrfs-927: added new promotional table for home page data 2013-12-22 05:22:04 -06:00
Seth Call d97a960a0e * VRFS-821 many changes for upload apis, mostly 2013-12-17 19:44:21 +00:00
Jonathan Kolyer fe5dc2c6ab vrfs-774: incremental commit 2013-10-28 09:22:06 -05:00
Seth Call 482c2cece3 * VRFS-773 - isp page avaible 2013-10-16 11:20:37 -05:00
Seth Call 6ea4bae05c merging jam-ruby into ruby 2013-09-15 18:04:03 +00:00