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

271 Commits

Author SHA1 Message Date
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 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 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 473cb69f6d * VRFS-972 - profile.js changes 2014-01-07 23:30:23 +00: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
Brian Smith 18d8ff8d3f VRFS-933 notification bug fixes 2014-01-05 16:42:18 -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
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 3872898b95 VRFS-933 notification work 2014-01-02 14:57:16 -05:00
Daniel Weigh 2d51d04bbd VRFS-948 Formatting updates 
Will possibly need to revisit in the context of 294
 2014-01-01 19:33:27 -05:00
Daniel Weigh c00267f31c VRFS-948 / VRFS-930 / VRFS-931 Formatting updates 
Will possibly need to revisit in the context of 294
 2014-01-01 15:41:40 -05:00
Daniel Weigh e76244c360 VRFS-940 Change Avatar link borked. 
Add in avatar.
 2013-12-31 23:24:10 -05:00
Seth Call c3954d65f0 * delete existing tracks on older migration that will break existing deployments 2013-12-30 19:16:08 +00:00
Seth Call 73b04ba5fc * oomps--left in my local capybara-screenshot reference 2013-12-30 19:10:12 +00:00
Seth Call e4ed571dcb Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2013-12-30 18:34:26 +00:00
Seth Call ab70d15eaf * the form VRFS-922, VRFS-918 (mix checks user permissions), VRFS-945 (verify download permissions for tracks) 2013-12-30 18:34:15 +00:00
Daniel Weigh e22784c6c3 VRFS-294 Adjustments to HTML/ CSS. 
Account Profile Avatar page
 2013-12-29 21:04:07 -05:00
Brian Smith 102306e4d1 VRFS-933 notification work 2013-12-29 20:49:44 -05:00
Daniel Weigh 90f81e0994 VRFS-934 Remove extraneous scrollbar 
due to explicit height in markup
 2013-12-29 16:42:18 -05:00
Daniel Weigh 56bf445610 VRFS-935 Account identity screen borked. 2013-12-29 15:55:55 -05:00
Daniel Weigh 144f97f470 VRFS-935 Account identity screen borked. 2013-12-29 15:52:29 -05:00
Brian Smith 1806c5245f VRFS-933 notification work 2013-12-29 14:40:21 -05:00
Daniel Weigh 7bb4b4a3c8 VRFS-936 Session header bar missing 2013-12-29 13:14:50 -05:00
Brian Smith 7e78163bb9 VRFS-933 notification work 2013-12-28 23:51:35 -05:00
Jonathan Kolyer 8fa8895944 vrfs-743: dropped expire date for read to 20 years, as 25 years is too long for S3 2013-12-21 22:01:25 -06:00
Seth Call a68235f280 * adding 'select' to dialog-inner so it'll look JKish 2013-12-20 22:24:14 +00:00
Seth Call 242016c38b * VRFS-821 - recordings manager changes 2013-12-20 22:01:51 +00:00
Daniel Weigh 9c6ccee6f0 VRFS-294 Adjustments to HTML/ CSS. 2013-12-20 07:04:58 -05:00
Jonathan Kolyer 0ecbf9f047 vrfs-916: added toggles for fan/musician; misc fan tweaks 2013-12-18 22:12:28 -06:00
Jonathan Kolyer f7c08ce472 vrfs-916: added fan page branching logic 2013-12-18 17:59:02 -06:00
Brian Smith 56a02a24b2 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2013-12-18 22:47:34 -05:00
Brian Smith d5b53c3406 remove hard-coded band ID 2013-12-18 22:33:56 -05:00
Seth Call de4a2c8321 * VRFS-821; sending loggedin/loggedout events to backend from frontend 2013-12-18 17:18:23 +00:00
Seth Call d97a960a0e * VRFS-821 many changes for upload apis, mostly 2013-12-17 19:44:21 +00:00
Jonathan Kolyer 3c8dbf4d80 Merge branch 'web_pages' into develop 2013-12-17 11:00:57 -06:00
Anthony Davis f442196f8d Merge remote-tracking branch 'origin/develop' into develop 2013-12-17 22:07:48 -06:00