seth
/
jam-cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,706 Commits 118 Branches 1,306 Tags 359 MiB
Commit Graph

261 Commits

Author SHA1 Message Date
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
Seth Call 3903822ca5 * overriding lock timeout for LonelyJobs 2014-01-29 14:33:47 -06:00
Seth Call 3d453468f2 * adding ability to run everything within jam-web for jobs 2014-01-29 13:24:34 -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 998ebfdc6c VRFS-986 landing page sidebar complete / session landing fixes 2014-01-26 16:46:41 -05:00
Seth Call 576e8deeee * fixing recursion bug in eventmachine.rb 2014-01-26 19:51:56 +00: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 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 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 35466433ca Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-01-22 16:23:46 -06:00
Seth Call 4b13c5c16c * making ubuntu command need sudo, and adding ubuntu template maker 2014-01-22 16:23:33 -06:00
Seth Call 7c375278f8 * fixing jamadmin pages 2014-01-21 20:30:40 -06: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
Brian Smith 6660102982 VRFS-986 landing page work 2014-01-20 09:28:06 -05:00
Brian Smith eea5cc781e VRFS-986 landing page work 2014-01-19 17:23:10 -05: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 13f711754c * suppressing the other failing test on the build server 2014-01-19 03:14:00 +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 cfa2ba383a * fixing EM test and removing old pending tests 2014-01-16 12:37:25 +00:00
Seth Call ece0b9bf87 * suppressing puts to stdout in test runs 2014-01-16 03:29:52 +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 7d90425864 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-01-15 22:20:29 +00:00
Seth Call 63d6f428b3 * VRFS-997 - mix notifications 2014-01-15 22:15:33 +00:00
Seth Call dc781f04ad Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-01-15 18:00:59 +00:00
Seth Call b8829b417a * VRFS-997 - mix complete notification 2014-01-15 18:00:45 +00:00
Jonathan Kolyer 42713f4c9d vrfs152: allowing invited_users to have null email 2014-01-15 04:10:13 -06:00
Jonathan Kolyer 8f7a959a9e vrfs152: relaxed requirement for an email address 2014-01-15 03:56:46 -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
Daniel Weigh 4bdd77f171 * placeholder scroller for feed. 2014-01-21 21:56:35 -05: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
Seth Call 50595d155c * VRFS-801 - closer to all fixes required for mixing 2014-01-13 13:44:28 +00:00
Seth Call da784f2cd0 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-01-13 11:23:41 +00:00
Seth Call a61ff76dae * stringifying id field in response to client downloads 2014-01-13 11:23:35 +00:00
Brian Smith 6d42e42c18 VRFS-987 backend support for session/recording likes, plays, and comments 2014-01-12 12:51:06 -05:00
Jonathan Kolyer e539157d76 Merge branch 'develop' into vrfs988 2014-01-12 02:53:11 -06:00
Jonathan Kolyer 74e95ad908 vrfs988: added band spec and band.website value integrity on save 2014-01-12 02:49:57 -06:00
Jonathan Kolyer 48bde580ae vrfs988: fixed filter searchtype bug 2014-01-12 01:48:15 -06:00
Jonathan Kolyer da980ce699 vrfs988: refactoring search results; added fans/bands result template handling 2014-01-11 23:34:23 -06:00
Jonathan Kolyer 87ae9d97df vrfs988: refactored search with one accessor for text and filter type searches 2014-01-11 09:27:56 -06:00
Jonathan Kolyer ecdfde2cdb vrfs988: sync api wrapper with search model 2014-01-11 09:12:26 -06:00
Jonathan Kolyer 0279b05454 vrfs-988: fixed text search return value 2014-01-11 08:59:09 -06:00
Jonathan Kolyer ac100e0898 vtfs-988: fixing user text search to use musician 2014-01-11 06:50:51 -06:00
Jonathan Kolyer fa0b3eeb70 vrfs-988: ran band_search tests 2014-01-11 06:37:55 -06:00
Jonathan Kolyer 3d75f8dd97 vrfs-988: refactoring search as text by entity, rather than site-wide 2014-01-11 06:26:40 -06:00
Seth Call 26f751cdc4 * sending 'downloadavailable' messages when mix becomes available 2014-01-11 05:34:26 +00:00
Seth Call eb7adbd303 * working out more issues with VRFS-801 2014-01-11 05:23:29 +00: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
Jonathan Kolyer 401a97d566 Merge branch 'develop' into vrfs927 2014-01-10 18:13:00 -06:00
Jonathan Kolyer 85d6129a50 vrfs-927: fixing latest promotions 2014-01-10 18:10:14 -06:00
jam 7ec4be3063 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-01-10 23:53:25 +00:00
jam b01fb4a818 baseline for icecast test cases 2014-01-10 23:53:16 +00:00
jam 09f30e3880 Support for xml with attr_accessor 2014-01-10 21:02:52 +00:00
Jonathan Kolyer 08e7496a40 merge conflict 2014-01-08 21:33:15 -06:00
Seth Call be2a7ecc48 * removing git merge syntax from jam_ruby 2014-01-09 13:53:47 +00:00
Jonathan Kolyer c576901d0d fixed merge conflict 2014-01-08 21:32:23 -06:00
Seth Call 0b723362ae * adding resque to websocket-gateway 2014-01-09 02:53:04 +00:00
Jonathan Kolyer e5d23cc3bd merge conflicts 2014-01-08 18:45:34 -06:00
Jonathan Kolyer 785817d299 vrfs-927: added initial promo latest support 2014-01-08 18:38:04 -06:00
Seth Call 519650e265 * typo in audiomixer 2014-01-08 22:05:41 +00:00
Seth Call 207481ffbd * audiomixer move 2014-01-08 21:49:04 +00:00
Seth Call 59bf00a97e * DownloadAvailable proto msg added to help poke client when downloads become available 2014-01-08 21:24:21 +00:00
Seth Call a400c0f289 * VRFS-971 adding progress at bottom of fotor 2014-01-08 18:04:11 +00:00
Seth Call 89fd0c2995 * VRFS-971- fixed duplicate recorded_tracks being sent as a result of list_downloads; query much more efficient too 2014-01-08 03:28:15 +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 932f59cea6 Icecast models 2014-01-07 14:29:40 -06:00
jam 57a9571483 resolve conflict 2014-01-04 08:04:24 -06:00
Seth Call 050af95b56 * fixing more tests 2014-01-06 22:15:02 +00:00
Seth Call 6aba436781 * fixing failing test 2014-01-06 21:51:48 +00:00
Seth Call 45a18c4449 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-01-06 20:35:41 +00:00
Seth Call fa23c267f5 * VRFS-946 and VRFS-922 - in-session recording features complete 2014-01-06 20:35:35 +00:00
Brian Smith 18d8ff8d3f VRFS-933 notification bug fixes 2014-01-05 16:42:18 -05:00
Seth Call ba3b9ab873 * VRFS-946 - in-session recording 2014-01-05 03:47:23 +00:00
Brian Smith 6dec9a5239 fix tests 2014-01-04 20:25:05 -05:00
Brian Smith fab83707b7 VRFS-933 notification work 2014-01-04 17:02:47 -05:00
Brian Smith 071ab4c0e9 Revert "VRFS-933 fix issues" 
This reverts commit 1b3fdee99e.
 2014-01-04 16:41:21 -05:00
Brian Smith 1b3fdee99e VRFS-933 fix issues 2014-01-04 12:35:15 -05:00
Brian Smith 8b87b11f4d VRFS-933 merge with develop 2014-01-04 12:24:11 -05:00
Brian Smith a2b34d68dd VRFS-933 notification bug fixes 2014-01-04 12:20:28 -05:00
Brian Smith 7ef959782e VRFS-933 notifications 2014-01-04 10:40:21 -05: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
Brian Smith 3872898b95 VRFS-933 notification work 2014-01-02 14:57:16 -05:00