Commit Graph

2543 Commits

Author SHA1 Message Date
Seth Call 062b36ae82 * commenting out share_token 2014-01-31 11:23:05 -06:00
Seth Call c9b58229c4 * fixing broken tests some more 2014-01-31 10:04:17 -06:00
Seth Call 3d6069bdb3 * fix broken tests 2014-01-31 09:32:18 -06:00
Brian Smith edebf42e73 VRFS-1020 share dialog work 2014-01-31 01:39:09 -05:00
Brian Smith 42930fe95e fix header on client 2014-01-30 22:30:37 -05:00
Seth Call b4b120aa3b * removing first_recording_at method and allowing server_id to be modified 2014-01-30 20:43:35 -06:00
Seth Call f1a8c1b744 * remove first_recording_at method 2014-01-30 20:39:42 -06:00
Seth Call 2e5eb4fd7f * beefing up description in icecast_bootstrap 2014-01-30 20:13:09 -06:00
Seth Call a4902977a4 * marking tests broken 2014-01-30 20:10:06 -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
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 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
Jonathan Kolyer e839c8cb69 vrfs152: moved generate_signup_url into invited_user 2014-01-29 22:48:35 -06:00
Jonathan Kolyer 4a1ebb7630 vrfs152: added test for facebook_invite! 2014-01-29 21:37:49 -06:00
Jonathan Kolyer a73d4d758d vrfs152: created one FB invite constraint 2014-01-29 21:22:37 -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
Seth Call 3903822ca5 * overriding lock timeout for LonelyJobs 2014-01-29 14:33:47 -06:00
Seth Call 55850ae602 * adding ability to run everything within jam-web for jobs 2014-01-29 13:26:11 -06:00
Seth Call 3d453468f2 * adding ability to run everything within jam-web for jobs 2014-01-29 13:24:34 -06:00
Seth Call 873037101c * removing errant m VRFS-1027 2014-01-29 11:05:01 -06:00
Seth Call d9ff073882 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-01-29 10:59:25 -06:00
Seth Call 38a8ca08bc * renabling logging 2014-01-29 10:59:14 -06:00
Brian Smith 555b53e3c3 format code 2014-01-28 10:31:57 -05:00
Brian Smith 3ad56b4142 fix session bug 2014-01-28 10:30:16 -05:00
Brian Smith 374a9da957 VRFS-986 landing page dev complete 2014-01-28 02:35:35 -05:00
Brian Smith 40a8dbd89e remove binding.pry 2014-01-26 16:48:15 -05:00
Brian Smith 1463866c75 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-01-26 16:46:46 -05:00
Brian Smith 998ebfdc6c VRFS-986 landing page sidebar complete / session landing fixes 2014-01-26 16:46:41 -05:00
Seth Call 708da1fb70 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-01-26 14:46:23 -06:00
Seth Call 8f5a2a6369 * tell NOKOGIRI to use system libraries in build environment 2014-01-26 14:46:11 -06:00
Seth Call 576e8deeee * fixing recursion bug in eventmachine.rb 2014-01-26 19:51:56 +00: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 df748d5f5a VRFS-930 Musician fixes
Addresses horiz. scrollbar in the header
2014-01-26 13:32:21 -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 7a782c2197 VRFS-930 Musician fixes 2014-01-26 13:25:34 -05:00
Daniel Weigh 31a18a1f95 VRFS-931 Band tweaks 2014-01-26 13:25:19 -05:00
Seth Call 8cf8e7ae1d * skip Unicorn check when running a worker 2014-01-25 22:31:06 -06:00
Seth Call afb0f30c9f * still working on this bugsnag issue VRFS-1023 2014-01-25 21:24:14 -06:00
Seth Call d23ca37a82 * fix for VRFS-1023; bugsnag preventing rails from starting 2014-01-25 21:07:39 -06:00
Seth Call 90583f8463 * actually comment out audiomixer tests, hwich fail on server 2014-01-25 18:53:59 -06: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 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
Seth Call d93d27db52 * trying to disable testsgg 2014-01-25 16:48:24 -06:00
Seth Call bf7b09e820 * marking a few tests as pending 2014-01-25 16:23:57 -06:00