Commit Graph

2800 Commits

Author SHA1 Message Date
Seth Call 2905245f1a * VRFS-1181 - upright bass in the mix 2014-02-19 04:40:37 +00:00
Seth Call 6a5c607fed * remove javascript_include to avoid precompiled error VRFS-1175 2014-02-18 23:43:53 +00:00
Seth Call 9a043148d6 * remove javascript_include to avoid precompiled error VRFS-1175 2014-02-18 23:16:32 +00:00
Seth Call 0c44842bb0 * VRFS-1173 - audio/mpeg instead of audio/mp3 in postback 2014-02-18 22:58:15 +00:00
Seth Call e3d34fb7b2 * VRFS-1171 - forgot join_music_session is called twice 2014-02-18 22:43:21 +00:00
Seth Call 4e674b312c * VRFS-1171 - resolved by moving notification out of transaction 2014-02-18 22:35:23 +00:00
Seth Call 0e145089b5 * move styles to css 2014-02-18 20:44:27 +00:00
Seth Call 72d19e0f48 * easydropdown-ing the dropdowns in session settings dialog 2014-02-18 20:38:41 +00:00
Seth Call 18988c05fd * VRFS-1170 - default to public-ish settings 2014-02-18 20:32:54 +00:00
Seth Call 5a9ff8b10e * fixing feed tests 2014-02-18 20:24:45 +00:00
Seth Call ec0eb4bb2a * VRFS-1140 2014-02-18 20:12:50 +00:00
Seth Call 7449de7aad * fix test bugs, get VRFS-1135 sorts resolved, and fix for easydropdown not destroying topmost div 2014-02-18 18:53:16 +00:00
Seth Call e33e3a519f * fix url problem with tracks 2014-02-18 15:35:47 +00:00
Seth Call de294d19bb * VRFS-1135; music session history has creator, participants, and band info now. 2014-02-18 14:24:32 +00:00
Seth Call 5b44b05885 * adding in user info on claimed recording 2014-02-18 13:45:40 +00:00
Seth Call 3ca1744c27 * VRFS-1135 make plays and recordings and sessions unique for user/model combo 2014-02-18 13:40:13 +00:00
Seth Call 4808514032 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-02-18 13:35:11 +00:00
Seth Call 222bf23cc5 * VRFS-1135 sorts added to model; need to change next behavior to come from model, not controller 2014-02-18 13:34:51 +00:00
Jonathan Kolyer 15f60d8b4f changed SessionSetConnectionStatusRefreshRate default to 1000 milliseconds 2014-02-18 01:31:33 -06:00
Jonathan Kolyer 3b8e564495 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-02-18 01:27:40 -06:00
Jonathan Kolyer 6dc6d1b52d VRFS-1110 fixed selection behavior and styling for autocomplete 2014-02-18 01:27:02 -06:00
Brian Smith c196ad8711 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-02-18 02:25:06 -05:00
Brian Smith a471e67a84 VRFS-1030 fix menu hover sensitivity 2014-02-18 02:24:56 -05:00
Daniel Weigh bb68fbf596 VRFS-1028 - Fixed an issue where a user has no instruments.
This is probably an edge case, but Test User (id: 1) has no instruments,
so this was not rendering and throwing a javascript error.
2014-02-18 02:15:44 -05:00
Daniel Weigh b919dbadd8 VRFS-1136 - fix / tweak infinite scroll
on band and musicians page.
2014-02-18 02:09:31 -05:00
Jonathan Kolyer b822711f1d Merge branch 'develop' into vrfs1110 2014-02-18 00:13:26 -06:00
Jonathan Kolyer 98f358d970 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-02-18 00:12:53 -06:00
Jonathan Kolyer 0b9eec4823 fixed broken tests again 2014-02-18 00:12:47 -06:00
Brian Smith 61a745398e VRFS-1132 fix visual issues on create session screen 2014-02-18 01:01:14 -05:00
Jonathan Kolyer cba678616f fixed broken test from refactoring of followers 2014-02-17 23:38:35 -06:00
Brian Smith 95519dc450 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-02-18 00:33:24 -05:00
Brian Smith 8a1308381b VRFS-1133 fix issue with musician and fan access dropdowns 2014-02-18 00:33:16 -05:00
Seth Call 89559aa456 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-02-18 04:54:45 +00:00
Seth Call d6149a3908 * pin rails to 3.x 2014-02-18 04:54:33 +00:00
Anthony Davis 2262c5f3d1 VRFS-1163 - adding slight padding 2014-02-17 22:31:34 -06:00
Seth Call 36257a98b7 Merge branch t push'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-02-18 03:42:52 +00:00
Seth Call 8483239054 * pg_migrate bump to 0.1.13 with relaxed thor version 2014-02-18 03:42:42 +00:00
Brian Smith ca1c22c058 VRFS-1147 fix genre selection in session settings 2014-02-17 22:39:44 -05:00
Brian Smith e535d0401d VRFS-546 use session settings to preselect band on create session 2014-02-17 22:00:57 -05:00
Brian Smith 5a4a097539 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-02-17 21:22:59 -05:00
Brian Smith 43cc811849 VRFS-680 change Mix label to Monitor 2014-02-17 21:22:29 -05:00
Seth Call c21d0ea0ba * fixnig anothec laimed recording test 2014-02-18 00:48:47 +00:00
Seth Call 26725e1c9b * fix one claimed_recording test 2014-02-18 00:46:33 +00:00
Seth Call e5c6ba0c76 * gah left in bad file in manifest 2014-02-18 00:02:31 +00:00
Seth Call b9e20ba446 * moving recording_plays to where it belongs 2014-02-17 23:56:17 +00:00
Seth Call 51d446ab62 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-02-17 23:26:58 +00:00
Seth Call 4f964a7294 * VRFS-1135 baby steps to play storting 2014-02-17 23:26:53 +00:00
Seth Call 5654f27b55 * merged 2014-02-17 23:26:17 +00:00
Seth Call 0218ca5ad6 * urls fixed for VRFS-1148 2014-02-17 19:12:52 +00:00
Seth Call eaecdf7de8 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-02-17 04:10:30 +00:00