Commit Graph

1289 Commits

Author SHA1 Message Date
Seth Call 37417708b3 * merged 2016-01-15 12:04:06 -06:00
Seth Call 0d49744a7a * teacher profile musician profile QA'ed some 2016-01-15 11:59:55 -06:00
Seth Call 7fe1824085 * fix review API 2016-01-14 12:45:55 -06:00
Seth Call 31e8d6a26c * reviews 2016-01-13 07:15:58 -06:00
Seth Call 48a54b812c * merged ratings 2016-01-12 21:06:23 -06:00
Seth Call 69c05a3e0a * reviews updated 2016-01-12 21:01:39 -06:00
Seth Call 14643531dc * working minus ratings 2016-01-12 20:37:00 -06:00
Seth Call c05c706455 * support news 2016-01-08 16:13:59 -06:00
Seth Call fc38c9ec50 * VRFS-3822 - allow follow me behavior and client nodes to get in 2016-01-07 06:52:27 -06:00
Seth Call 6344e14f7d * wip 2016-01-07 05:12:11 -06:00
Seth Call c5b8465012 * crash dum 2016-01-04 14:44:45 -06:00
Seth Call 4d41e2278d * screen emails 2016-01-04 13:42:11 -06:00
Seth Call 922cfc4540 * finish out crash notification 2016-01-04 11:28:10 -06:00
Seth Call 4ef76abcf9 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2016-01-03 21:39:00 -06:00
Seth Call 70f22f8601 * track em 2016-01-03 21:38:30 -06:00
Jonathan Kolyer adecb8fc20 VRFS-3784 refactored free credit decrementing from sale into user for ios 2016-01-03 17:38:30 +00:00
Seth Call fb24f3beae merged from master 2015-12-28 07:19:40 -06:00
Jonathan Kolyer 5411a3bbf9 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2015-12-26 02:49:30 +00:00
Jonathan Kolyer ce1e735750 VRFS-3784 use ILIKE for search on original_artist 2015-12-26 02:47:39 +00:00
Seth Call 7a8775cbf6 * allow null parts on instrument assignment 2015-12-19 21:21:59 -06:00
Seth Call b48ea1cc59 * more fixing logic for paris tracks 2015-12-18 15:32:40 -06:00
Seth Call 09483f219a * paris music importing locally, stats refinement 2015-12-14 15:05:23 -06:00
Jonathan Kolyer 153ed88a79 VRFS-3728 head call for ios app; mixdown checksum; simulate purchase 2015-12-11 20:02:09 +00:00
Seth Call 6314748225 * wip 2015-12-09 11:32:24 -06:00
Seth Call 886df5d092 * master mix controls for creator or delegated 2015-12-07 20:25:43 -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 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 819e87079e * click track import working 2015-11-30 21:21:27 -06:00
Seth Call e3b4b2324b * clicktrack support 2015-11-30 17:54:17 -06:00
Seth Call 7f0fd988ce * add gift card image 2015-11-30 05:07:47 -06:00
Seth Call 6f488d4692 * make nice display for admin 2015-11-29 14:30:34 -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 c329912527 *remove AAC generation warning 2015-11-20 07:07:56 -06:00
Seth Call 51429e8b5a * import of timtracks working 2015-11-20 06:57:32 -06:00
Seth Call d3d2fbb210 * generate jmep automatically 2015-11-18 15:22:06 -06:00
Seth Call 7fbb215fca * VRFS-3708 - allow redemption of gift cards 2015-11-13 07:12:58 -06:00
Jonathan Kolyer fb9a7c01af VRFS-3681 develop branch merge tweaks 2015-11-08 23:02:18 +00:00
Jonathan Kolyer f41aced15f VRFS-3681 reverted changes for develop branch merge 2015-11-08 22:44:15 +00:00
Jonathan Kolyer 1bcee2e60c Merge branch 'develop' into feature/mobile 2015-11-01 02:28:10 +00:00
Jonathan Kolyer c27ed06455 VRFS-3681 add year and counter 2015-11-01 02:27:18 +00:00
Jonathan Kolyer 61e93b7d1d VRFS-3681 fixed artist pagination 2015-10-29 03:17:47 +00:00
Seth Call 9d8c46ca7c * sale line items 2015-10-28 08:10:03 -05:00
Seth Call fbc2e9498f * fix iphone/ipad actions, also stop doing popups anywhere 2015-10-26 16:03:43 -05:00