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

393 Commits

Author SHA1 Message Date
Seth Call da784f2cd0 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-01-13 11:23:41 +00:00
Seth Call f79d3bdd70 * fixing bad name in debian scripts from audimxer to audiomixer 2014-01-13 11:22:28 +00:00
Brian Smith 753dc22e8b fix syntax error 2014-01-12 13:00:57 -05:00
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 85d6129a50 vrfs-927: fixing latest promotions 2014-01-10 18:10:14 -06:00
Jonathan Kolyer e5d23cc3bd merge conflicts 2014-01-08 18:45:34 -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 9e7debdeda * merged 2014-01-08 21:49:35 +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 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
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
Brian Smith 76a1d01a66 reformatting 2014-01-07 22:05:36 -05: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 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
Anthony Davis 4ff1674f20 Pulling out snapshot until it's finished 2014-01-07 14:42:39 -06:00
Anthony Davis 8b3d1abd5c VRFS-923 - pushing a pretend delete. will review Jenkins 2014-01-07 13:40:26 -06:00
Anthony Davis 7e1a6cd565 snapshot doesn't need to write to tmp subfolder 2014-01-06 21:22:54 -06:00
Seth Call 9c8bbe9c20 * MUSIC_SESSION_JOIN/DEPART are now SESSION_JOIN/SESSION_DEPART, VRFS-965 2014-01-06 22:34:16 +00:00
Seth Call 8cd679bea1 * VRFS-964 - fixed reconnect button 2014-01-06 21:08:37 +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
Chris Doughty d8cb2c72c4 VRFS-951 Pushing only develop or master branch files as debians 2014-01-05 21:35:22 -06:00
Brian Smith 18d8ff8d3f VRFS-933 notification bug fixes 2014-01-05 16:42:18 -05:00
Brian Smith 5d2ef909ce Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-01-05 08:26:29 -05:00
Brian Smith c52e27c7d1 fix race condition on user profile screen 2014-01-05 08:26:24 -05:00
Seth Call 17486c6ed2 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-01-05 03:47:35 +00:00