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

4710 Commits

Author SHA1 Message Date
Seth Call eedc5ae970 * VRFS-1491 - finishing up dealing with refactor of monitor vs master tracks 2014-11-21 17:16:00 -06:00
Seth Call 76adc44a50 * wip 2014-11-17 17:16:30 -06:00
Seth Call b780b4a462 * merged 2014-11-17 13:32:13 -06:00
Seth Call d1d059b4c5 * disable score_histories for now 2014-11-17 13:28:43 -06:00
Seth Call 6ea19f35aa Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-11-16 21:40:50 -06:00
Seth Call 6b5cd42432 * VRFS-2097 - move around hover hookups 2014-11-16 21:40:21 -06:00
Steven Miers 497ac657ad VRFS-2351 : JamTracks admin - merge from feature/jam_tracks_merge. 2014-11-16 16:24:00 -06:00
Steven Miers b01b3ecd7d VRFS-2352 : JamTracks - merge from feature/jam_tracks_merge. 2014-11-16 16:23:31 -06:00
Steven Miers bf33578fdb VRFS-2494 : Option to turn on jam tracks tile. Off in all configuration files for now. 
Change config.jam_tracks_available=true to enable.
 2014-11-16 16:03:56 -06:00
Jonathan Kolyer 38bf21ad6b VRFS-2125 prevent duplicate clicks from create band button 2014-11-16 05:40:24 +00:00
Jonathan Kolyer da4dfda654 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-11-15 22:59:43 +00:00
Jonathan Kolyer aac1b3d4f1 VRFS-2132 added :crash_dump to skip api_signed_in_user, allowing unauthenicated dump uploads 2014-11-15 22:59:35 +00:00
Seth Call f27673eb31 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-11-15 15:10:43 -06:00
Seth Call 94efaf8a8e * use hover events (js) instead of CSS to detect if hovering VRFS-2097 2014-11-15 15:07:13 -06:00
Brian Smith 719aa2b411 fix getInstrumentId logic 2014-11-15 13:05:01 -05:00
Brian Smith d65358cea6 VRFS-2442 suppress "Recurs once..." text for non-recurring sessions 2014-11-15 13:01:28 -05:00
Brian Smith 1c23f095ab fix null instrument tooltips 2014-11-15 13:00:13 -05:00
Brian Smith 3c18d7cf65 VRFS-2442 suppress "Recurs once..." text for non-recurring sessions 2014-11-15 12:24:37 -05:00
Brian Smith 118ed7c39c undo last change re: other instrument id 2014-11-15 11:59:51 -05:00
Brian Smith 12ca12f3cf Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-11-15 11:33:43 -05:00
Brian Smith 8707bb2f16 set instrument ID for unstructured rsvp 2014-11-15 11:33:26 -05:00
Brian Smith a46664acfe VRFS-2489 scheduled session with is_unstructured_rsvp=true should not prompt user to add slots when approving 2014-11-15 11:05:12 -05:00
Brian Smith e87ab392e6 fix instrument icon wrapping on session and recording landing pages 2014-11-15 10:59:04 -05:00
Seth Call 92b617898f * VRFS-2485 - allow user to tweak to lower framesizes if they experience bad i/o or audio quality 2014-11-14 20:47:56 -06:00
Steven Miers 0b4742a591 Merge branch 'feature/jam_tracks_merge' of bitbucket.org:jamkazam/jam-cloud into feature/jam_tracks_merge 2014-11-14 19:56:54 -06:00
Steven Miers 3d654a063e VRFS-2352 : Fix another intermittent test failure. 2014-11-14 19:56:26 -06:00
Steven Miers 6b206cfa4a VRFS-2478 : Fix JS timing error causing intermittent test failure. 2014-11-14 16:25:58 -06:00
Steven Miers be2bb30425 VRFS-2478 : Fix JS timing error causing intermittent test failure. 2014-11-14 13:09:19 -06:00
Steven Miers c068619d4d Lock guard gem version to avoid warning. 2014-11-13 11:06:03 -06:00
Steven Miers 9cd9f5d58a VRFS-2478 : Fix a few more tests. 2014-11-13 11:05:29 -06:00
Seth Call 3fc0329e79 * wip 2014-11-13 09:20:08 -06:00
Steven Miers b282a69927 VRFS-2477 : Re-add google email config -- required for oauth functionality and specs. 
This should address a few more tests.
 2014-11-12 13:08:08 -06:00
Steven Miers 16d0342b1f Recurly subdomains for development and production. 2014-11-12 11:52:52 -06:00
Steven Miers c742a13da9 Fix a few specs. 2014-11-12 11:02:38 -06:00
Seth Call 26ec97f7af *wip 2014-11-12 08:46:21 -06:00
Seth Call ae30cedcb1 * add has-mix to non-ajax recordings 2014-11-11 20:41:19 -06:00
Seth Call 27800d17fd wip 2014-11-11 20:39:46 -06:00
Seth Call ec37e630c7 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-11-11 16:24:48 -06:00
Seth Call 6277708bb4 VRFS-1491 - create personal/master mix toggle, and beef up user.mods 2014-11-11 16:21:46 -06:00
Seth Call c3cd742c17 * wip 2014-11-11 16:21:29 -06:00
Steven Miers c2b2a7c6ef More test fixes. 2014-11-11 13:17:33 -06:00
Steven Miers 6c825db79f Merge update 2014-11-10 17:10:01 -06:00
Jonathan Kolyer 2c3fab9b34 VRFS-2362 replaced class selector with id selector 2014-11-10 14:59:30 +00:00
Seth Call f0b70b1bb7 * fix issues with music session 'other count' and tests 2014-11-09 10:59:31 -06:00
Seth Call 8a5a40db9c * fix check for existence in array 2014-11-09 10:52:25 -06:00
Seth Call 485b7d35c1 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-11-09 09:52:23 -06:00
Seth Call 948eaecc23 * VRFS-2468 - fix record others count 2014-11-09 09:50:28 -06:00
Seth Call 3c53eab168 *wip 2014-11-09 09:13:22 -06:00
Brian Smith 5d78939002 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-11-08 21:32:09 -05:00
Brian Smith 9c30becc11 VRFS-1712 fix issue with wrapping buttons on musician hover bubble 2014-11-08 21:32:04 -05:00