Commit Graph

44 Commits

Author SHA1 Message Date
Steven Miers d5a8959677 Merge with develop. 2015-06-03 14:22:21 -05:00
Steven Miers 294c01d44a Merge with latest develop 2015-05-11 17:25:37 -05:00
Steven Miers 2260d21fc1 VRFS-3007 : Merge with latest develop 2015-04-28 16:43:38 -05:00
Seth Call 1ad86b1d80 * VRFS-3098 - pause button added to jamtrack 2015-04-28 08:58:34 -05:00
Seth Call 8e6b923b05 * VRFS-3092 - fix jamtrack browse page styling issues, VRFS-3096 - fix standalone download page to have no signup context 2015-04-27 10:35:09 -05:00
Steven Miers 7025673939 VRFS-1847 : Show video button in session.
* Hook to webcam viewer widget and initialize and toggle as appropriate
from session.js
* Camera icon
2015-04-16 13:05:40 -05:00
Steven Miers 766568f8cb Merge and fix 2015-04-16 12:16:09 -05:00
Brian Smith 83c00ea6e4 merge develop 2015-03-29 10:12:42 -04:00
Steven Miers 401fd43849 Merge branch 'feature/jam_track_ui_2' into develop 2015-03-27 15:48:08 -05:00
Seth Call 9ee31aad2c VRFS-2799 - musicians tile icon updated to be guitar 2015-03-27 10:21:05 -05:00
Brian Smith 8ee9dbaee5 VRFS-2701 added online presence logos, fixed html issue that broke the dialogs 2015-03-18 08:13:33 -04:00
Steven Miers 4e99505d2a VRFS-2877 : Update look and feel of cart
* New checkmark icon
* Use table layout instead of width/float
* Misc layout fixes
2015-03-15 21:32:37 -05:00
Steven Miers 7f851c66cb VRFS-2797 : New shopping cart icon. Also a transparent small version to use as icon. 2015-02-24 10:12:32 -06:00
Steven Miers ff95fe1c35 VRFS-2498, VRFS-2499 : Mesh out backing track/metronome track support at necessary layers rest/api/UI/etc. Implement necessary methods in fakeJamClient for quicker iterating. 2015-01-20 22:14:48 -06:00
Steven Miers 9dc364ea20 VRFS-2498 : Metronome graphic, made transparent. Session UI for metronome. 2015-01-08 11:14:02 -06:00
Seth Call 585f307747 * add missing icon_folder.png 2015-01-07 08:54:28 -06:00
Seth Call 9876c00a7a * VRFS-2456 - add listen function to find session page, and update of join/rsvp icons 2014-12-19 14:00:49 -06:00
Steven Miers 433fe0be74 Initial merge and manual conflict and fix for tests. 2014-11-04 14:55:12 -06:00
Jonathan Kolyer 2e679246cf VRFS-2340 renamed ukulele image to use correct spelling 2014-10-19 23:07:16 +00:00
Brian Smith e211871168 merge develop 2014-06-23 01:09:03 -04:00
Seth Call fafc7b218f * oomps. forgot drag handle VRFS-1790 2014-06-19 16:24:55 -05:00
Scott Comer e3e9953768 update images per david 2014-06-15 13:22:33 -05:00
Brian Smith ae79912dab merge develop 2014-05-31 07:41:59 -04:00
Scott Comer 2fe78d84c2 add background transparency 2014-05-30 17:28:56 -05:00
Scott Comer 43fce0df1d commented attempt at adding scoring to display; images need transparent backgrounds; template tutorial required; look in erb file for todo scott 2014-05-30 15:55:00 -05:00
Brian Smith fea728923f VRFS-1671 RSVP submit dialog work 2014-05-28 01:14:14 -04:00
Jonathan Kolyer dddc0311c0 VRFS-1577 VRFS-736 session ratings 2014-04-30 14:07:23 +00:00
Jonathan Kolyer 7b2d124b33 VRFS-1576 affiliate report view integration 2014-04-23 06:38:49 +00:00
Brian Smith e38494b0f9 VRFS-1481 display 256x256 instrument icons on musician profile page 2014-03-17 18:55:11 -04:00
Seth Call b9ee475db5 * working on event page 2014-03-10 06:31:20 +00:00
Brian Smith fde077e72e correct pause button 2014-02-21 20:12:50 -05:00
Brian Smith 9bd673e67d VRFS-1185 fix piano and upright bass icons 2014-02-19 21:07:03 -05:00
Brian Smith e24cdab262 rename vocals icon to fix bug 2014-02-16 21:47:42 -05:00
Seth Call d10f966c0b * VRFS-1025 finished 2014-02-03 21:19:34 +00:00
Seth Call af553c1734 * adding fb image 2014-02-02 15:07:04 -06:00
Brian Smith 8c4296096c VRFS-1020 share dialog work 2014-01-25 13:25:27 -05:00
Brian Smith 6d482a034d VRFS-986 more landing page work 2014-01-16 02:50:13 -05:00
Brian Smith 4f9e36a332 VRFS-986 more landing page work 2014-01-16 01:55:36 -05:00
Brian Smith 59f6e10e55 VRFS-986 recording landing page work 2014-01-14 02:49:21 -05:00
Seth Call ba3b9ab873 * VRFS-946 - in-session recording 2014-01-05 03:47:23 +00:00
Brian Smith d063ba2a37 VRFS-819 VRFS-76 band profile updates 2013-11-02 02:10:35 -04:00
Seth Call fe5d579e67 * VRFS-780; forgot images 2013-10-21 17:14:15 -05:00
Seth Call 481514e301 * VRFS-778, VRFS-777, VRFS-788, VRFS-787-to create new downloads page, I needed to add a new layout 'web', and make user dropdown more reusable 2013-10-19 14:46:06 -05:00
Seth Call 2f41675471 merging jam-web into web 2013-09-15 18:04:37 +00:00