seth
/
jam-cloud
mirror of https://bitbucket.org/jamkazam/jam-cloud.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
2,383 Commits 118 Branches 1,306 Tags 359 MiB
Commit Graph

184 Commits

Author SHA1 Message Date
Brian Smith 6d42e42c18 VRFS-987 backend support for session/recording likes, plays, and comments 2014-01-12 12:51:06 -05: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
Jonathan Kolyer 4b85863a33 vrfs-927: buzz admin fixes 2014-01-08 18:00:22 -06:00
Seth Call 83409e9da8 * adding resque gem to Gemfile 2014-01-08 22:55:44 +00: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
Anthony Davis 9127d1861d VRFS-923 commenting out AWS wipe in web as well 2014-01-08 13:59:53 -06:00
Seth Call 03e4dfdc49 * removing wipe commands for now 2014-01-08 18:22:53 +00:00
Seth Call 40480f1484 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-01-08 18:04:21 +00:00
Seth Call a400c0f289 * VRFS-971 adding progress at bottom of fotor 2014-01-08 18:04:11 +00:00
Anthony Davis fedea2cdc3 VRFS-923 2014-01-08 07:04:23 -06:00
Anthony Davis 273495698a VRFS-923 wrong sdk/method 2014-01-08 05:51:55 -06:00
Anthony Davis ee5eccfdc3 VRFS-923 'jamkazam-testing' s3 bucket is emptied after tests 2014-01-08 05:10:40 -06:00
Seth Call bffe453a6a * marking sign url test as pending until credentials are provided, and bringing back icecast test 2014-01-08 04:27:56 +00:00
Seth Call 010f41fed0 * marking other icecast test as failing 2014-01-08 03:58:08 +00:00
Seth Call cbac485e7e Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-01-08 03:42:34 +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 8c51eb31db Fix test and make sure icecast is at the bottom of the sql command chain 2014-01-08 01:42:59 +00:00
jam ae1fd60bbf add builder to gems list 2014-01-07 22:27:00 +00:00
jam 2463be1f84 Remove -l arg from bash script 2014-01-07 14:37:22 -06:00
jam 111ab5811a Icecast changes 2014-01-07 14:31:52 -06:00
jam 66558b70e9 Icecast test models 2014-01-07 14:30:06 -06:00
jam 932f59cea6 Icecast models 2014-01-07 14:29:40 -06:00
Anthony Davis 8b3d1abd5c VRFS-923 - pushing a pretend delete. will review Jenkins 2014-01-07 13:40:26 -06:00
Seth Call 8e8e699788 * fixing nil.publish test in mq_router.spec 2014-01-07 16:01:36 +00: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