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

3015 Commits

Author SHA1 Message Date
Seth Call c12b561c3f * adding timing debug to REBUILD_MIXER and updating much of the notifications 2014-03-01 23:19:43 -06:00
Seth Call 725460176a * VRFS-792 - also guard against direct session link joins with no ftue 2014-03-01 17:01:45 -06:00
Seth Call 87f4890638 * VRFS-1279 - whats next dialog shows twice, VRFS-721 - default to 1 for kernel streaming 2014-03-01 10:39:35 -06:00
Seth Call a9edcfa798 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-03-01 08:58:56 -06:00
Seth Call 7a820e7827 * VRFS-726 - don't care if ftue has succeeded before; we care if there are any good devices 2014-03-01 08:58:42 -06:00
Jonathan Kolyer 6e996c468c Merge branch 'vrfs756' into develop 2014-03-01 04:44:00 +00:00
Jonathan Kolyer bfd2c5997d VRFS-756 added error handling and cleanup 2014-03-01 04:37:22 +00:00
Jonathan Kolyer 23957d0260 VRFS-756 fixed bugs 2014-03-01 03:07:48 +00:00
Seth Call 1e55b4acc8 * working towards using a loaded deferrable in recording 2014-02-28 20:29:20 -06:00
Seth Call b7a1e06889 * working on generic recording widget logic 2014-02-28 19:28:17 +00:00
Jonathan Kolyer af1186d0ef Merge branch 'develop' into vrfs756 2014-02-28 18:02:34 +00:00
Jonathan Kolyer b4aae340f7 merge conflict 2014-02-28 07:07:26 +00:00
Seth Call e7c1a791a7 Merge branch 'develop' of bitbt ucket.org:jamkazam/jam-cloud into develop 2014-02-28 06:41:07 +00:00
Seth Call d98bc2d210 * VRFS-1248 - rolled back 2014-02-28 06:40:19 +00:00
Seth Call 898092f48e Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-02-28 04:19:49 +00:00
Seth Call cc44c00865 * refactor more stuff into listenBroadcast jquery plugin in preparation of doing VRFS-1261 2014-02-28 04:19:39 +00:00
Brian Smith f409366893 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-02-27 22:39:51 -05:00
Brian Smith e297dd7f19 VRFS-1248 fix genre selector on find session screen 2014-02-27 22:39:45 -05:00
Seth Call 8c9546918f Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-02-28 02:51:56 +00:00
Seth Call 56ce4c9fe8 * session broadcast widget working decently well 2014-02-28 02:50:17 +00:00
Brian Smith b2de499d9d fix session notification LISTEN link 2014-02-27 21:32:55 -05:00
Brian Smith d89b776131 change un-follow to unfollow for consistency 2014-02-27 21:31:01 -05:00
Seth Call 51f955fc74 * VRFS-1047 - broadcast widget almost fully done 2014-02-28 00:24:55 +00:00
Seth Call dcc5437f3a * fix import of common by custom 2014-02-27 19:22:58 +00:00
Seth Call 9d739a78f5 * remove user history before history 2014-02-27 18:51:59 +00:00
Seth Call fd584967f2 Merge branch 'develop' oft sta bitbucket.org:jamkazam/jam-cloud into develop 2014-02-27 18:38:12 +00:00
Seth Call aaef11add4 * VRFS-1047 - broadcasts can be listened to (but very raw). VRFS-1257 - adding back in listen_in page for admin only 2014-02-27 18:38:02 +00:00
Scott Comer fd42fc56fe wire up get_work 2014-02-27 10:42:47 -06:00
Scott Comer c86433afd8 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-02-27 08:34:00 -06:00
Jonathan Kolyer acd3650bca Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-02-27 10:44:52 +00:00
Anthony Davis e43e31b64b VRFS-1251 - fixed all URIs for assets except VRFS-1263 2014-02-27 23:38:21 -06:00
Jonathan Kolyer dc212cbb9e VRFS-1260 adjusted dialog size and button position 2014-02-27 10:44:41 +00:00
Brian Smith a95b0fb151 VRFS-1237 fix hover bubble in musician list 2014-02-27 00:15:02 -05:00
Brian Smith 09899e8f0a VRFS-1247 include Listen link in session emails 2014-02-27 00:00:01 -05:00
Brian Smith f77965b851 VRFS-1239 remove dead code 2014-02-26 23:26:24 -05:00
Brian Smith 701063f865 VRFS-1239 show Click to Join link only in thick client, also prompt with terms or join request dialog as needed 2014-02-26 23:22:09 -05:00
Scott Comer 69dfca5640 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-02-26 21:45:08 -06:00
Scott Comer 63fdd60311 eh, added some code which i disabled 2014-02-26 21:44:49 -06:00
Brian Smith e9e3cd886f VRFS-1246 revert some emails back to use to field 2014-02-26 21:15:40 -05:00
Brian Smith 4588149876 VRFS-1246 bcc users on generated emails 2014-02-26 20:56:58 -05:00
Brian Smith ca20570a16 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-02-26 20:56:33 -05:00
Seth Call f433151ffb * carrierwave needs fog 2014-02-27 00:49:16 +00:00
Seth Call 7c99c44eaf Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-02-27 00:38:06 +00:00
Seth Call f0e916e736 * VRFS-1047 - looks good; no audio hooked up 2014-02-27 00:38:01 +00:00
Scott Comer 0444c1209f take ceil of score before posting 2014-02-25 23:35:48 -06:00
Scott Comer 2a66b1ec6d Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-02-25 23:02:06 -06:00
Scott Comer d12e65549d wire up api/scoring/record 2014-02-25 23:01:55 -06:00
Brian Smith ee0a25293d VRFS-1235 de-dup tracks on recording hover 2014-02-25 22:04:19 -05:00
Brian Smith c4dd04de69 fix JS error 2014-02-25 21:18:50 -05:00
Brian Smith f6fdd13170 fix bug with session/recording hovers on landing pages 2014-02-25 21:18:12 -05:00