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

2620 Commits

Author SHA1 Message Date
Jonathan Kolyer ddc4decfd3 merging feature/musician_profile_enhancements 2015-03-30 06:07:43 +00:00
Brian Smith c9468d0981 Merge branch 'feature/musician_profile_enhancements' of bitbucket.org:jamkazam/jam-cloud into feature/musician_profile_enhancements 2015-03-29 21:22:27 -04:00
Brian Smith b02013846e VRFS-2701 remove error message when username is blank 2015-03-29 21:22:12 -04:00
Brian Smith 83c00ea6e4 merge develop 2015-03-29 10:12:42 -04:00
Brian Smith a0e9dbdd25 VRFS-2701 added callbacks to site validator to highlight invalid usernames and site URLs 2015-03-29 10:06:39 -04:00
Seth Call 398f7e04ad Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2015-03-28 10:10:29 -05:00
Seth Call 260a80ee37 * VRFS-2987 - remote participants can see opened JamTracks 2015-03-28 10:10:18 -05:00
Steven Miers 401fd43849 Merge branch 'feature/jam_track_ui_2' into develop 2015-03-27 15:48:08 -05:00
Seth Call 23fdf51110 * resize session based on track content VRFS-2819 2015-03-27 15:36:09 -05:00
Seth Call 9ee31aad2c VRFS-2799 - musicians tile icon updated to be guitar 2015-03-27 10:21:05 -05:00
Steven Miers 4f08f6acad Merge and fix 2015-03-27 09:54:01 -05:00
Seth Call e2957592ea VRFS-2605 - audiomixer manifest updated for volume and offsets 2015-03-26 17:45:23 -05:00
Steven Miers 3f994e3993 Merge branch 'develop' into feature/jam_track_ui_2 2015-03-26 11:59:49 -05:00
Jonathan Kolyer cc1660d1dc Merge branch 'feature/musician_profile_enhancements' into feature/musician_search2 2015-03-26 04:28:09 +00:00
Jonathan Kolyer 9eeb0e454b VRFS-2795 merging with feature/musician_profile_enhancements 2015-03-26 03:31:21 +00:00
Brian Smith 1b89e570e3 Merge branch 'feature/musician_profile_enhancements' of bitbucket.org:jamkazam/jam-cloud into feature/musician_profile_enhancements 2015-03-25 22:20:58 -04:00
Brian Smith 5e6082d1f1 VRFS-2701 integrated site validators 2015-03-25 22:20:43 -04:00
Seth Call 1e1e6222bb * VRFS-2686 - if user seeks to 0, then offest it back to beginning of JamTrack (before prelude) 2015-03-25 15:01:22 -05:00
Seth Call 31e4fbfdf8 * suppress metronome logic when JamTrack is open VRFS-2971 2015-03-25 14:45:51 -05:00
Seth Call 8d296e6b8e * remove code that I did not mean to commit 2015-03-25 14:33:27 -05:00
Seth Call 0848a59082 * merged develop again 2015-03-25 14:32:03 -05:00
Steven Miers d0e036252e Touch 2015-03-25 17:09:08 +00:00
Seth Call 53ef0f1b4f VRFS-2975 - change jam track Id to varchar(64) 2015-03-25 11:11:10 -05:00
Steven Miers 5f953d1b19 VRFS-2830 : Merge / manual fix 2015-03-25 10:56:24 -05:00
Seth Call 6885424668 * allow admin to open jamtrack 2015-03-25 09:34:43 -05:00
Steven Miers adef8c8c45 VRFS-2830 : Payment History 
API, client, view, styles and test
 2015-03-24 17:13:09 -05:00
Seth Call f51b11b2e0 * VRFS-2979 - show jamtracks tile if admin 2015-03-24 15:20:56 -05:00
Seth Call 7510b098ab * fix two tests needing new method of uploading 2015-03-24 15:07:33 -05:00
Seth Call 18563ff065 * VRFS-2890 fix infinite scroll as well as bug with limit vs per_page style scrolling 2015-03-24 14:59:20 -05:00
Seth Call bfe302b2f1 * merged 2015-03-24 14:43:48 -05:00
Seth Call ccd60aa631 * merged develop 2015-03-24 11:27:26 -05:00
Seth Call 1c0407cca4 * wip 2015-03-24 10:19:21 -05:00
Brian Smith bc98a17786 VRFS-2701 wired up action buttons on samples page 2015-03-23 22:32:04 -04:00
Brian Smith d3cf83db85 VRFS-2701 remove use of template on experience screen 2015-03-23 22:26:36 -04:00
Steven Miers 5e2d860bf7 VRFS-2830 : License dialog and hookup 2015-03-23 15:38:55 -05:00
Brian Smith 9face3b3f9 VRFS-2701 wip presence/sample edit 2015-03-23 16:27:36 -04:00
Jonathan Kolyer 98ea77a5e0 Merge branch 'develop' into feature/cohort_data 2015-03-23 20:07:24 +00:00
Jonathan Kolyer 8c2df0bb6b VRFS-2916 added jamtrack plays handling; worked around jam_tracks.id bigint problem (with commented dependencies); tested jamtrack play saves from JS through rspec; final cleanup of cohort reporting 2015-03-23 20:06:32 +00:00
Brian Smith 231f7c69b5 VRFS-2701 wip presence/sample edit 2015-03-23 13:11:28 -04:00
Seth Call 04aa1a9b3c * wip 2015-03-23 08:52:52 -05:00
Brian Smith 3ae34fc426 VRFS-2974 fixed broadcast widget bug when session is private 2015-03-22 21:30:08 -04:00
Brian Smith e4aa6609ec VRFS-2974 fixed broadcast widget bug when session is private 2015-03-22 21:13:53 -04:00
Brian Smith 370ca1086e VRFS-2701 VRFS-2699 wip performance samples edit screen 2015-03-21 20:53:38 -04:00
Brian Smith ae71c1b9e9 VRFS-2701 VRFS-2699 wip performance samples edit screen 2015-03-21 10:16:46 -04:00
Brian Smith 96a816f317 merge develop 2015-03-21 10:06:53 -04:00
Brian Smith 9acb235a6d VRFS-2701 VRFS-2699 wip performance samples edit screen 2015-03-21 10:04:46 -04:00
Seth Call 128a8119cf * VRFS-2942 - show correct instrument and show correct part info 2015-03-20 22:04:03 -05:00
Seth Call b137d7586f * VRFS-2973 - fix pagination in jam trackdialog 2015-03-20 21:27:11 -05:00
Seth Call 36b4179492 * VRFS-2972 - adding test purchase feature to jam-admin for buying all JamTracks (admin users only) 2015-03-20 17:26:56 -05:00
Seth Call f29a9d7465 * wip 2015-03-20 16:15:13 -05:00