Commit Graph

24 Commits

Author SHA1 Message Date
Seth Call ccd60aa631 * merged develop 2015-03-24 11:27:26 -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 661c4ed446 * wip 2015-03-20 08:48:00 -05:00
Seth Call 97d469cc85 * wip 2015-03-16 13:27:39 -05:00
Seth Call 39415cdf22 * remove BPM from jam_tracks 2015-02-17 10:41:49 -06:00
Steven Miers 433fe0be74 Initial merge and manual conflict and fix for tests. 2014-11-04 14:55:12 -06:00
Seth Call b87ff571ce * VRFS-1073 - support multiple websocket gateways 2014-09-24 14:27:56 -05:00
Seth Call 2bd189b697 * VRFS-2159 merge 2014-09-12 22:30:51 -05:00
Seth Call e4a8ce3759 * fix broken admin test 2014-08-14 14:08:35 -05:00
Seth Call 90ec0b3f1a * fix admin tests 2014-08-13 15:32:51 -05:00
Seth Call 5feb642c0f * fixing admin tests 2014-07-14 17:43:07 -05:00
Seth Call 6d84241cae * merged 2014-06-23 22:28:23 -05:00
Seth Call 5750584769 * VRFS-1803 - myriad create session styling fixes; some default behaviors added, UI behavors added; VRFS-1808; change up how upload files works 2014-06-23 22:26:27 -05:00
Seth Call 3d1c4f2488 * VRFS-1790 - drag handles added to configure tracks; VRFS-1653 - fixed bug where slow initial connect would cause loop; also log in on initail connect instead of extra login message 2014-06-19 14:05:33 -05:00
Seth Call e4da30f39e * wip 2014-05-29 14:39:08 -05:00
Seth Call ac2ee3210f * VRFS-1654 - fixing tests 2014-05-13 14:48:58 -05:00
Anthony Davis 9929e1eca1 VRFS-1708 / VRFS-1654 - marking these tests as pending 2014-05-11 15:59:37 -05:00
Seth Call e3b17fb439 * .touch on the history entries 2014-05-09 14:36:03 -05:00
Bert Owen 6ecb7abcad VRFS-1654 issue fixed without test 2014-05-09 23:50:50 +08:00
Seth Call f3d39a351d * wip 2014-05-06 08:34:38 -05:00
Seth Call 9e561c047a * VRFS-1103 - coverage for all projects. need to figure out how to merge all 2014-02-13 22:11:30 -06:00
Jonathan Kolyer 291a3a8ac2 vrfs-774: changing country value from USA to US for max_mind_geo support 2013-11-03 01:49:10 -06:00
Seth Call 7c7eca0964 * fixing up admin tests after changing their menu label 2013-10-16 12:28:44 -05:00
Seth Call c8150c8aee merging jam-admin into admin 2013-09-16 03:15:31 +00:00