Commit Graph

3295 Commits

Author SHA1 Message Date
Seth Call 34dcc27641 Merge branch 'develop' into feature/vst 2015-12-07 21:05:10 -06:00
Seth Call 9afc3155ef * remove log 2015-12-07 21:05:05 -06:00
Seth Call 886df5d092 * master mix controls for creator or delegated 2015-12-07 20:25:43 -06:00
Seth Call 6d5db83aea * midi not working still 2015-12-04 15:29:59 -06:00
Seth Call dd8e375766 * scan weirdness 2015-12-04 12:08:40 -06:00
Seth Call d9f1becb9b * merge 2015-12-04 11:37:59 -06:00
Seth Call 949ce8a513 * VRFS-3756 - webcam audio 2015-12-04 11:16:40 -06:00
Seth Call 223988f421 * better align 2015-12-04 09:39:33 -06:00
Seth Call 8e72a9833a Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2015-12-04 09:29:04 -06:00
Seth Call 3adeef4dee * csv/pdf links in place in the UI 2015-12-04 09:27:28 -06:00
Seth Call 5049e3f813 * generate CSV and PDF for jamtracks 2015-12-04 08:32:18 -06:00
Jonathan Kolyer bcca86da8f VRFS-3728 merge 2015-12-04 05:29:04 +00:00
Jonathan Kolyer 53f7f29c06 VRFS-3728 ios client sync api tweaks 2015-12-04 05:26:26 +00:00
Seth Call 54a437d6e1 * VRFS-3725 - frontend support for click tracks and tap-in creation 2015-12-03 14:21:07 -06:00
Seth Call 4cb737761a * add download trakcer page 2015-12-02 16:53:09 -06:00
Seth Call c1402e2777 * VRFS-3757 - Fix jamtrack search bugs 2015-12-02 15:01:18 -06:00
Seth Call e3b4b2324b * clicktrack support 2015-11-30 17:54:17 -06:00
Seth Call b7cbb86e3b * tweak gift card landing 2015-11-30 11:03:32 -06:00
Seth Call 7f0fd988ce * add gift card image 2015-11-30 05:07:47 -06:00
Seth Call 7432b50438 * fix some minor display issues 2015-11-29 14:15:53 -06:00
Seth Call bd02774db9 GiftCards are purchable 2015-11-29 13:58:10 -06:00
Seth Call 6d514c3df2 * api for marking purchase from ios 2015-11-28 19:38:39 -06:00
Jonathan Kolyer 50c3731dff VRFS-3728 check for purchases and mixes outside of ios 2015-11-25 03:47:22 +00:00
Seth Call 5e754a7096 * update video Url 2015-11-24 07:45:17 -06:00
Seth Call b9a7bd6e09 * fix JS error 2015-11-24 06:49:35 -06:00
Seth Call becf0a82b1 * updatin landing pages for JamBlaster on Kickstarter 2015-11-24 06:03:23 -06:00
Seth Call 143506afd5 * wip 2015-11-21 15:29:15 -06:00
Seth Call 83b7009c51 * wip 2015-11-20 16:18:08 -06:00
Seth Call 51429e8b5a * import of timtracks working 2015-11-20 06:57:32 -06:00
Seth Call 184bf2ba4d * merge 2015-11-19 22:09:11 -06:00
Seth Call c2772398a8 * importer 2015-11-19 22:07:38 -06:00
Seth Call 1da8cfd4a1 * support abort signal 2015-11-19 16:58:55 -06:00
Seth Call 2a74d7ec9a * record crash dump description 2015-11-19 11:22:41 -06:00
Seth Call d3d2fbb210 * generate jmep automatically 2015-11-18 15:22:06 -06:00
Seth Call d4cdab8d6b * VRFS-3715 - filepicker fixed by taking out signature and policy 2015-11-17 06:26:37 -06:00
Seth Call cd6bf55a1a * VRFS-3719 - dont show update dialog more than one at a time 2015-11-17 05:28:02 -06:00
Seth Call 38a64a3dde * VRFS-3711 - push video button brings to front 2015-11-16 20:46:44 -06:00
Seth Call bec9388aae * vst fixems 2015-11-13 15:35:13 -06:00
Seth Call 5fad4953bc * vst working 2015-11-13 14:00:37 -06:00
Seth Call 021db62539 Merge branch 'develop' into feature/vst 2015-11-13 11:06:07 -06:00
Seth Call e8cb399692 * fix some tests 2015-11-13 10:00:46 -06:00
Seth Call 7fbb215fca * VRFS-3708 - allow redemption of gift cards 2015-11-13 07:12:58 -06:00
Seth Call c3626ebe22 * wip 2015-11-11 05:39:28 -06:00
Seth Call bb9beb9cab Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2015-11-09 15:33:14 -06:00
Seth Call 1da8c73721 * wip 2015-11-09 15:33:04 -06:00
Jonathan Kolyer 9df947097f VRFS-3681 develop branch merge review 2015-11-08 23:05:34 +00:00
Jonathan Kolyer f41aced15f VRFS-3681 reverted changes for develop branch merge 2015-11-08 22:44:15 +00:00
Jonathan Kolyer 57314a9b1c VRFS-3681 reverting edits prior to develop branch merge 2015-11-08 22:24:31 +00:00
Jonathan Kolyer d7a6bdaaba VRFS-3681 mobile load preview image 2015-11-08 22:15:01 +00:00
Jonathan Kolyer 70f047dd3c VRFS-3681 removed git merge artifcats 2015-11-08 22:06:19 +00:00