Commit Graph

763 Commits

Author SHA1 Message Date
Jonathan Kolyer e28352c8fc VRFS-360: added dynamic generation of jnlp pages for isp latency testing; added att, comcast, other isp options 2013-06-13 22:34:34 -05:00
Brian Smith c57b17c00a remove unused variable 2013-06-12 22:02:37 -04:00
Brian Smith 39ff7a98c5 update text 2013-06-12 22:01:57 -04:00
Brian Smith 09fc3f6caf VRFS-299 notification now slides up from bottom of screen 2013-06-11 23:59:57 -04:00
Brian Smith 039275da9a VRFS-355 remove call to refreshDisplay in afterShow 2013-06-11 20:53:53 -04:00
Brian Smith 80b28ad5b7 Merge branch 'master' of bitbucket.org:jamkazam/jam-web 2013-06-11 20:49:45 -04:00
Brian Smith 80042696c4 VRFS-355 find session fix (hopefully) 2013-06-11 20:49:42 -04:00
Brian Smith 5436c514ce VRFS-355 find session fix (hopefully) 2013-06-11 20:39:27 -04:00
Jonathon Wilson b6583859e9 FTUE: Set FTUE=true and hide extra buttons on success. Always update needle, even in failure. Limit max width of select boxes. Convert latency reponse from microseconds to milliseconds. 2013-06-11 09:11:41 -06:00
Jonathon Wilson 1a3cc951d0 Merge branch 'master' into SS 2013-06-10 22:01:08 -06:00
Jonathon Wilson 225a3f22c6 FTUE: Bug fix when you go back to settings and switch frame size - auto-set inputs. 2013-06-10 22:00:51 -06:00
Jonathon Wilson 410c124906 FTUE: Actually set db levels to 0 and update FTUE faders to reflect. Link RUN TEST AGAIN to audio settings to allow user to make changes before trying again. 2013-06-10 21:28:12 -06:00
Jonathon Wilson 0bf909db38 FTUE: revert fake jam client to not show FTUE 2013-06-10 20:05:28 -06:00
Jonathon Wilson 7cde817e63 FTUE: audio in/out set to 0DB instead of -80DB on settings init. Fix visual problems. 2013-06-10 20:04:51 -06:00
Jonathon Wilson 65bf5d225f SessionSettings: add refresh of session after save. Remove excessive debug out. 2013-06-10 19:53:49 -06:00
Jonathon Wilson 3f6483255c Merge branch 'master' into SS 2013-06-10 19:39:26 -06:00
Jonathon Wilson ad97c94885 SessionSettings: Flatten save structure to match Seth's changes. Logger output 2013-06-10 19:39:09 -06:00
Seth Call 3c66830251 * fixing genre update 2013-06-10 20:37:25 -05:00
Jonathon Wilson ebe5cc3014 Merge branch 'master' into SS 2013-06-10 19:35:39 -06:00
Seth Call 6a959f3ad7 Merge branch 'master' of bitbucket.org:jamkazam/jam-web 2013-06-10 20:31:20 -05:00
Seth Call b23db50081 * updating tests and controller for update music session 2013-06-10 20:25:59 -05:00
Jonathon Wilson 1873513c70 Session Settings: approval required disabled based on musician access. Fixes for binding radio buttons. Layout.js bug fix for dialog close. 2013-06-10 09:48:14 -06:00
Jonathon Wilson ea96d153ef Session settings: close dialog on save response 2013-06-09 23:24:33 -06:00
Brian Smith c5f79ecdaa VRFS-356 remove test code 2013-06-09 23:12:07 -04:00
Brian Smith c5b5048655 VRFS-356 fix Unused Inputs box height on Configure Track dialog 2013-06-09 23:10:25 -04:00
Brian Smith dffe182073 VRFS-356 fix alignment problems on configure / add track dialogs 2013-06-09 22:56:30 -04:00
Jonathon Wilson 2b78c6de3c Fix merges. Just take master side for all. Mine were just === chnages. 2013-06-09 20:17:38 -06:00
Jonathon Wilson 9c99be17f8 Session settings functioning, but have 500 error on REST call. Working with Seth to figure out what I'm doing wrong 2013-06-09 20:12:43 -06:00
Brian Smith 10d4ccaaea VRFS-355 only increment category counts if latency response callback is called 2013-06-09 14:19:23 -04:00
Brian Smith 2ddce5c0e5 Merge branch 'master' of bitbucket.org:jamkazam/jam-web 2013-06-09 13:44:08 -04:00
Brian Smith 9dd7d93206 VRFS-355 added debug logs, reset category hashes, and call initializeDisplay when searching 2013-06-09 13:43:44 -04:00
Jonathon Wilson 7e730e870d Bugfix to session settings which was binding to the wrong screen event name causing sessions to not load 2013-06-09 11:37:40 -06:00
Jonathon Wilson c3163fdb61 Partway through refactor of genre selector to make it easier to reuse from multiple places. Minor session settings dialog fixes. 2013-06-09 11:02:53 -06:00
Jonathon Wilson bdd2d10c74 Merge branch 'master' into SS 2013-06-09 08:58:01 -06:00
Jonathan Kolyer 856671b818 Merge branch 'master' of bitbucket.org:jamkazam/jam-web 2013-06-09 09:12:09 -05:00
Jonathan Kolyer ecd7a1ecff VRFS-351: integrated isp scoring artifacts 2013-06-09 09:12:03 -05:00
Jonathan Kolyer 2626efa931 VRFS-349: added isp_scoring to /api/users 2013-06-08 17:52:05 -05:00
Jonathon Wilson 7f7616955c SessionSettings: Layout, session screen button opens dialog 2013-06-06 09:48:25 -06:00
Brian Smith 54782f8057 VRFS-328 fixed styling of friend selector dialog 2013-06-06 04:00:09 -04:00
Brian Smith 44bf1b9c21 Merge branch 'master' of bitbucket.org:jamkazam/jam-web 2013-06-05 00:13:42 -04:00
Brian Smith 61ab2be1ae remove unused file 2013-06-05 00:13:22 -04:00
Brian Smith a064989caa VRFS-328 add Choose Friends popup to Create Session screen 2013-06-05 00:11:57 -04:00
Seth Call 983bc65b9c Merge branch 'master' of bitbucket.org:jamkazam/jam-web 2013-06-04 21:43:52 -05:00
Seth Call 53c70a0a08 * signin shows error -- but pretty ugly 2013-06-04 21:43:41 -05:00
Brian Smith add2b942c1 Merge branch 'master' of bitbucket.org:jamkazam/jam-web 2013-06-03 21:26:54 -04:00
Jonathon Wilson 74259290f6 Test fixes 2013-06-02 23:22:41 -06:00
Jonathon Wilson df6c093060 Remove unused files 2013-06-02 21:04:48 -06:00
Jonathon Wilson 77b7354cb6 FTUE: Modify mac to show driver selection. Add debug links to header 2013-06-02 19:31:22 -06:00
Jonathon Wilson d0e63ba6e1 Merge branch 'master' into ftue 2013-06-02 18:09:49 -06:00
Jonathon Wilson 697aae4603 FTUE: Tweaks from real-client testing 2013-06-02 18:08:35 -06:00