Commit Graph

784 Commits

Author SHA1 Message Date
Jonathan Kolyer 9df947097f VRFS-3681 develop branch merge review 2015-11-08 23:05:34 +00:00
Jonathan Kolyer 70f047dd3c VRFS-3681 removed git merge artifcats 2015-11-08 22:06:19 +00:00
Jonathan Kolyer 1bcee2e60c Merge branch 'develop' into feature/mobile 2015-11-01 02:28:10 +00:00
Seth Call fbc2e9498f * fix iphone/ipad actions, also stop doing popups anywhere 2015-10-26 16:03:43 -05:00
Jonathan Kolyer 1fe20d6c2b merging develop 2015-10-24 01:58:49 +00:00
Seth Call f002864a08 * most of VRFS-3674 (detect browser-based fraud) done 2015-10-23 14:42:51 -05:00
Jonathan Kolyer bfa3b0b8c9 VRFS-3459 accidental file adding 2015-10-19 20:00:09 +00:00
Jonathan Kolyer 7a2dd6ea0b VRFS-3459 merging develop 2015-10-19 19:58:41 +00:00
Seth Call 53f5c6d4df * fix help doc link 2015-10-19 13:54:33 -05:00
Seth Call 993e12995c * track redeem correctly; also try and fix admin 2015-10-19 12:56:52 -05:00
Seth Call d2d1b8facc * anonymous check is correct now, as well as video in landing page 2015-10-16 16:50:08 -05:00
Seth Call 58b8a29f51 * VRFS-3630 - jamtrack landing page revamp
* VRFS-3637 - jamtrack landing tile updated
* VRFS-3638 - jamtrack web player
2015-10-16 14:01:18 -05:00
Jonathan Kolyer 0c25d0e40b merging develop 2015-10-05 14:06:39 +00:00
Seth Call 4a647b8bd1 * VRFS-3519 - client and server jamtrack mixdown support 2015-09-21 20:01:39 -05:00
Seth Call 468b0c4998 * adding guess code and fixing importer 2015-09-20 15:14:45 -05:00
Seth Call 0741119a5d Merge branch 'develop' into feature/mixdown 2015-09-12 11:25:24 -05:00
Seth Call ad24f3d3b6 * packager working, apis working 2015-09-11 21:11:19 -05:00
Seth Call c802759e42 * wip 2015-09-08 15:30:44 -05:00
Seth Call 5df4192356 * mip 2015-09-08 12:33:23 -05:00
Seth Call 0076f0205a * VRFS-352 - instrument-centric landing page 2015-09-04 15:00:45 -05:00
Seth Call 2bce35d604 * fix jamtrack test 2015-08-26 20:38:34 -05:00
Seth Call 8566cc5bc9 * fix typo added in webcamViewer 2015-08-26 20:31:34 -05:00
Seth Call 22ea6e89fd * VRFS-3488 - jamtrack search by artist and song need to pin to the match, not do a sloppy search 2015-08-26 20:26:39 -05:00
Seth Call fc69242578 * VRFS-3427 - update FTUE to test video, not just audio 2015-08-24 16:18:31 -05:00
Seth Call f6101f3621 VRFS-3422, VRFS-3423, VRFS-3424, VRFS-3429 - JamTrack search/listing 2015-08-18 14:26:41 -05:00
Seth Call 557e19e5e7 * allow better onboarding of JamTracks including audio from Tency Music (VRFS-3296, VRFS-3386) 2015-08-09 13:37:43 -05:00
Seth Call e779d25955 * VRFS-3366 - make the 'Music' volume affect 5 categories, not just one 2015-07-22 17:46:33 -05:00
Seth Call a4b3ff4b03 * fix up the 'no local tracks' font sizing and click behavior 2015-07-22 09:30:28 -05:00
Seth Call 6fede36b04 * protect against double-activation of search of find session screen 2015-07-22 08:16:00 -05:00
Seth Call bade8884f3 * stop influxdb prints in web tests 2015-07-22 07:52:41 -05:00
Seth Call 609cdacec3 * still trying to fix find session tests; aestetic tweaks to session screen (VRFS-3355 and VRFS-3354) 2015-07-21 13:23:12 -05:00
Seth Call 472c86497d * fix syntax error 2015-07-20 14:04:16 -05:00
Seth Call 6de0253c4c * trying to fix these find session test failures 2015-07-20 13:52:36 -05:00
Seth Call b11c707155 * add intermittent:true to avoid certain tests 2015-07-20 12:56:47 -05:00
Seth Call 7c70a36d80 * allow youtube_spec to be excluded by build server 2015-07-20 11:58:33 -05:00
Seth Call 03e8b1e036 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2015-07-20 11:38:16 -05:00
Seth Call 2171f06685 * VRFS-3347 - disable metronome in master mix view (still can't get helpbubble to show), update password of google account 2015-07-20 11:38:04 -05:00
Steven Miers f13d14b62d Some brief notes on the youtube spec. 2015-07-20 10:45:55 -05:00
Seth Call e53af19dc6 * fixing more tests 2015-07-20 08:59:24 -05:00
Seth Call 4b7e7c1c7f * ignore ssl errors in phantomjs 2015-07-20 07:58:15 -05:00
Seth Call f6d54a57f5 * test fixes 2015-07-19 09:57:40 -05:00
Seth Call ecc575c7d9 * fixnig download spec 2015-07-18 07:49:45 -05:00
Seth Call d280a53e48 * fix metronome personal/master bug; try to fix intermittent fail 2015-07-17 16:02:36 -05:00
Seth Call af870d3439 * trying to fix find_session tests and others 2015-07-17 12:16:16 -05:00
Seth Call d8e712e85c * fixing more tests and slight style issues 2015-07-17 11:52:46 -05:00
Seth Call 67f433040f * fix user_progression tests for download page 2015-07-17 08:11:30 -05:00
Seth Call a1bd2d6941 * try fixing find session tests when run with existing test data 2015-07-17 07:30:16 -05:00
Seth Call c5033435f2 * fixing feed_spec 2015-07-17 07:18:27 -05:00
Seth Call fbc6c0517c * marking some tests pending while debugging them 2015-07-16 16:09:42 -05:00
Seth Call cd37c85c68 * fix more tests and disable autorun of test-unit now that we have to include it as a dependency 2015-07-16 13:55:00 -05:00