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

2767 Commits

Author SHA1 Message Date
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
Seth Call 5ae2a769b5 * fix mix regressions due to addition of MixUploader 2014-02-17 03:56:42 +00:00
Daniel Weigh a82a295123 Update utils to new mapping. 
Commit: e24cdab262 [e24cdab]
Parents: 348f96f5b0
Author: Brian Smith <briansmith@jamkazam.com>
Date: February 16, 2014 at 9:47:42 PM EST
 2014-02-16 22:16:04 -05:00
Seth Call 408a1fd857 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-02-17 02:52:15 +00:00
Seth Call 134974af61 * fix issue 2014-02-17 02:52:00 +00:00
Brian Smith 1620845371 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-02-16 21:47:58 -05:00
Brian Smith e24cdab262 rename vocals icon to fix bug 2014-02-16 21:47:42 -05:00
Daniel Weigh 9c52eea162 * cleanup and a comment to revisit 2014-02-16 20:28:26 -05:00
Seth Call ff6b3795ce * merged 2014-02-17 00:32:51 +00:00
Seth Call 5ef630cf86 * in progress on next parameter VRFS-1135 2014-02-17 00:30:08 +00:00
Brian Smith 348f96f5b0 fix bugs 2014-02-16 17:39:26 -05:00
Brian Smith 83f347e84c merge like/follow refactor and hover bubble work 2014-02-16 16:03:32 -05:00
Brian Smith ebc49b6ccc VRFS-1028 more refactor work 2014-02-16 14:48:54 -05:00
Seth Call 82ab90f007 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-02-16 18:32:47 +00:00
Seth Call 812c1cdc4b * VRFS-1135 add pagination. affects the structure of the API. will update doc shortly. Also removed wtf log in VRFS-1143 2014-02-16 18:32:32 +00:00
Anthony Davis 60364f3f47 VRFS-1143 - whacking "wtf" message 2014-02-16 12:26:52 -06:00
Brian Smith a1828cd93d trying to fix tests 2014-02-16 13:06:36 -05:00
Daniel Weigh bf9e26ae3f * ignore vendor/* (bundle|cache) -- any issues with this, feel free 
to revert
 2014-02-16 11:18:03 -05:00
Seth Call 8cfe032dc2 * adding error info to debug VRFS-1140 and pagination in progress on VRFS-1135 2014-02-16 14:04:24 +00:00
Seth Call 8b7761f98f * adding empty gif to pass tests 2014-02-16 13:49:02 +00:00
Brian Smith 5ba98b93ab fixing tests in progress 2014-02-16 08:40:03 -05:00
Seth Call f7d0ef2b05 * VRFS-1135 only one recording comes back; not per claimed recording 2014-02-16 13:10:00 +00:00
Jonathan Kolyer cddf9a5013 added active_latests convenience method 2014-02-16 02:31:44 -06:00
Brian Smith 36287d0b5f VRFS-1028 hover bubble / like and follow refactor 2014-02-16 02:28:35 -05:00
Seth Call 06a9dde2c2 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-02-16 03:38:13 +00:00
Seth Call ac677ebdf1 * adding sample data building to create a recording with a mix. VRFS-1135 2014-02-16 03:37:54 +00:00
Brian Smith c173582aa3 more work on like/follow refactor 2014-02-15 20:24:51 -05:00