seth
/
jam-cloud
mirror of https://bitbucket.org/jamkazam/jam-cloud.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
5,837 Commits 118 Branches 1,306 Tags 359 MiB
Commit Graph

3003 Commits

Author SHA1 Message Date
Steven Miers a823be0b2e VRFS-3007 : Stub non-existent method to fix test. 2015-05-06 13:24:03 -05:00
Seth Call eaabd98ca4 * VRFS-3198 - fix simple boolean bug to rectify out of sync play/pause buttons on playcontrols 2015-05-06 11:54:09 -05:00
Seth Call 4c14e1fbee * VRFS-3196 - pass correct value (even if it's ignored by backend today) 2015-05-05 18:45:14 -05:00
Seth Call 05f5cd619a * VRFS-3193 - indicate on jamtrack browse page that 1st jamtrack is free 2015-05-05 16:38:29 -05:00
Seth Call adfc3d18a9 * VRFS-3184 - user dropdown only shows get help, community, and support 2015-05-05 14:48:39 -05:00
Seth Call 96df8cbfea * disabling teaspoon gemfile for now, because of weird errors; and also VRFS-3176 (jamtrack preview regen task) 2015-05-05 11:44:28 -05:00
Seth Call 8f445883fd VRFS-3146 - fixes for the get ready spiner 2015-05-05 10:29:30 -05:00
Seth Call 6c3cdda1d8 * VRFS-3186 - fix formatting of recording widget on homescreen 2015-05-05 09:58:44 -05:00
Seth Call 6c82e7e3d7 * VRFS-3183 - website home page to have signin 2015-05-05 09:31:11 -05:00
Seth Call 5970fae4fa * VRFS-3188 - sort instrument appropriately 2015-05-05 09:22:15 -05:00
Seth Call 48c2b9a2b2 * VRFS-3187 - track when a user 1st downloads a jamtrack 2015-05-05 08:53:46 -05:00
Seth Call 12ea7312a7 * VRFS-3168 - fix sidebar on session/recording landing pages 2015-05-04 21:36:40 -05:00
Seth Call 0ac94ae6fc * VRFS-3167 - call context.jamClient.FTUELoadAudioConfiguration when dialog is loaded 2015-05-04 20:56:05 -05:00
Seth Call 1a191f1b0b * VRFS-3178 - sort instrument by alpha 2015-05-04 18:27:28 -05:00
Seth Call 99fa64f4b0 * initialize inviter when user is logged in - VRFS-3180 2015-05-04 18:24:46 -05:00
Seth Call 6a3c9b85b2 * VRFS-3179 - tweaking text on jamtracks product page 2015-05-04 18:05:56 -05:00
Seth Call 6fdb784eb4 * remove title setter in downloads partial to fix title; VRFS-3185 2015-05-04 18:03:28 -05:00
Seth Call af98559dfd * VRFS-3181 hide availability filter 2015-05-04 18:01:03 -05:00
Seth Call 4d28915381 * VRFS-3177 - add spinner to playback and stop preloading all media on page 2015-05-04 17:48:14 -05:00
Seth Call 17ce9f641d * VRFS-3165 - stop preview widget by using pause, VRFS-3174 - stop preview when you leave page 2015-05-04 14:09:55 -05:00
Seth Call 73e422a2cc * VRFS-2931 - show video as thumbnail - forgot youtube icon 2015-05-04 13:33:47 -05:00
Seth Call b0dfccec85 * VRFS-2931 - show video as thumbnail 2015-05-04 11:16:13 -05:00
Seth Call acc9e2112d * call new sample rate setters when FTUE profile is created VRFS-3144 2015-05-04 09:01:51 -05:00
Seth Call 0ac1f977b5 update jamblaster video on home page and on product page 2015-05-04 08:54:42 -05:00
Seth Call a2d5c0a2b9 * VRFS-3166 - only play one widget at a time 2015-05-04 07:52:30 -05:00
Seth Call 3069d6b077 * adding video to browse page VRFS-2931 2015-05-04 07:19:48 -05:00
Seth Call 5adc6fe217 * update more locations with wrong video for JamTracks 2015-05-03 22:56:46 -05:00
Seth Call 4cadabe19e * VRFS-3149 - paginator arrows now working 2015-05-03 22:27:48 -05:00
Seth Call c8daee4e00 * VRFS-3148 - column widths are consistent across pages 2015-05-03 22:20:39 -05:00
Seth Call 4cc9dbb896 * VRFS-3130 - slider shows 0 on stop 2015-05-03 22:07:23 -05:00
Seth Call 4be257c52e * finishing up VRFS-2829 now that JamTracks video is available 2015-05-03 21:58:15 -05:00
Seth Call 23108544bc * don't check against backend while user has stopped playing VRFS-3145 2015-05-03 21:48:31 -05:00
Seth Call d5b12eacfa * VRFS-3161 - don't use floats for one-liner; use white-space:no-wrap 2015-05-03 21:40:04 -05:00
Seth Call 7063d6e1ea Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2015-05-03 21:28:28 -05:00
Seth Call f1c96c1531 * feature/VRFS-3146 2015-05-03 21:28:17 -05:00
Steven Miers 4c4121e4d7 Merge with latest develop 2015-05-01 20:00:08 -05:00
Steven Miers 4a83100f37 VRFS-3119 : Musician search bug fixes. Fixes some more tests. 2015-05-01 18:48:41 -05:00
Seth Call 32f0967b2a * VRFS-3141 - tell user why they can't close JamTrack 2015-05-01 16:34:56 -05:00
Seth Call 3697ca9743 * VRFS-3141 - disable close button for JamTrack for non-opener 2015-05-01 16:34:29 -05:00
Seth Call 9f49e9f366 * disable close button for JamTrack for non-opener 2015-05-01 16:30:03 -05:00
Seth Call 7d313b2298 * VRFS-3136 - make sure the 'preferred' is chosen for device, so set the FTUE preferred sample mode 2015-05-01 15:40:42 -05:00
Steven Miers 77ce45d7c6 VRFS-3119 : Comment about broken feature/test. 2015-05-01 13:49:59 -05:00
Steven Miers 425916f31d VRFS-3007 : Fix another bad method reference, and some more tests. 2015-05-01 13:49:28 -05:00
Seth Call 7dec27083b * VRFS-3139 - hide jamkazam virtual input text in account summary screen 2015-05-01 12:16:13 -05:00
Steven Miers b39ab852ba VRFS-3007 : Fix a few more musician search API and feature tests. 2015-05-01 12:09:23 -05:00
Seth Call 1cd57cb4e8 * VRFS-3118 - check for high latency while in session, VRFS-3138 - fix tons of issues with user downloading both sample rates 2015-05-01 12:09:18 -05:00
Steven Miers 6c1371c619 VRFS-3007 : Fix profile history specs. 2015-04-30 20:53:19 -05:00
Steven Miers 7359cb36bf VRFS-3007 : Fix feed tests (bad selector). 2015-04-30 20:48:26 -05:00
Steven Miers 5ba6e1ed18 VRFS-3007 : Fix band feature specs (bad selector). 2015-04-30 20:37:40 -05:00
Steven Miers 51dc0c408a Merge branch 'develop' into feature/musician_profile_enhancements 2015-04-30 19:33:04 -05:00
Steven Miers d4d8489ef1 VRFS-3007 : Fix faulty logic when extracting recording data. Addresses a few test failures. 2015-04-30 19:31:44 -05:00
Seth Call 68b4ab529a * VRFS-3118 - reload audio globally configurable 2015-04-29 22:03:02 -05:00
Seth Call 69ccf0d4e5 * VRFS-3118 - refresh latency by start/stopping audio system 2015-04-29 21:51:54 -05:00
Seth Call 0ddbfc5e72 * VRFS-3120 - make sure FTUE starts out of session 2015-04-29 16:41:02 -05:00
Seth Call e21a1504d1 * VRFS-3129 - ignore metronome spinner display check if jamtrack is open 2015-04-29 16:02:33 -05:00
Seth Call 45d973fedd * VRFS-3134 - give minimum size of opened recording area a little more room 2015-04-29 15:59:44 -05:00
Seth Call a7526dad43 * fix description label 2015-04-29 15:28:01 -05:00
Seth Call b9d30567db * VRFS-3128 - reset seek on load of JamTrack 2015-04-29 14:38:03 -05:00
Steven Miers daef55d1a2 Merge branch 'develop' into feature/musician_profile_enhancements 2015-04-29 12:59:11 -05:00
Steven Miers 757a9a5522 VRFS-3007 : Fix javascript bug causing test and browser problems. Fixes 164 of 203 failures. 2015-04-29 12:58:49 -05:00
Seth Call 72ff54213a * VRFS-2997 - added license to accounts link. also adding config to ignore high latency if in a pinch 2015-04-28 20:07:21 -05:00
Seth Call a6128a195b * VRFS-3121 - fix network test dialog 2015-04-28 17:39:59 -05:00
Steven Miers 2260d21fc1 VRFS-3007 : Merge with latest develop 2015-04-28 16:43:38 -05:00
Seth Call 13e4e816d9 * VRFS-3071 - progress indicator for download 2015-04-28 16:29:48 -05:00
Seth Call 7d5e92baaa * VRFS-3113 - fix bad avatar location for alert 2015-04-28 14:54:47 -05:00
Seth Call 00c9ccf699 * temporarily disable high latency 2015-04-28 14:47:27 -05:00
Seth Call 9fa10fe2b2 * temporarily disable high latency 2015-04-28 11:28:10 -05:00
Seth Call a73aaec393 * don't fail someone joining a session with an unknown latency or very large latency 2015-04-28 11:00:16 -05:00
Seth Call a70e90ab8c * VRFS-3099 - fix left over download confirmation on checkout page if you re-enter it 2015-04-28 10:33:42 -05:00
Seth Call cada0ed0b9 * VRFS-3112 - make recording smaller so no horizontal scroll bar 2015-04-28 09:44:56 -05:00
Seth Call 255ea39e77 * VRFS-3116 - honor positions 2015-04-28 09:35:39 -05:00
Seth Call 1ad86b1d80 * VRFS-3098 - pause button added to jamtrack 2015-04-28 08:58:34 -05:00
Seth Call 34b2614600 * fix dissappearing pause button 2015-04-27 21:39:46 -05:00
Seth Call 1bd054d050 * VRFS-3094 - update style and minor issues in shopping cart screen 2015-04-27 15:42:38 -05:00
Seth Call 907e2a4552 * fix jamtrack shopping tests for the change in button text 2015-04-27 13:42:03 -05:00
Seth Call 760ddecbb1 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 
Conflicts:
	web/app/views/users/_user_dropdown.html.erb
 2015-04-27 11:13:31 -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
Seth Call d4679f6524 * VRFS-3903 - small shopping cart, VRFS-3092 - done except for play/pause icon 2015-04-26 08:25:36 -05:00
Steven Miers 7aa9f3d10a VRFS-3055 : Don't force override of video_available if current_user is admin. 2015-04-24 17:42:32 -05:00
Seth Call 258c034876 * VRFS-3089 - kill timer if the screen changes for jamtrack guides 2015-04-24 17:28:59 -05:00
Seth Call 13c3818c42 * add support for personal alerts email 2015-04-24 16:16:47 -05:00
Seth Call 774c50984d * add a space after dash to give room to packaging prcentage 2015-04-24 15:05:08 -05:00
Seth Call 24e244d766 * VRFS-3085 - further TOS updates 2015-04-24 14:45:49 -05:00
Seth Call 776858c391 * VRFS-3087 - disable filter dropdowns 2015-04-24 13:45:47 -05:00
Seth Call d94388161c * fixing recording-based tests and one checkout test 2015-04-24 12:09:22 -05:00
Seth Call e4bd80a3c3 * VRFS-3085 - update TOS 2015-04-24 10:08:43 -05:00
Seth Call 4cce21e7f8 * VRFS-3080 - partial refund manual process done 2015-04-23 16:20:21 -05:00
Seth Call 989518fa68 * VRFS-3082 - email alert if jamtrack fails 2015-04-23 10:34:17 -05:00
Seth Call 32b5e741cc * ignore jt_metadata.json file 2015-04-22 15:48:57 -05:00
Seth Call d66f8e50d1 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2015-04-22 15:47:57 -05:00
Seth Call 2133bb086e * VRFS-3079 - hide the download prompt if the user has already downloaded the app before 2015-04-22 15:46:44 -05:00
Seth Call 091f2be556 * make the nobody@jamkazam.com configurable so that we can override it in chef to provide context clues 2015-04-22 15:43:36 -05:00
Steven Miers 6c84abdfba Whack test output images. 2015-04-22 15:36:22 -05:00
Steven Miers 75ac40e765 VRFS-3055 : Fix broken gear wizard spec. Add additional test to verify 2015-04-22 15:36:21 -05:00
Steven Miers b916d4d997 VRFS-3055 : Multiple levels of config option video_available 
“none”, “mvp”, and “full”.  “mvp” mode is similar to full, except it
hides video recording functionality.
 2015-04-22 15:36:21 -05:00
Seth Call 39f45f20ba * VRFS-3078 - show original price in void purchase 2015-04-22 14:20:07 -05:00
Seth Call 2fc8041f3f * VRFS-3077 - fix issue with no null check of current_user 2015-04-22 14:04:20 -05:00
Seth Call 9217e92372 * protect against video calls when in account screen 2015-04-22 10:21:08 -05:00
Seth Call 763ade01dd * protect against webcamViewer from getting involved if video is not available 2015-04-22 10:18:33 -05:00
Steven Miers 8f49d7b83f Merge remote-tracking branch 'origin/develop' into develop 2015-04-21 18:30:17 -05:00
Steven Miers c3134d8177 VRFS-3070 : Webcam selection & state fixes 
* Hook up test webcam button
* Handle object vs. string from client method.
 2015-04-21 18:30:02 -05:00
Steven Miers 196ed1340e VRFS-3070 : Fix text that alludes to embedded webcam. 2015-04-21 18:28:16 -05:00
Seth Call 67c9f5d891 * VRFS-2605 - automatically stop recording if jamtrack is playing 2015-04-21 16:34:57 -05:00
Seth Call 3181a67bda * VRFS-2605 - prevent close of jamtrack or backing track while recordig 2015-04-21 16:30:40 -05:00
Seth Call 1ce41c5a54 * VRFS-2605 - refining jamtrack offset values and manifest for audiomixer, and fixnig bug with jamtrack monitoring applied to playcontrols.js by accident 2015-04-21 16:24:10 -05:00
Steven Miers 7a760e087b Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2015-04-21 14:29:43 -05:00
Steven Miers a9ab5bb730 Merge video_ui branch into develop. 2015-04-21 13:47:00 -05:00
Seth Call 556347f35b * VRFS-2605 compute offset and seeks in manifest 2015-04-21 13:46:33 -05:00
Seth Call 8369ef0e13 * VRFS-3051 - pass userId into JamTrackDownload bridge call 2015-04-21 10:30:37 -05:00
Steven Miers 6f4c8d819d VRFS-3055 : Video features on gear wizard available via config. Update spec to match behavior. 2015-04-21 09:23:57 -05:00
Steven Miers ea45c286ea VRFS-3055 : Make video features optional via config option. 2015-04-21 09:21:55 -05:00
Seth Call c29af72938 * fix jamtrack landing page formatting VRFS-3056 2015-04-20 22:13:30 -05:00
Seth Call 72af829645 * VRFS-3066 - fix bug with rsvp_request controller not using api_signed_in_user filter (causing 500 errors on the service) 2015-04-20 21:31:08 -05:00
Seth Call 9480aadaae Conflicts: 
ruby/lib/jam_ruby/models/jam_track_track.rb
 2015-04-20 13:55:33 -05:00
Seth Call 022304c6af * VRFS-3065 - permission error name change 2015-04-20 10:42:09 -05:00
Seth Call 31e17151a7 * fix jamtrack shopping test 2015-04-19 18:03:26 -05:00
Seth Call 1763c151bd * VRFS-3061 - deal with shopping cart porting over correctly when user logs in during shopping 2015-04-19 16:40:35 -05:00
Seth Call 6991e8afaf * VRFS-3057 - shopping cart to reflect real price 2015-04-19 12:19:05 -05:00
Seth Call fc99fbce6c * VRFS-3058 - fix uniqueness constraint on ShoppingCart and test 2015-04-19 11:43:54 -05:00
Seth Call 64836c1a44 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2015-04-18 20:46:49 -05:00
Seth Call b618fea59d * VRFS-3054 - set default sales_region to any availability 2015-04-18 20:46:20 -05:00
Steven Miers a2c64ee13a VRFS-1848 : Make sure save/discard buttons are enabled after validation. Make event handler registration idempotent. 2015-04-17 17:55:23 -05:00
Seth Call e882bb272c * VRFS-3050 - disable configure button for playback profile 2015-04-17 16:32:53 -05:00
Steven Miers c0e36d0f9e VRFS-1848 : Better state management for recording finished dialog WRT google authorization / youtube errors. Hide youtube errors via ajax upon successful login. 2015-04-17 15:29:19 -05:00
Seth Call 1809b0213b * VRFS-3043 - pass along preview timeline data in preview 2015-04-17 15:01:56 -05:00
Seth Call a2e5d941c1 * remove double scrollbars when in client on the shopping cart page VRFS-3052 2015-04-17 14:09:29 -05:00
Seth Call 3c37cbbf59 * VRFS-3042 - remove duplicate registrations on pagination 2015-04-17 14:01:07 -05:00
Steven Miers b6fad726c4 VRFS-1848 : Halt claim recording and show error if "Save to Youtube" selected, but not logged into google. 2015-04-17 13:22:20 -05:00
Seth Call 3a2590a472 * VRFS-3037 - code added without testing, and VRFS-3039 - download link added to checkout confirmation screen if you've not downloaded the app yet 2015-04-17 09:39:27 -05:00
Steven Miers 267e5a7e10 VRFS-1848 : Make login window disappear when login complete after the google oauth callback. 2015-04-17 09:31:40 -05:00
Steven Miers f4765d03f9 VRFS-1848 : Fix JS syntax error 2015-04-16 16:24:39 -05:00
Steven Miers 832cd9bf31 VRFS-1848 : Move google auth JS to module. Fix bug causing google auth to appear in same window. 2015-04-16 16:24:23 -05:00
Steven Miers 4a4a70a894 VRFS-1847 : Hide fields from video widget. 2015-04-16 16:22:41 -05:00
Seth Call fefd5a3fda * jamtrack UI fixes: VRFS-3041 (ordering fixed), VRFS-3004 - loading/no more jamtrack notice fixes, and VRFS-3005 - filter by band works 2015-04-16 15:44:38 -05:00
Seth Call 4cf4e21552 * VRFS-2938 - packaging phase now shows % indicator 2015-04-16 14:45:29 -05:00
Steven Miers 3c41af5bd2 VRFS-1847 : Make video button behave appropriately as a toggle. Also, turn off video on initial load and before hiding. 2015-04-16 14:20:34 -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
Steven Miers 005dfdaa91 Merge branch 'feature/jam_track_analytics' into develop 2015-04-16 11:11:07 -05:00
Steven Miers 705e67a810 VRFS-2874 : Clean up code and logic - fixes problem of false positive. 2015-04-16 00:21:45 -05:00
Seth Call 13027649f4 * VRFS-3023 - i want a jamblaster functionality 2015-04-15 21:37:22 -05:00
Seth Call 35d2cb7657 * VRFS-2991 - updating descriptions for SEO per David's comments 2015-04-15 20:37:49 -05:00
Steven Miers 168d1e77f1 VRFS-2874 : Developer tracking 2015-04-15 18:37:07 -05:00
Steven Miers 946640e724 VRFS-2874 : Jam Track Analytics : Hook up broadcast listen. 2015-04-15 18:27:00 -05:00
Steven Miers 280496af78 VRFS-2874 : JamTrack analytic core tracking functionality 2015-04-15 18:23:51 -05:00
Steven Miers 4db40f6d3b VRFS-2874 : Some prerequisite functionality required for analytics. 2015-04-15 18:22:55 -05:00
Steven Miers ae050590f6 Whack extraneous logging. 2015-04-15 18:17:02 -05:00
Seth Call ec7cffbe49 * VRFS-2991 - fix bug in outputting recording links 2015-04-15 15:26:10 -05:00
Seth Call cda3adc931 * VRFS-2991 - seo mvp mostly done with new meta tags 2015-04-15 15:16:05 -05:00
Seth Call 42b58a97e8 * VRFS-3034 - workaround QtWebkit crash by conditionalizing the 'crashy' rule 2015-04-15 15:14:41 -05:00
Seth Call 19ad2fbcc5 * VRFS-2991 - sitemap generator done (but still vetting other parts of the site for basic SEO) 2015-04-14 16:39:39 -05:00
Seth Call ab1fadaea4 * VRFS-3031 - jamtrackBrowse is new URL 2015-04-14 15:16:37 -05:00
Seth Call 06c964a151 * VRFS-2977 - make facebook signup work with checkout flow 2015-04-14 14:12:24 -05:00
Brian Smith 75f1098ca3 Merge branch 'develop' into feature/musician_profile_enhancements 2015-04-14 03:13:27 -04:00
Brian Smith 09e4253f5f VRFS-2699 select checkboxes for items already in list 2015-04-14 03:06:18 -04:00
Brian Smith 12f5fc94c2 VRFS-2699 recording selector dialog 2015-04-14 02:43:29 -04:00
Seth Call eee6be5d0b * VRFS-2978 - give temporary pass to payment screen if you just filled out info 2015-04-13 15:54:23 -05:00
Steven Miers 0e0ea46771 Merge branch 'develop' into feature/jam_track_analytics 2015-04-13 13:10:43 -05:00
Steven Miers f56cf339e9 VRFS-2874 : Incremental hookup of ga for jam tracks. 2015-04-13 13:08:34 -05:00
Steven Miers 1d6f690f82 VRFS-2874 : Jam Track Analytics JS tracking method implementation. 2015-04-13 13:07:50 -05:00
Seth Call fb3ca2cec1 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2015-04-13 09:57:24 -05:00
Seth Call fa725af5e4 * VRFS-2945 - jamtrack countin spinner and text now showing 2015-04-13 09:56:48 -05:00
Brian Smith b81222278d merge develop 2015-04-13 08:16:45 -04:00
Brian Smith 4ef86587b6 VRFS-2699 recording selector work 2015-04-13 08:12:18 -04:00
Jonathan Kolyer 711fd1984b VRFS-2893 added SaveSettings bridge call 2015-04-13 02:08:15 +00:00
Seth Call 34d50f4330 * VRFS-3025 - vertically align recording elements even when scrollbar is present 2015-04-12 16:53:24 -05:00
Seth Call 0dc77b400a * VRFS-3006 - remove 'No audio loaded' when jamtrack is loading, and VRFS-3016 - no more text wrapping in error msg 2015-04-12 16:22:01 -05:00
Seth Call b1b6686d3a * VRFS-2976 - change default to 10/2/2 for WDM 2015-04-12 15:55:48 -05:00
Seth Call ab2925ef88 VRFS-2821 - payment history screen added 2015-04-12 13:46:22 -05:00
Jonathan Kolyer 252beca091 VRFS-2895 added unsubscribe link to email footer that doesnt require login 2015-04-12 11:03:12 +00:00
Seth Call e42b926a5e * VRFS-3028 - switch to using Recurly Adjustments for JamTrack purchases 2015-04-10 15:19:08 -05:00
Brian Smith 246efbdaa8 merge develop 2015-04-09 20:47:01 -04:00
Seth Call c230f57592 * adding in required images for VRFS-2868 2015-04-09 09:29:51 -05:00
Seth Call fd02e23572 * updated home page VRFS-2868 2015-04-08 22:44:21 -05:00
Steven Miers 6110bc736f Merge branch 'develop' into feature/jam_track_analytics 2015-04-08 15:54:41 -05:00
Seth Call 974049f204 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2015-04-08 14:36:48 -05:00
Seth Call 42dac058e1 VRFS-2884 - Update things in session and FTUE for default profile 2015-04-08 14:34:05 -05:00
Steven Miers d12b7efb38 VRFS-3018 : Resolve api_jam_tracks#purchased before api_jam_tracks/:plan_code as the wildcard was preventing resolution to the former. 2015-04-08 12:56:59 -05:00
Steven Miers c1dd0f45fe VRFS-3018 : Style artist list to be two columns. Also tweak the other styles to more closely resemble screenshot. Fix physical layout as appropriate. 2015-04-08 12:55:02 -05:00
Steven Miers 1b463c02d9 VRFS-3018 : Account JamTracks empty state - show "no jam tracks" message and provide a link to the shopping page. Also remove stray debug logs. 2015-04-08 12:51:40 -05:00
Steven Miers 6784c750ce VRFS-2874 : Initial analytics for playing JamTracks in a session attended by multiple participants. 2015-04-07 14:04:29 -05:00
Steven Miers 34edd24972 Merge branch 'feature/VRFS-2998' into develop 2015-04-07 12:08:03 -05:00
Brian Smith 0a451742ef merge develop 2015-04-06 21:26:54 -04:00
Steven Miers 4238d9b0ce Add spec to verify expand functionality. 2015-04-06 16:48:58 -05:00
Steven Miers 1e24b20f3c Tableize floated div view. 2015-04-06 16:10:03 -05:00
Steven Miers 6e971b159c Fix bug found in spec. 2015-04-06 15:52:34 -05:00
Steven Miers b051c33bd7 VRFS-2998 : Misc formatting. Also only show jam_track_tracks if expanded. 2015-04-10 15:58:03 -05:00
Steven Miers 31a8729f71 VRFS-2998 : Fix runaway previews by only allowing one expanded item at a time. 2015-04-10 15:56:33 -05:00
Jonathan Kolyer 08198e0aae Merge branch 'feature/musician_profile_enhancements' into feature/musician_search2 2015-04-04 23:43:34 +00:00
Brian Smith 40899dab90 VRFS-2701 minor cleanup 2015-04-05 19:59:36 -04:00
Brian Smith 91e9e73644 VRFS-2701 adding SoundCloud/YouTube sources fully functional 2015-04-04 21:46:37 -04:00
Jonathan Kolyer 51b38bbeed VRFS-2795 css styling of builder page 2015-04-04 23:32:39 +00:00
Jonathan Kolyer 52f88692ca VRFS-2795 styling; result link fixes 2015-04-04 21:57:59 +00:00
Jonathan Kolyer 086b3bc3c4 VRFS-2795 styling and descriptions 2015-04-04 20:26:41 +00:00
Jonathan Kolyer e0d2feb84d VRFS-2795 pagination 2015-04-04 17:29:15 +00:00
Jonathan Kolyer 0890aee9da VRFS-2795 paginating 2015-04-04 16:11:36 +00:00
Jonathan Kolyer e563ad0d8b Merge branch 'feature/musician_profile_enhancements' into feature/musician_search2 2015-04-04 14:56:36 +00:00
Jonathan Kolyer 4fbf3e694d VRFS-2795 filter description & spec tests; support for reset, cancel buttons; proper display and update impl 2015-04-04 14:55:41 +00:00
Brian Smith 5ae708a898 VRFS-2701 added ability to remove recordings from list 2015-04-04 10:51:48 -04:00
Brian Smith 5bd5b26406 VRFS-2701 consolidated site add code / added X to remove row 2015-04-04 09:59:54 -04:00