seth
/
jam-cloud
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity
5,516 Commits 118 Branches 1,306 Tags 359 MiB
Commit Graph

1464 Commits

Author SHA1 Message Date
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 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 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 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
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 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
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
Seth Call c29af72938 * fix jamtrack landing page formatting VRFS-3056 2015-04-20 22:13:30 -05:00
Seth Call 6991e8afaf * VRFS-3057 - shopping cart to reflect real price 2015-04-19 12:19:05 -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
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
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
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 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
Jonathan Kolyer 711fd1984b VRFS-2893 added SaveSettings bridge call 2015-04-13 02:08:15 +00:00
Seth Call e882bb272c * VRFS-3050 - disable configure button for playback profile 2015-04-17 16:32:53 -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
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
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 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 42b58a97e8 * VRFS-3034 - workaround QtWebkit crash by conditionalizing the 'crashy' rule 2015-04-15 15:14:41 -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
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 fa725af5e4 * VRFS-2945 - jamtrack countin spinner and text now showing 2015-04-13 09:56:48 -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
Seth Call e42b926a5e * VRFS-3028 - switch to using Recurly Adjustments for JamTrack purchases 2015-04-10 15:19:08 -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 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
Steven Miers 6e971b159c Fix bug found in spec. 2015-04-06 15:52:34 -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
Seth Call c276d97e42 * pass in data with metronome open stat 2015-04-01 09:04:52 -05:00
Seth Call 80a48c60c6 * VRFS-2879 - adding 3 product pages (jamblaster, platform, jamtracks) 2015-03-31 21:08:09 -05:00
Steven Miers d21a88a5de VRFS-2998 : Hooking up preview widget - incremental. 2015-03-31 19:55:26 -05:00
Seth Call b1b2d3ad24 * VRFS-2869 - band landing page 2015-03-31 16:17:17 -05:00
Seth Call 47c6b3ec16 * VRFS-2870 - tests add for individual jam track song page 2015-03-31 15:17:43 -05:00
Seth Call f7febfabcf * VRFS-2999 - create whole track preview for master track on import 
* VRFS-3000 - create duration for jam track
* VRFS-2996 - create jamtrack preview widget
* VRFS-2870 - individual jam track landing page (still needs tests)
 2015-03-31 13:36:49 -05:00
Seth Call 398f7e04ad Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2015-03-28 10:10:29 -05:00
Seth Call 260a80ee37 * VRFS-2987 - remote participants can see opened JamTracks 2015-03-28 10:10:18 -05:00
Steven Miers 401fd43849 Merge branch 'feature/jam_track_ui_2' into develop 2015-03-27 15:48:08 -05:00
Seth Call 23fdf51110 * resize session based on track content VRFS-2819 2015-03-27 15:36:09 -05:00
Steven Miers 4f08f6acad Merge and fix 2015-03-27 09:54:01 -05:00
Seth Call e2957592ea VRFS-2605 - audiomixer manifest updated for volume and offsets 2015-03-26 17:45:23 -05:00
Steven Miers 3f994e3993 Merge branch 'develop' into feature/jam_track_ui_2 2015-03-26 11:59:49 -05:00
Seth Call 1e1e6222bb * VRFS-2686 - if user seeks to 0, then offest it back to beginning of JamTrack (before prelude) 2015-03-25 15:01:22 -05:00
Seth Call 31e4fbfdf8 * suppress metronome logic when JamTrack is open VRFS-2971 2015-03-25 14:45:51 -05:00
Steven Miers 5f953d1b19 VRFS-2830 : Merge / manual fix 2015-03-25 10:56:24 -05:00
Steven Miers adef8c8c45 VRFS-2830 : Payment History 
API, client, view, styles and test
 2015-03-24 17:13:09 -05:00
Seth Call 18563ff065 * VRFS-2890 fix infinite scroll as well as bug with limit vs per_page style scrolling 2015-03-24 14:59:20 -05:00
Seth Call bfe302b2f1 * merged 2015-03-24 14:43:48 -05:00
Seth Call ccd60aa631 * merged develop 2015-03-24 11:27:26 -05:00
Seth Call 1c0407cca4 * wip 2015-03-24 10:19:21 -05:00
Steven Miers 5e2d860bf7 VRFS-2830 : License dialog and hookup 2015-03-23 15:38:55 -05:00
Jonathan Kolyer 98ea77a5e0 Merge branch 'develop' into feature/cohort_data 2015-03-23 20:07:24 +00:00
Jonathan Kolyer 8c2df0bb6b VRFS-2916 added jamtrack plays handling; worked around jam_tracks.id bigint problem (with commented dependencies); tested jamtrack play saves from JS through rspec; final cleanup of cohort reporting 2015-03-23 20:06:32 +00:00