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,370 Commits 118 Branches 1,306 Tags 359 MiB
Commit Graph

2370 Commits

Author SHA1 Message Date
Seth Call d89ce4c140 * VRFS-801 - almost working on my dev machine 2014-01-11 04:57:07 +00:00
Seth Call 230a4d3f64 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-01-10 16:28:18 +00:00
Seth Call 1555af6db8 * VRFS-984 finished. subpath is /resque 2014-01-10 16:25:55 +00:00
Seth Call be2a7ecc48 * removing git merge syntax from jam_ruby 2014-01-09 13:53:47 +00:00
Jonathan Kolyer 08e7496a40 merge conflict 2014-01-08 21:33:15 -06: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 0b723362ae * adding resque to websocket-gateway 2014-01-09 02:53:04 +00: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 783a7c3adf Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-01-08 22:55:51 +00:00
Seth Call 83409e9da8 * adding resque gem to Gemfile 2014-01-08 22:55:44 +00:00
jam e827f274b2 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-01-08 22:42:24 +00:00
jam 9ed2210500 websock set timeout on development build 2014-01-08 22:42:10 +00:00
Seth Call 519650e265 * typo in audiomixer 2014-01-08 22:05:41 +00:00
Seth Call 9e7debdeda * merged 2014-01-08 21:49:35 +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 d899b88dd1 switching failing specs to expect() syntax 2014-01-08 15:21:32 -06:00
Anthony Davis 9127d1861d VRFS-923 commenting out AWS wipe in web as well 2014-01-08 13:59:53 -06:00
Seth Call 88888a6846 * oops. didn't realize that the client footer is reused by 2 other templates 2014-01-08 19:49:21 +00: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 cd62e07026 Merge remote-tracking branch 'origin/develop' into develop 2014-01-08 07:04:45 -06:00
Anthony Davis fedea2cdc3 VRFS-923 2014-01-08 07:04:23 -06:00
Daniel Weigh b10f0917fd Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 
# By Anthony Davis (3) and Seth Call (2)
# Via Anthony Davis (2) and Seth Call (1)
* 'develop' of bitbucket.org:jamkazam/jam-cloud:
  VRFS-923 wrong sdk/method
  * removing print because tests passed on build server
  minor refactor in recordings spec
  VRFS-923 'jamkazam-testing' s3 bucket is emptied after tests
  * adding some prints to debug failing tests
 2014-01-08 07:34:21 -05:00
Anthony Davis bc4223be22 Merge remote-tracking branch 'origin/develop' into develop 2014-01-08 05:52:14 -06:00
Anthony Davis 273495698a VRFS-923 wrong sdk/method 2014-01-08 05:51:55 -06:00
Seth Call 4c35f05826 Merge remote-tracking branch 'origin/develop' into develop 2014-01-08 11:31:13 +00:00
Seth Call a973a370a3 * removing print because tests passed on build server 2014-01-08 11:30:54 +00:00
Anthony Davis f631351315 minor refactor in recordings spec 2014-01-08 05:11:05 -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 a97472503d * adding some prints to debug failing tests 2014-01-08 10:22:33 +00:00
Daniel Weigh 6f66f4219c VRFS-929 Double Scroll Bars. 2014-01-08 05:07:56 -05:00
Jonathan Kolyer bb2024fe19 vrfs-927: carrierwave_direct integration 2014-01-08 01:04:17 -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
Brian Smith 76a1d01a66 reformatting 2014-01-07 22:05:36 -05:00
jam f003fb2501 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-01-08 01:43:13 +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
Seth Call e91dbc1388 * removing async:trues in code (because it's default), to make it easier to find async:false 2014-01-08 00:44:56 +00:00
Seth Call c92dd66f24 * moving icecast to bottom 2014-01-07 23:32:08 +00:00
Seth Call f0dcf419b5 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-01-07 23:30:55 +00:00
Seth Call 473cb69f6d * VRFS-972 - profile.js changes 2014-01-07 23:30:23 +00:00
Anthony Davis a7be00c8f9 VRFS-923 2014-01-07 16:32:16 -06:00
jam 25f4d9b449 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-01-07 22:27:11 +00:00
jam ae1fd60bbf add builder to gems list 2014-01-07 22:27:00 +00:00